Commit graph

45264 commits

Author SHA1 Message Date
gni/root@dev3-221.dev.cn.tlan
888fcd6f7e recovery from 5.0 merge for bug18676 2007-04-04 15:22:37 +08:00
gni/root@dev3-221.dev.cn.tlan
99895eb6c3 Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/bug18676
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/bug18676
2007-04-04 14:30:12 +08:00
igor@olga.mysql.com
38cf7dee4c Merge olga.mysql.com:/home/igor/mysql-4.1-opt
into  olga.mysql.com:/home/igor/mysql-5.0-opt
2007-04-03 22:24:57 -07:00
igor@olga.mysql.com
0e14d4c7ed Improved coverage for the code added to fix bug 27532. 2007-04-03 19:45:37 -07:00
igor@olga.mysql.com
a87e5ac3d5 Fix after manual merge 2007-04-03 17:09:41 -07:00
igor@olga.mysql.com
6aa599fc31 Merge olga.mysql.com:/home/igor/mysql-4.1-opt
into  olga.mysql.com:/home/igor/mysql-5.0-opt
2007-04-03 16:11:27 -07:00
igor@olga.mysql.com
90aa05d276 Fixed bug #27532: wrong results with ORDER/GROUP BY queries containing
IN/BETWEEN predicates in sorting expressions.
Wrong results may occur when the select list contains an expression
with IN/BETWEEN predicate that differs from a sorting expression by
an additional NOT only.
 
Added the method Item_func_opt_neg::eq to compare correctly expressions
containing [NOT] IN/BETWEEN.
The eq method inherited from the Item_func returns TRUE when comparing
'a IN (1,2)' with 'a NOT IN (1,2)' that is not, of course, correct.
2007-04-03 14:32:16 -07:00
Reggie@vm-xp.
66b0e9ca7a Bug #20376 Doesn't auto-detect data dir
This changeset fixes the problem where mysql, when run as a service,
can't "detect" it's own data directory.
2007-04-03 15:05:33 -05:00
kostja@bodhi.local
49d0b0caee Fix a race that breaks the valgrind build. 2007-04-03 21:33:56 +04:00
tomas@whalegate.ndb.mysql.com
c4b15b2e68 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
2007-04-03 17:37:10 +02:00
tomas@whalegate.ndb.mysql.com
49d2135c72 Bug#17095 Cluster RBR in circle does not terminate
- set correct server id
2007-04-03 17:36:05 +02:00
gkodinov/kgeorge@magare.gmz
2179ee2b06 Bug #27513: test case added to make sure this
crash bug doesn't reappear.
2007-04-03 18:00:57 +03:00
gluh@mysql.com/eagle.(none)
8c18c3ea0c Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
additional fix
2007-04-03 19:40:55 +05:00
mskold/marty@linux.site
3a70c41512 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-04-03 16:27:23 +02:00
msvensson@pilot.blaudden
b436722bf1 Remove the cleanup of table t1 until problem with lock is fixed 2007-04-03 16:13:23 +02:00
tomas@whalegate.ndb.mysql.com
6e7df50749 Bug #21494 Master Cluster MySQLD is point of failure that can lead to mismatch slave data
- insert gap event on cluster connect
2007-04-03 14:49:57 +02:00
tomas@whalegate.ndb.mysql.com
6db3dbcaca Bug #21494 Master Cluster MySQLD is point of failure that can lead to mismatch slave data
- insert gap event on cluster connect
2007-04-03 14:31:46 +02:00
mskold/marty@mysql.com/linux.site
05216c2aa8 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2007-04-03 14:00:38 +02:00
msvensson@pilot.blaudden
3efa2df721 Replace not portable "--system rm" with --remove_file 2007-04-03 13:36:58 +02:00
gluh@mysql.com/eagle.(none)
2d47f0cb1b Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte 2007-04-03 16:13:27 +05:00
tomas@whalegate.ndb.mysql.com
d654c57769 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
2007-04-03 13:03:14 +02:00
tomas@whalegate.ndb.mysql.com
81ac116dfa Bug #17095 Cluster RBR in circle does not terminate
- add any value to ndb
- use it to update correct server id in binlog thread
2007-04-03 12:57:18 +02:00
gni/root@dev3-221.dev.cn.tlan
98e5757618 BUG#18676 when cluster storage engine is down, misleading error message on create table with 4009. 2007-04-03 18:44:29 +08:00
kostja@bodhi.local
bed1ec3e7c Merge bodhi.local:/opt/local/work/mysql-5.0-runtime
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
2007-04-03 14:36:27 +04:00
kostja@bodhi.local
93d0316f45 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
2007-04-03 14:34:37 +04:00
gni/root@dev3-221.dev.cn.tlan
e1971cfa51 Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug21699
2007-04-03 18:05:10 +08:00
gni/root@dev3-221.dev.cn.tlan
96c37edd5c Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug21699
2007-04-03 18:01:43 +08:00
msvensson@pilot.blaudden
00905b20a4 Cleanup tables created by test cases 2007-04-03 11:36:33 +02:00
gluh@mysql.com/eagle.(none)
89dec159d1 Bug#27327 information_schema status views, variable_value conversion
Type of 'Slave_running' status variable is changed to bool
2007-04-03 14:24:35 +05:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
c8d0b6fc89 Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug24521-5.1-new-ndb-bj
2007-04-03 17:07:00 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
85c0d0554c Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug24521-5.1-new-ndb-bj
2007-04-03 17:03:12 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
0a29b7e7e3 Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug25295-5.1-new-ndb-bj
2007-04-03 16:48:21 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
ac4467e6c2 Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug25295-5.1-new-ndb-bj
2007-04-03 16:45:47 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
c7b6216f4e Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug25875-5.1-new-ndb-bj
2007-04-03 16:43:24 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
cd1919321a Bug#25875, Newly created table through CREATE TABLE .. LIKE has no ndb_dd attributes 2007-04-03 16:40:16 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
ce52a7bdc3 Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug26898-5.1-new-ndb-bj
2007-04-03 16:30:57 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
c7382b88fd Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug26898-5.1-new-ndb-bj
2007-04-03 16:27:51 +08:00
tomas@whalegate.ndb.mysql.com
d2bcd58e5b Bug #26783 replication status unknown after cluster or mysqld failure
- correction, wrong datatype used
2007-04-03 09:53:15 +02:00
svoj@june.mysql.com
e6f629aff7 Merge mysql.com:/home/svoj/devel/mysql/BUG25729/mysql-5.0-engines
into  mysql.com:/home/svoj/devel/mysql/BUG25729/mysql-5.1-engines
2007-04-03 12:38:15 +05:00
tomas@whalegate.ndb.mysql.com
7e9df0e9b6 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-04-03 09:37:15 +02:00
tomas@whalegate.ndb.mysql.com
d019e94aed remove unused List 2007-04-03 09:30:05 +02:00
svoj@mysql.com/june.mysql.com
ccbdbe5713 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines
into  mysql.com:/home/svoj/devel/mysql/BUG25729/mysql-5.0-engines
2007-04-03 12:11:51 +05:00
msvensson@pilot.blaudden
4614ae5aea Merge bk-internal:/home/bk/mysql-5.1-new-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-03 08:05:30 +02:00
msvensson@pilot.blaudden
1e54f5a1a7 Work around for bug#27606 2007-04-03 08:04:25 +02:00
tomas@whalegate.ndb.mysql.com
879073d37b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
2007-04-03 07:33:29 +02:00
tomas@whalegate.ndb.mysql.com
2dc02167df Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-03 07:21:42 +02:00
tomas@whalegate.ndb.mysql.com
8bf9bf001d Bug #26783 replication status unknown after cluster or mysqld failure
- update the ndb_apply_status table with binlog info
2007-04-03 07:20:55 +02:00
iggy@recycle.(none)
5c0d886248 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  recycle.(none):/src/bug23491_ii/my50-bug23491_ii
2007-04-02 16:25:06 -04:00
tomas@whalegate.ndb.mysql.com
aa7d01bca4 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-02 22:24:04 +02:00
tomas@whalegate.ndb.mysql.com
33a995712f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-04-02 22:23:05 +02:00