jonas@eel.(none)
9f69d9ffde
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into eel.(none):/home/jonas/src/51-work
2007-02-02 16:21:42 +01:00
jonas@eel.(none)
4b965407d2
ndb - test prg
...
fix failure during start
2007-02-02 16:14:48 +01:00
tomas@poseidon.mysql.com
36a674b2eb
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-02-02 21:04:02 +07:00
tomas@poseidon.mysql.com
d45e1e4e67
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-02-02 21:01:34 +07:00
gluh@mysql.com/eagle.(none)
938de5eee4
another valgrind error fix for 4.1(backport from 5.0)
2007-02-02 17:18:42 +04:00
joerg@trift2.
ad7b10ca19
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into trift2.:/MySQL/M51/push-5.1
2007-02-02 13:57:19 +01:00
gluh@mysql.com/eagle.(none)
9663691aca
Merge mysql.com:/home/gluh/MySQL/Merge/5.0
...
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2007-02-02 15:21:14 +04:00
gluh@mysql.com/eagle.(none)
31c3059ae9
Valgrind errors
...
added valgrind.supp to EXTRA_SCRIPTS(for pushbuild)
2007-02-02 15:01:11 +04:00
istruewing@chilla.local
80ca34c3a8
Merge chilla.local:/home/mydev/mysql-5.0-axmrg
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-02-02 11:34:22 +01:00
gluh@mysql.com/eagle.(none)
29e1d5f9ce
after merge fix
2007-02-02 14:26:53 +04:00
lzhou/zhl@dev3-63.(none)
8f9f666888
Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into dev3-63.(none):/home/zhl/mysql/tree-merge/5.1/mysql-5.1-new-ndb
2007-02-02 09:39:05 +00:00
lzhou/zhl@dev3-63.(none)
8d5ce41010
Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into dev3-63.(none):/home/zhl/mysql/tree-merge/5.0/mysql-5.0-ndb
2007-02-02 09:31:36 +00:00
istruewing@chilla.local
1616e201d8
Merge chilla.local:/home/mydev/mysql-4.1-axmrg
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-02-02 10:03:22 +01:00
istruewing@chilla.local
3a664472de
After merge fix
2007-02-02 10:01:44 +01:00
gluh@eagle.(none)
7849d31923
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-02-02 10:25:45 +04:00
istruewing@chilla.local
ed09987083
Merge chilla.local:/home/mydev/mysql-5.0-axmrg
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-02-01 19:41:04 +01:00
lzhou/zhl@dev3-63.(none)
224900565c
Merge dev3-63.(none):/home/zhl/mysql/tree-merge/5.1/mysql-5.1-new-ndb-bj
...
into dev3-63.(none):/home/zhl/mysql/tree-merge/5.1/mysql-5.1-new-ndb
2007-02-01 17:34:20 +00:00
lzhou/zhl@dev3-63.(none)
fd1135bb19
Merge dev3-63.(none):/home/zhl/mysql/tree-merge/5.0/mysql-5.0-ndb-bj
...
into dev3-63.(none):/home/zhl/mysql/tree-merge/5.0/mysql-5.0-ndb
2007-02-01 16:42:12 +00:00
istruewing@chilla.local
5e5c1b761c
Merge chilla.local:/home/mydev/mysql-4.1-axmrg
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-02-01 17:33:54 +01:00
istruewing@chilla.local
dae855c168
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-02-01 17:10:09 +01:00
lzhou/zhl@dev3-63.(none)
e208018f75
Merge dev3-63.(none):/home/zhl/mysql/tree-merge/4.1/mysql-4.1-ndb-bj
...
into dev3-63.(none):/home/zhl/mysql/tree-merge/4.1/mysql-4.1-ndb
2007-02-01 15:48:23 +00:00
gluh@mysql.com/eagle.(none)
d1185aaeaf
Bug#23299 Some queries against INFORMATION_SCHEMA with subqueries fail
...
additional call of file->extra() method with HA_EXTRA_NO_CACHE parameter
2007-02-01 19:12:45 +04:00
istruewing@chilla.local
b0e8f2b534
Bug#25844: "make test" does not find mysql-test-run.pl
...
Need to change directory before calling mysql-test-run.pl
2007-02-01 15:59:51 +01:00
joerg@trift2.
9af6d01e3c
Merge trift2.:/MySQL/M51/mysql-5.1
...
into trift2.:/MySQL/M51/push-5.1
2007-02-01 15:57:01 +01:00
istruewing@chilla.local
33e1d1091a
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into chilla.local:/home/mydev/mysql-4.1-axmrg
2007-02-01 15:51:25 +01:00
lzhou/zhl@dev3-63.(none)
956636767e
BUG#22025 Return correct error message when transporter error occured. Modify content of message structure of last patch.
2007-02-01 14:37:43 +00:00
istruewing@chilla.local
54bf789a6d
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-02-01 15:15:40 +01:00
gluh@mysql.com/eagle.(none)
010dc0b55c
Valgrind error fixes
...
Notes:
This patch doesn't fix all issues in the tree and we need jani's fix for that
This patch shoud not be merged into 5.0
2007-02-01 18:00:24 +04:00
mskold/marty@mysql.com/linux.site
0e20ef0ae4
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2007-02-01 13:59:34 +01:00
gkodinov/kgeorge@rakia.gmz
d9ae9ce58d
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into rakia.gmz:/home/kgeorge/mysql/autopush/B23556-5.0-opt
2007-02-01 13:26:25 +02:00
gkodinov/kgeorge@rakia.gmz
95154f86b5
trigger.result:
...
merge of the 5.0-opt tree
2007-02-01 13:25:50 +02:00
istruewing@chilla.local
1c34270464
Merge chilla.local:/home/mydev/mysql-4.1-axmrg
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-02-01 10:19:22 +01:00
gkodinov/kgeorge@rakia.gmz
f697acb0ca
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into rakia.gmz:/home/kgeorge/mysql/autopush/B23556-5.0-opt
2007-02-01 11:07:17 +02:00
gkodinov/kgeorge@rakia.gmz
1096dbd5fa
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into rakia.gmz:/home/kgeorge/mysql/autopush/B23556-5.1-opt
2007-02-01 10:59:14 +02:00
mskold/marty@linux.site
a1710e2033
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-02-01 09:55:11 +01:00
gkodinov/kgeorge@rakia.gmz
0d40608fff
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into rakia.gmz:/home/kgeorge/mysql/autopush/B25551-5.0-opt
2007-02-01 10:50:41 +02:00
mskold/marty@linux.site
491b78be67
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2007-02-01 09:50:38 +01:00
mskold/marty@mysql.com/linux.site
c16251ad7c
Bug #25522 Update with IN syntax Clustertable + Trigger leads to mysqld segfault: moved back assignment
2007-02-01 09:48:45 +01:00
istruewing@chilla.local
a3705af35f
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-02-01 09:26:09 +01:00
mskold/marty@linux.site
5aaa74a41a
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-02-01 08:49:09 +01:00
istruewing@chilla.local
73e61944f7
Merge chilla.local:/home/mydev/mysql-4.0-axmrg
...
into chilla.local:/home/mydev/mysql-4.1-axmrg
2007-02-01 08:09:36 +01:00
istruewing@chilla.local
97cf413d55
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines
...
into chilla.local:/home/mydev/mysql-4.1-axmrg
2007-02-01 07:52:28 +01:00
stewart@willster.(none)
48649030cb
BUG#25323 NDB binlog timer prints incorrect stats
...
fix time period calculation
2007-02-01 17:28:41 +11:00
stewart@willster.(none)
71097eff45
BUG#23571 missing jamEntry() after EXECUTE_DIRECT in lqh
...
add the jamEntry()
2007-02-01 17:19:19 +11:00
brian@zim.(none)
acd1201504
Reworked a section of code that caused valgrind errors (and that partitioning was not happy about).
2007-01-31 20:13:17 -08:00
igor@olga.mysql.com
710136217b
Fixed bug #25407 .
...
The bug could cause choosing a sub-optimal execution plan for
a single-table query if a unique index with many null keys were
defined for the table.
It happened because the code of the check_quick_keys function
made an assumption that any key may occur in an unique index
only once. Yet this is not true for keys with nulls that may
have multiple occurrences in the index.
2007-01-31 19:31:36 -08:00
mskold/marty@linux.site
201705a4b4
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-01-31 22:58:03 +01:00
mskold/marty@linux.site
4cc8da4d39
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2007-01-31 22:43:24 +01:00
mskold/marty@mysql.com/linux.site
5cd40ad30b
Bug #25522 Update with IN syntax Clustertable + Trigger leads to mysqld segfault: in start_stmt, only change query_state if starting a new transactions, in read_multi_range_next, change query state when end is reached
2007-01-31 22:38:06 +01:00
df@kahlann.erinye.com
3f12c914b7
use MTR_BUILD_THREAD=auto for rpm builds
2007-01-31 19:01:46 +01:00