89838e1008
WL#3629 - Replication of Invocation and Invoked Features
...
This patch corrects errors that occurred in a local manual merge as a result
of updating the local repository and includes changes necessary to correct
problems found during the recalculation of next execution of events in RBR.
2007-03-29 08:17:19 -04:00
f9c5bb36b0
Merge pilot.blaudden:/home/msvensson/mysql/bug25482/my41-bug25482-alt2
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-29 14:16:28 +02:00
ca5f4f4642
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-03-29 14:15:19 +02:00
3129179178
Bug #27378 update becomes delete on slave
...
- quick workaround, better patch is needed later
- test case
2007-03-29 14:14:42 +02:00
a71d195183
Bug#25482 GRANT statements are not replicated if you use "replicate-ignore-table"
...
- GRANT and REVOKE statments didn't have the "updating" flag set and
thus statements with a table specified would not replicate if
slave filtering rules where turned on.
For example "GRANT ... ON test.t1 TO ..." would not replicate.
2007-03-29 14:12:32 +02:00
771e05d657
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-03-29 13:49:10 +02:00
91809fed36
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-03-29 13:29:45 +02:00
28c6822bf9
create.result:
...
post-merge test result fixup
2007-03-29 13:27:38 +02:00
9e99b24305
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
2007-03-29 13:09:16 +02:00
4f95bd3438
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-03-29 13:08:32 +02:00
0b0d2c3258
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-03-29 12:58:26 +02:00
064157b6e8
BUG#26624, merge to 5.1: make partition pruning module account for the
...
changes made by the bug fix.
2007-03-29 14:54:08 +04:00
a7f506db2a
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
2007-03-29 12:52:31 +02:00
97ba2109b0
ndb_gis.result:
...
post-merge fixup of test result
2007-03-29 12:45:23 +02:00
9a7f345133
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-03-29 12:43:31 +02:00
91f4b48541
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
2007-03-29 12:40:49 +02:00
75668471d1
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-03-29 12:25:28 +02:00
890bdb4fed
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/home/ram/work/b21976/my50-b21976
2007-03-29 15:17:18 +05:00
c29f404e53
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into mysql.com:/home/ram/work/b21976/my51-b21976
2007-03-29 15:16:48 +05:00
da8875a2ef
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-03-29 12:00:32 +02:00
dc01a80c37
Merge bk-internal:/home/bk/mysql-5.1-new-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-29 11:55:09 +02:00
071783117f
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-29 11:54:59 +02:00
cb806be68d
Merge pilot.blaudden:/home/msvensson/mysql/bug25309/my51-bug25309
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-29 11:48:05 +02:00
72cc8618d7
Merge pilot.blaudden:/home/msvensson/mysql/bug25309/my50-bug25309
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-29 11:40:38 +02:00
f47c4368de
Merge pilot.blaudden:/home/msvensson/mysql/bug25309/my50-bug25309
...
into pilot.blaudden:/home/msvensson/mysql/bug25309/my51-bug25309
2007-03-29 11:38:48 +02:00
37ffc0c391
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-29 11:37:21 +02:00
0e04aec960
Make the script detect --default-storage-engine=x and
...
mark the test as requiring that storage engine(if we need to do that)
Make --ndb and --with-ndbcluster and alias for
--mysqld=--default-storage-engine=ndbcluster
2007-03-29 11:31:50 +02:00
07f94fa199
gis_generic test cases:
...
Revert test case to NOT define any keys; the NDB warning can be handled, and ARCHIVE does not allow indexes
2007-03-29 11:20:08 +02:00
82ecff6a76
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B27300-5.0-opt
2007-03-29 12:09:55 +03:00
c132038451
Merge mysql.com:/home/ram/work/mysql-5.0-maint
...
into mysql.com:/home/ram/work/b21976/my50-b21976
2007-03-29 13:37:07 +05:00
87d98bec74
Merge mysql.com:/home/psergey/mysql-5.0-merge
...
into mysql.com:/home/psergey/mysql-5.1-merge
2007-03-29 12:24:23 +04:00
1a2ca44e2b
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B27300-5.0-opt
2007-03-29 11:01:32 +03:00
4507c6757a
Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1
...
into trift-lap.fambruehe:/MySQL/M51/push-5.1
2007-03-29 09:41:39 +02:00
8c5b59e416
Merge mysql.com:/home/ram/work/b21976/my50-b21976
...
into mysql.com:/home/ram/work/b21976/my51-b21976
2007-03-29 12:04:02 +05:00
d0ad6cd45b
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-03-29 08:36:57 +02:00
399bc9861e
Merge of BUG#26624 and BUG#26625
2007-03-29 10:35:28 +04:00
73f0c5d7c6
Merge mysql.com:/home/ram/work/mysql-5.0-maint
...
into mysql.com:/home/ram/work/b26359/b26359.5.0
2007-03-29 11:06:15 +05:00
306af7f4bc
Merge mysql.com:/home/bar/mysql-5.0.b27079
...
into mysql.com:/home/bar/mysql-5.1-new-rpl
2007-03-29 10:36:28 +05:00
6d290278cc
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
...
into mysql.com:/home/bar/mysql-5.0.b27079
2007-03-29 10:19:45 +05:00
18cc602419
Merge tsmith.mysql.internal:/home/tsmith/m/inno/mar28/51
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-03-29 07:13:35 +02:00
4ffeba761f
Applied innodb-5.1-ss1381 snapshot
...
Bug #27381 : InnoDB exits when attempting to rename table to non-existant database
Fix Bug#27381 by calling os_file_handle_error_no_exit() instead of
os_file_handle_error().
2007-03-28 22:46:28 -06:00
95b58449f9
Merge mysql.com:/home/ram/work/b26359/b26359.5.0
...
into mysql.com:/home/ram/work/b26359/b26359.5.1
2007-03-29 09:38:46 +05:00
e3c34c9cbf
Fix for bugs
...
#27176 : Assigning a string to an year column has unexpected results
#26359 : Strings becoming truncated and converted to numbers under STRICT mode
Problems:
1. storing a string to an integer field we don't check
if strntoull10rnd() returns MY_ERRNO_EDOM error.
Fix: check for MY_ERRNO_EDOM.
2. storing a string to an year field we use my_strntol() function.
Fix: use strntoull10rnd() instead.
2007-03-29 09:08:30 +05:00
0d65ee796b
Merge siva.hindu.god:/home/tsmith/m/bk/maint/50
...
into siva.hindu.god:/home/tsmith/m/bk/maint/51
2007-03-28 19:50:41 -06:00
d4e0de8fda
Update test for bug #24563 (MBROverlaps does not seem to function propertly.); ARCHIVE doesn't support AUTO_INCREMENT, so specify PK values explicitly
2007-03-28 19:39:43 -06:00
5aa073b1e4
Merge siva.hindu.god:/home/tsmith/m/bk/maint/50
...
into siva.hindu.god:/home/tsmith/m/bk/maint/51
2007-03-28 17:41:52 -06:00
8350721c88
Update test for bug #24563 (MBROverlaps does not seem to function propertly.):
...
- Add primary key to test table, so NDB with binlog doesn't complain
- Add extra results for bdb_gis.result
2007-03-28 17:40:42 -06:00
ecd22993cf
Bug #26642 : create index corrupts table definition in .frm
...
Thanks to Martin Friebe for finding and submitting a fix for this bug!
A table with maximum number of key segments and maximum length key name
would have a corrupted .frm file, due to an incorrect calculation of the
complete key length. Now the key length is computed correctly (I hope) :-)
MyISAM would reject a table with the maximum number of keys and the maximum
number of key segments in all keys. It would allow one less than this total
maximum. Now MyISAM accepts a table defined with the maximum. (This is a
very minor issue.)
2007-03-28 15:25:13 -06:00
082de779b3
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-03-28 22:50:43 +02:00
1b9c4358a8
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2007-03-28 22:31:10 +02:00
