gkodinov/kgeorge@magare.gmz
b530ae54ee
BUG 27513: fixed left-over sql mode from a test case.
2007-04-04 13:38:19 +03:00
tsmith@quadxeon.mysql.com
a95aa68008
Portability fix to work around OS X -x86 toolchain bug with common (uninitialized data) symbols
2007-04-04 11:41:43 +02:00
tsmith@quadxeon.mysql.com
f14c2448c3
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg04/50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg04/51
2007-04-04 11:38:15 +02:00
holyfoot/hf@hfmain.(none)
cba85dba20
Merge mysql.com:/home/hf/work/27359/my51-27359
...
into mysql.com:/home/hf/work/my_mrg/my51-my_mrg
2007-04-04 14:20:00 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
e44f0a2a2c
merging
2007-04-04 14:19:33 +05:00
tsmith@quadxeon.mysql.com
ab15c0fb94
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg04/50
2007-04-04 11:06:48 +02:00
holyfoot/hf@hfmain.(none)
d7352bdd3e
Merge mysql.com:/home/hf/work/24633/my51-24633
...
into mysql.com:/home/hf/work/my_mrg/my51-my_mrg
2007-04-04 14:05:45 +05:00
tsmith@quadxeon.mysql.com
2117193783
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg04/51
2007-04-04 11:05:22 +02:00
holyfoot/hf@hfmain.(none)
f65b42dc6e
Merge mysql.com:/home/hf/work/23675/my51-23675
...
into mysql.com:/home/hf/work/my_mrg/my51-my_mrg
2007-04-04 14:04:05 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
f55ab9ef5e
Bug #23675 Partitions: possible security breach via alter
...
now we return different error message if user doesn't have
SELECT grants
2007-04-04 14:01:47 +05:00
gkodinov/kgeorge@magare.gmz
41ac6776f5
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B27513-5.0-opt
2007-04-04 11:52:53 +03:00
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
df@pippilotta.erinye.com
76d21619db
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-04-03 19:00:11 +02:00
df@pippilotta.erinye.com
c686576eba
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-04-03 18:59:43 +02:00
df@pippilotta.erinye.com
2a0b0873a3
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-RPMs
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-RPMs
2007-04-03 18:42:55 +02:00
df@pippilotta.erinye.com
8c490e2689
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-RPMs
2007-04-03 18:16:42 +02:00
df@pippilotta.erinye.com
6ed21ea834
no Max rpms anymore, but a debug binary
2007-04-03 18:04:24 +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
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