1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-13 21:42:58 +03:00
Commit Graph

20121 Commits

Author SHA1 Message Date
mleich@four.local.lan
6a1a424f6f Merge four.local.lan:/WORK2/merge/mysql-5.1-parts
into  four.local.lan:/WORK/mysql-5.1-build/src-clean
2007-10-10 22:51:35 +02:00
tsmith@ramayana.hindu.god
06c6fce750 Merge ramayana.hindu.god:/home/tsmith/m/bk/51
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-10-10 14:15:09 -06:00
tsmith@ramayana.hindu.god
070dc3ffb5 Merge ramayana.hindu.god:/home/tsmith/m/bk/50
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-10-10 14:12:36 -06:00
mleich@four.local.lan
88047100af Combined fix for
Bug#31481 test suite parts: Many tests fail because of changed server error codes
   Bug#31243 Test "partition_basic_myisam" truncates path names
+ minor cleanup
2007-10-10 22:03:10 +02:00
kaa@polly.(none)
9a0b9e03d4 Merge polly.(none):/home/kaa/src/maint/bug28878/my41-bug28878
into  polly.(none):/home/kaa/src/maint/mysql-4.1-maint
2007-10-10 23:39:53 +04:00
istruewing@stella.local
0ab9d3718d Merge stella.local:/home2/mydev/mysql-5.1-amain
into  stella.local:/home2/mydev/mysql-5.1-axmrg
2007-10-10 21:25:19 +02:00
istruewing@stella.local
da9b4288ed Merge stella.local:/home2/mydev/mysql-5.0-amain
into  stella.local:/home2/mydev/mysql-5.0-axmrg
2007-10-10 20:44:05 +02:00
jmiller/ndbdev@mysql.com/ndb15.mysql.com
cc62b34061 rpl_ndb_extraColMaster.test, rpl_ndb_extraColMaster.result:
Back porting NDB test case
2007-10-10 17:22:21 +02:00
gshchepa/uchum@gleb.loc
356007a8a4 Fixed bug #31471: decimal_bin_size: Assertion `scale >= 0 &&
precision > 0 && scale <= precision'.

A sign of a resulting item of the IFNULL function was not
updated and the maximal length of this result was calculated
improperly. Correct algorithm was copy&pasted from the IF
function implementation.
2007-10-10 20:14:29 +05:00
istruewing@stella.local
5777cc2998 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into  stella.local:/home2/mydev/mysql-5.1-bug15522
2007-10-10 16:52:56 +02:00
jmiller/ndbdev@mysql.com/ndb15.mysql.com
44352e16ad .del-rpl_stm_extraColmaster_ndb.test~5ac81fa1ec366ba:
Delete: mysql-test/suite/rpl/t/rpl_stm_extraColmaster_ndb.test
.del-rpl_row_extraColmaster_ndb.result~a2c64bae75b49d2:
  Delete: mysql-test/suite/rpl/r/rpl_row_extraColmaster_ndb.result
.del-rpl_row_extraColmaster_ndb.test~523b0954869c4423:
  Delete: mysql-test/suite/rpl/t/rpl_row_extraColmaster_ndb.test
Many files:
  merged and cleanup of test cases
2007-10-10 16:43:20 +02:00
mleich@four.local.lan
7c38ffe393 Fix for
Bug#31407 funcs_1: <engine>__datadict tests broken because of wrong expected results
2007-10-10 15:37:33 +02:00
gkodinov/kgeorge@magare.gmz
e971b18f06 Bug #30825: Problems when putting a non-spatial index on a GIS column
Fixed the usage of spatial data (and Point in specific) with 
 non-spatial indexes.
 Several problems :
   - The length of the Point class was not updated to include the 
     spatial reference system identifier. Fixed by increasing with 4 
     bytes.
   - The storage length of the spatial columns was not accounting for
     the length that is prepended to it. Fixed by treating the 
     spatial data columns as blobs (and thus increasing the storage
     length)
   - When creating the key image for comparison in index read wrong
     key image was created (the one needed for and r-tree search,
     not the one for b-tree/other search). Fixed by treating the
     spatial data columns as blobs (and creating the correct kind of
     image based on the index type).
2007-10-10 16:26:02 +03:00
jmiller/ndbdev@mysql.com/ndb15.mysql.com
ae700296b5 rpl_bug31076.test, rpl_bug31076.result:
Correcting test bug
2007-10-10 14:18:34 +02:00
anozdrin/alik@station.
05cf10bdf6 Cleanup sp.test. 2007-10-10 14:42:29 +04:00
anozdrin/alik@station.
c6c419f919 Fix automerge. 2007-10-10 13:53:24 +04:00
anozdrin/alik@station.
50c8101ad8 Merge station.:/mnt/raid/alik/MySQL/devel/5.0-rt
into  station.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
2007-10-10 13:35:40 +04:00
gluh@eagle.(none)
27762854ef Merge mysql.com:/home/gluh/MySQL/Merge/5.1
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-10-10 14:33:46 +05:00
gluh@eagle.(none)
20ec6605d3 Merge mysql.com:/home/gluh/MySQL/Merge/5.0
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2007-10-10 14:31:19 +05:00
gluh@mysql.com/eagle.(none)
f71e5825e5 after merge fix 2007-10-10 14:22:21 +05:00
gluh@eagle.(none)
3023ee9401 Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-10-10 12:37:06 +05:00
gluh@mysql.com/eagle.(none)
a5e7b726c1 Bug#28893 --relay-log variable is not exposed with SHOW VARIABLES
added variables relay_log, relay_log_index, relay_log_info_file to init_vars[]
to make them visible within SHOW VARIABLES
2007-10-10 12:21:11 +05:00
gluh@mysql.com/eagle.(none)
91a7fbc8bb Bug#25359 Test 'view' is dependent on current year to be 2006
removed now() call to make the test to be year independent
2007-10-10 12:16:13 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
ac0cf72c06 Merge mysql.com:/home/ram/work/mysql-5.1-maint
into  mysql.com:/home/ram/work/b29444/b29444.5.1
2007-10-10 10:20:19 +05:00
davi@virtua-cwbas201-21-158-74.ctb.virtua.com.br
0e9ccab47c Merge virtua-cwbas201-21-158-74.ctb.virtua.com.br:/Users/davi/mysql/push/bugs/28318-5.0
into  virtua-cwbas201-21-158-74.ctb.virtua.com.br:/Users/davi/mysql/push/mysql-5.0-runtime
2007-10-09 20:48:37 -03:00
davi@virtua-cwbas201-21-158-74.ctb.virtua.com.br
fd3c6b1855 Bug#28318 CREATE FUNCTION (UDF) requires a schema
Bug#29816 Syntactically wrong query fails with misleading error message

The core problem is that an SQL-invoked function name can be a <schema
qualified routine name> that contains no <schema name>, but the mysql
parser insists that all stored procedures (function, procedures and
triggers) must have a <schema name>, which is not true for functions.
This problem is especially visible when trying to create a function
or when a query contains a syntax error after a function call (in the
same query), both will fail with a "No database selected" message if
the session is not attached to a particular schema, but the first
one should succeed and the second fail with a "syntax error" message.

Part of the fix is to revamp the sp name handling so that a schema
name may be omitted for functions -- this means that the internal
function name representation may not have a dot, which represents
that the function doesn't have a schema name. The other part is
to place schema checks after the type (function, trigger or procedure)
of the routine is known.
2007-10-09 20:46:33 -03:00
ramil/ram@ramil.myoffice.izhnet.ru
0783ae86cd Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  mysql.com:/home/ram/work/mysql-5.1-maint
2007-10-09 22:52:38 +05:00
jmiller/ndbdev@mysql.com/ndb15.mysql.com
4bb09aecd4 Updated NDB test to run for both RBR and MBR testing. In addition added test for Innodb and updated results files for all tests. 2007-10-09 19:51:57 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
2264c007f6 Merge mysql.com:/home/ram/work/mysql-5.0-maint
into  mysql.com:/home/ram/work/mysql-5.1-maint
2007-10-09 22:51:17 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
fa5eb277ec metadata test of bug # 31249: problem with convert(..., datetime) removed
as PS protocol gives slightly different metadata.
2007-10-09 22:40:22 +05:00
cmiller@zippy.cornsilk.net
b0ef3979d0 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-10-09 11:04:45 -04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
e908bb72e5 Fix for bug #29444: crash with partition refering to table in create-select
Problem: creating a partitioned table during name resolution for the 
partition function we search for column names in all parts of the
CREATE TABLE query. It is superfluous (and wrong) sometimes.

Fix: launch name resolution for the partition function against
the table we're creating.
2007-10-09 19:16:39 +05:00
mhansson@dl145s.mysql.com
1566f370a8 Merge bk-internal:/home/bk/mysql-5.1-opt
into  dl145s.mysql.com:/data0/mhansson/bug31160/my51-bug31160
2007-10-09 15:35:03 +02:00
mhansson@dl145s.mysql.com
98220d761e Merge martin@mhansson.mysql.internal:/home/martin/mysql/src/bug31160/my51-bug31160
into  dl145s.mysql.com:/data0/mhansson/bug31160/my51-bug31160
2007-10-09 15:27:38 +02:00
mhansson@dl145s.mysql.com
8e2a56ea9d Merge bk-internal:/home/bk/mysql-5.0-opt
into  dl145s.mysql.com:/data0/mhansson/bug31160/my50-bug31160
2007-10-09 15:25:27 +02:00
mhansson@dl145s.mysql.com
c7ff50622c Merge martin@mhansson.mysql.internal:/home/martin/mysql/src/bug31160/my50-bug31160
into  dl145s.mysql.com:/data0/mhansson/bug31160/my50-bug31160
2007-10-09 15:23:16 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
9a62a07837 Merge mysql.com:/home/ram/work/mysql-5.1-maint
into  mysql.com:/home/ram/work/b31438/b31438.5.1
2007-10-09 18:18:14 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
a861449596 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/home/ram/work/b31249/b31249.5.0
2007-10-09 18:14:13 +05:00
mhansson/martin@linux-st28.site
6d6c475fe8 Merge linux-st28.site:/home/martin/mysql/src/bug31160/my50-bug31160
into  linux-st28.site:/home/martin/mysql/src/bug31160/my51-bug31160
2007-10-09 15:00:06 +02:00
mhansson/martin@linux-st28.site
148ce22add Bug#31160: MAKETIME() crashes server when returning NULL in ORDER BY using filesort
Even though it returns NULL, the MAKETIME function did not have this property set,
causing a failed assertion (designed to catch exactly this).
Fixed by setting the nullability property of MAKETIME().
2007-10-09 14:58:09 +02:00
istruewing@stella.local
ac70638d5a Merge stella.local:/home2/mydev/mysql-5.0-bug15522
into  stella.local:/home2/mydev/mysql-5.1-bug15522
2007-10-09 14:18:10 +02:00
istruewing@stella.local
a1caefe36c Merge stella.local:/home2/mydev/mysql-5.0-bug15522-old
into  stella.local:/home2/mydev/mysql-5.0-bug15522
2007-10-09 13:38:46 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
b1ffa1605e Merge mysql.com:/home/ram/work/mysql-5.1-maint
into  mysql.com:/home/ram/work/b31438/b31438.5.1
2007-10-09 16:34:56 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
1e4ff5c09b Merge mysql.com:/home/ram/work/b31249/b31249.5.0
into  mysql.com:/home/ram/work/b31249/b31249.5.1
2007-10-09 16:21:27 +05:00
pekka@sama.ndb.mysql.com
f83a1beb71 Merge sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-ndb
into  sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug29390
2007-10-09 13:16:49 +02:00
istruewing@stella.local
1285baf608 Bug#15522 - create ... select and with merge tables
Added test case.
The fix for Bug#20662 does also fix this one.
2007-10-09 13:10:51 +02:00
mhansson/martin@linux-st28.site
a06a6579e8 Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt
into  linux-st28.site:/home/martin/mysql/src/bug30832-again-push/my51-bug30832-again
2007-10-09 12:06:44 +02:00
mhansson/martin@linux-st28.site
ddc67f087a Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt
into  linux-st28.site:/home/martin/mysql/src/bug30832-again-push/my50-bug30832-again
2007-10-09 12:04:50 +02:00
mhansson/martin@linux-st28.site
600d2ba0b1 Merge linux-st28.site:/home/martin/mysql/src/bug30832-again/my50-bug30832-again
into  linux-st28.site:/home/martin/mysql/src/bug30832-again/my51-bug30832-again
2007-10-09 11:37:46 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
4792385177 Fix for bug #31249: Assertion `!table || (!table->write_set ||
bitmap_is_set(table->write_set, fiel

Problem: creating a temporary table we allocate the group buffer if needed
followed by table bitmaps (see create_tmp_table()). Reserving less memory for 
the group buffer than actually needed (used) for values retrieval may lead 
to overlapping with followed bitmaps in the memory pool that in turn leads 
to unpredictable consequences.

As we use Item->max_length sometimes to calculate group buffer size,
it must be set to proper value. In this particular case 
Item_datetime_typecast::max_length is too small.

Another problem is that we use max_length to calculate the group buffer
key length for items represented as DATE/TIME fields which is superfluous.

Fix: set Item_datetime_typecast::max_length properly,
accurately calculate the group buffer key length for items 
represented as DATE/TIME fields in the buffer.
2007-10-09 14:37:21 +05:00