guilhem@mysql.com
55fb16a7a6
1) undoing my fix for BUG#8055 "Trouble with replication from temporary tables and ignores"
...
and fixing it another way (per Monty; a simpler solution which does not increase the number
of binlog events is to always execute DROP TEMPORARY TABLE IF EXISTS on slave). A new test rpl_drop_temp.
2) fixing BUG#8436 "Multiple "stacked" SQL statements cause replication to stop" by setting
thd->query_length to the length of the query being executed, not counting the next queries
if this is a multi-query. Should also improve display of SHOW PROCESSLIST. A new test rpl_multi_query.
2005-02-14 23:47:17 +01:00
mskold@mysql.com
62a08929fa
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2005-02-14 22:30:01 +01:00
serg@serg.mylan
fd828e5b4d
manually merged
2005-02-14 21:50:09 +01:00
sergefp@mysql.com
c30f7feba1
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-bug8218
2005-02-14 23:49:01 +03:00
sergefp@mysql.com
919f2f2364
Merge mysql.com:/home/psergey/mysql-4.1-bug8218
...
into mysql.com:/home/psergey/mysql-5.0-bug8218
2005-02-14 23:47:31 +03:00
sergefp@mysql.com
021f9849ef
Remove redundant DROP TABLE from test case
2005-02-14 23:45:48 +03:00
mats@mysql.com
30bf28202c
Bug#8412: For replication to work correctly, the prologue and
...
epilogue to an SQL statement should not have an error code even
when the SQL statement itself has an error code.
2005-02-14 18:39:33 +01:00
mskold@mysql.com
1dcbc45b43
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-ndb
2005-02-14 17:35:14 +01:00
matthias@three.local.lan
d6c5089e92
Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src
2005-02-14 16:34:36 +01:00
gluh@gluh.mysql.r18.ru
29510ce029
Fix for bug#8156:information_schema and lowercase_table3 fail on OSX
...
Can't repeat information_schema test failure
Fix for lowercase_table3 only
2005-02-14 18:23:10 +03:00
svoj@mysql.com
643b602832
Bug#8351
...
Fix for crash when using a double quote in boolean fulltext query.
2005-02-14 18:54:12 +04:00
mleich@mysql.com
cb56fcaa94
Removal of a not needed statement
2005-02-14 14:20:43 +01:00
matthias@three.local.lan
e8bf23c16a
Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src
...
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-WL1420
2005-02-14 10:23:53 +01:00
mskold@mysql.com
b371e8a567
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2005-02-14 09:22:14 +01:00
bell@sanja.is.com.ua
2d3076b69d
removed wrong distinct UNION detection (BUG#6565)
2005-02-14 02:06:21 +02:00
acurtis@pcgem.rdg.cyberkinetica.com
4957c4850d
Bug#2435
...
Alter handling for UNION syntax
Tests for UNION and parentheses
2005-02-13 22:35:52 +00:00
kent@mysql.com
a983841625
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-02-13 19:52:41 +01:00
kent@mysql.com
ba3f9acff6
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-02-13 18:22:38 +01:00
sergefp@mysql.com
c0c50efdef
Fix for BUG#8218:
...
Remove TMP_TABLE_PARAM::copy_funcs_it. TMP_TABLE_PARAM is a member of JOIN which is
copied via memcpy, and List_iterator_fast TMP_TABLE_PARAM::copy_funcs_it ends up
pointing to the wrong List.
2005-02-12 22:58:54 +03:00
mskold@mysql.com
7760b1cad8
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-ndb
2005-02-12 14:57:39 +01:00
bar@mysql.com
9ba7392306
Bug#8235 Connection collation change & table create with default result in crash
2005-02-12 16:27:22 +04:00
serg@serg.mylan
40da910d4c
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-02-12 09:38:15 +01:00
serg@serg.mylan
42bb0901a3
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-02-12 00:10:07 +01:00
serg@serg.mylan
d355174522
make LOAD INDEX to work
2005-02-12 00:05:13 +01:00
igor@rurik.mysql.com
cdb40830d2
Manual merge
2005-02-11 15:00:29 -08:00
igor@rurik.mysql.com
1bb04b0642
distinct.result:
...
Adjustment of the result file after the revision of the fix for bug #7520 .
2005-02-11 13:44:54 -08:00
mskold@mysql.com
66343612d1
Merge
2005-02-11 22:30:37 +01:00
mskold@mysql.com
828a785610
Condition pushdown v.2
2005-02-11 22:05:24 +01:00
igor@rurik.mysql.com
634424ca16
select.result:
...
After revision of the fix for bug #7520 .
table.cc:
Revised the fix for bug #7520 .
Made it compliant with 5.0 code where the bug does not exist.
2005-02-11 10:39:26 -08:00
matthias@three.local.lan
9c7d94d408
Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src
...
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-WL1420
2005-02-11 17:57:35 +01:00
ingo@mysql.com
601a4fdfa2
Merge
2005-02-11 11:59:35 +01:00
igor@rurik.mysql.com
a697e5da15
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-02-10 23:48:35 -08:00
igor@rurik.mysql.com
4ef431ad55
select.result:
...
Adjusted results of the test case for bug #7520 for 4.1.
2005-02-10 23:47:57 -08:00
igor@rurik.mysql.com
06ff30f6c0
Merge rurik.mysql.com:/home/igor/dev/mysql-4.0-0
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-02-10 22:17:18 -08:00
igor@rurik.mysql.com
8b3d59ad42
select.result, select.test:
...
Added a test case for bug #7520 .
table.cc:
Fixed bug #7520 .
The bug was caused by a wrong calculation of the field max_key_length for
a TABLE structure when there was an index on a blob field.
2005-02-10 22:15:38 -08:00
joreland@mysql.com
ec5ac47eb8
Merge mysql.com:/home/jonas/src/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-11 06:46:05 +01:00
jimw@mysql.com
c4187750ff
Fix all of the enum and set columns in privilege tables to be
...
case-insensitive. (Bug #7989 )
2005-02-10 20:25:14 -08:00
jimw@mysql.com
eecb813c6b
Re-enable ctype_latin1_de test for embedded server (already passes, so it
...
appears to have been accidently disabled) and enable ctype_ucs after moving
a subtest that requires binlog to its own test file.
2005-02-10 18:08:30 -08:00
bell@sanja.is.com.ua
ea8caabb10
Better emulation correct SELECT tree for fields expressions of merging view during name resolving (BUG#6394)
2005-02-10 23:01:59 +02:00
matthias@three.local.lan
54684534fd
Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src
...
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-WL1420
2005-02-10 20:28:47 +01:00
mats@mysql.com
6611d3d2f8
Merge mysql.com:/home/bkroot/mysql-5.0
...
into mysql.com:/home/bk/b7853-mysql-5.0
2005-02-10 19:15:53 +01:00
bell@sanja.is.com.ua
5040e7cdb4
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-repl-5.0
2005-02-10 20:08:11 +02:00
joreland@mysql.com
1bda3aaa24
Merge mysql.com:/home/jonas/src/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-10 17:12:53 +01:00
bell@sanja.is.com.ua
9b1bf2da5a
merge
2005-02-10 18:01:06 +02:00
joreland@mysql.com
87349f0d81
Merge mysql.com:/home/jonas/src/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-10 16:19:44 +01:00
konstantin@mysql.com
7d735c7207
manual merge
2005-02-10 16:58:02 +03:00
msvensson@neptunus.homeip.net
a172575854
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0
2005-02-10 14:41:52 +01:00
monty@mysql.com
ccb2f3381b
Things missing in last changset
...
After merge fixes
Don't give duplicate warnings for some ::store() functions
2005-02-10 15:41:51 +02:00
msvensson@neptunus.homeip.net
8fb1f824ea
Change script to avoiud multiple --debug flags when starting master servers
2005-02-10 14:13:23 +01:00
bell@sanja.is.com.ua
cfedc23bce
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
2005-02-10 13:05:17 +02:00