mskold@mysql.com
5c9500438e
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-03-09 17:45:51 +01:00
mskold@mysql.com
adb6c4debb
bug#18040 - ndb online index build
2006-03-09 17:42:35 +01:00
tomas@poseidon.ndb.mysql.com
6c1b0b37b6
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-03-09 15:51:54 +01:00
tomas@poseidon.ndb.mysql.com
280e2bf440
Bug #18106 Ndb: Online add index together with replication may cause mysqld core
2006-03-09 15:50:26 +01:00
mskold@mysql.com
9dc829eb9b
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-03-09 13:42:16 +01:00
mskold@mysql.com
f2ad519ed3
bug#18040: Create unique index cause error 4243
2006-03-09 13:41:11 +01:00
tomas@poseidon.ndb.mysql.com
dc08a83735
missing DBUG_RETURN added
2006-03-09 09:30:32 +01:00
bar@mysql.com
8c2fb88a8f
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new/
...
into mysql.com:/usr/home/bar/mysql-5.1-new.b16318
2006-03-09 11:53:56 +04:00
holyfoot@mysql.com
481dc5b7e5
Merge bk@192.168.21.1:mysql-5.1-new
...
into mysql.com:/home/hf/work/mysql-5.1.mrg
2006-03-09 10:21:58 +04:00
tomas@poseidon.ndb.mysql.com
610aa1e07c
Bug #17838 binlog not setup on seconday master after rename
...
-added setting up of binlogging after receiving rename table
+cleanup
2006-03-09 01:04:13 +01:00
tomas@poseidon.ndb.mysql.com
696c76778a
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-03-08 15:33:15 +01:00
tomas@poseidon.ndb.mysql.com
0eb12cafe1
cleanup of ndb invalidate dictionary cache
...
fixed test case from previous commit
2006-03-08 15:29:57 +01:00
tomas@poseidon.ndb.mysql.com
ed1f9a3402
Bug #17812 Previous lock table for write causes "stray" lock although table is recreated
...
- only set table share version to 0 (zero) on global invalidation
2006-03-08 14:45:09 +01:00
holyfoot@mysql.com
b5fc0db76d
Merge mysql.com:/home/hf/work/mysql-5.0.mrg
...
into mysql.com:/home/hf/work/mysql-5.1.mrg
2006-03-08 17:16:43 +04:00
mats@mysql.com
db4316a948
Merge mysql.com:/home/bkroot/mysql-5.1-new
...
into mysql.com:/home/bk/w3171-mysql-5.1-new
2006-03-08 06:58:57 +01:00
mats@mysql.com
6a1d4bac6e
WL#3171: Dynamic logging format
...
Removed error on seeing table map event when slave is in SBR mode
and switching temporarily to RBR mode to replicate the rows.
2006-03-08 06:55:21 +01:00
reggie@linux.site
980434bf4b
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into linux.site:/home/reggie/work/mysql-5.1
2006-03-07 14:52:51 -06:00
serg@serg.mylan
7166facb71
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-03-07 20:01:03 +01:00
mats@mysql.com
907a11e828
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/bkroot/mysql-5.1-new
2006-03-07 15:21:39 +01:00
mats@mysql.com
67a99df970
Merge mysql.com:/home/bkroot/mysql-5.1-new
...
into mysql.com:/home/bk/b16228-mysql-5.1-new
2006-03-07 13:34:31 +01:00
mats@mysql.com
ec4b9f8edc
Merge mysql.com:/home/bkroot/mysql-5.1-new
...
into mysql.com:/home/bk/b16228-mysql-5.1-new
2006-03-07 13:31:38 +01:00
mats@mysql.com
e824e61618
Bug#16228 (RBR: Slave SQL thread retries infinitely):
...
Transaction aborted on slave should be retries. The OPTION_BEGIN
bit was cleared prematurely. Removed dependence of code on value
of OPTION_BEGIN bit when executing retries.
2006-03-07 13:29:53 +01:00
gluh@mysql.com
8271f58942
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-new
2006-03-07 15:27:02 +04:00
gluh@eagle.intranet.mysql.r18.ru
bcf710e97c
Fix for bug#15447 Partitions: NULL is treated as zero
...
NULL value handling
2006-03-07 15:25:08 +04:00
tomas@poseidon.ndb.mysql.com
5e77d28789
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-03-07 12:21:06 +01:00
tomas@poseidon.ndb.mysql.com
a0f82c18ef
Bug #16874 memory leaks in rpl_row_basic_7ndb.test
...
- free ndb shares at server shutdown
- free_table_share at free of ndb_share
2006-03-07 12:19:27 +01:00
bar@mysql.com
23332d0d95
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/home/bar/mysql-5.1-new.b17142
2006-03-07 13:07:23 +04:00
bar@mysql.com
02023859bf
Bug#17142 Crash if create with encoded name
...
upgrade.result, upgrade.test:
Adding test case.
table.cc:
Don't try to open a table with old-formatted name,
if the table name contains "@" character.
This is to avoid mixing two different names to each other.
Thanks Monty for suggesting this fix.
2006-03-07 13:05:24 +04:00
mats@mysql.com
3f7b8cfb6e
Merge mysql.com:/home/bkroot/mysql-5.1-new
...
into mysql.com:/home/bk/fix-mysql-5.1-new
2006-03-07 08:40:09 +01:00
mats@mysql.com
0713aa597a
Bug#17874 (Test failure: rpl_row_basic_3innodb):
...
Some storage engines does not set the filler bits, so we set them
before calling the record-reading functions.
2006-03-07 08:33:20 +01:00
reggie@big_geek.
57f56eb4bf
Bug #17720
...
Minor cleanup from Mikael's review
2006-03-06 23:18:48 -06:00
serg@serg.mylan
84ff8192ff
merged
2006-03-06 23:20:19 +01:00
serg@serg.mylan
d190e08e4e
merged
2006-03-06 20:53:14 +01:00
pem@mysql.com
a065843799
Merge mysql.com:/extern/mysql/5.0/generic/mysql-5.0
...
into mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new
2006-03-06 19:46:17 +01:00
serg@serg.mylan
e7504b3468
merged
2006-03-06 18:34:38 +01:00
serg@serg.mylan
0b2f4ac3be
kill (subquery) - three years old bugfix that never worked
2006-03-06 18:26:39 +01:00
holyfoot@mysql.com
8707e3356d
Merge mysql.com:/home/hf/work/mysql-5.0.15745
...
into mysql.com:/home/hf/work/mysql-5.0.mrg
2006-03-06 19:57:20 +04:00
msvensson@neptunus.(none)
c9d14a0329
Merge bk-internal:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-06 14:03:16 +01:00
bar@mysql.com
6823225a81
Merge mysql.com:/usr/home/bar/mysql-4.1.b15949
...
into mysql.com:/usr/home/bar/mysql-5.0
2006-03-06 16:20:15 +04:00
gluh@mysql.com
7f4b27cf29
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/gluh/MySQL/Merge/5.0
2006-03-06 15:58:16 +04:00
msvensson@devsrv-b.mysql.com
ee97bebc8c
Merge bk-internal:/home/bk/mysql-5.0
...
into devsrv-b.mysql.com:/space/magnus/bug17377/my50-bug17377
2006-03-06 12:28:30 +01:00
kent@mysql.com
ff71af1e01
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-03-06 12:21:10 +01:00
kent@mysql.com
dfae81d014
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-tmp
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-03-06 12:15:26 +01:00
gluh@mysql.com
321eb3dce6
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/gluh/MySQL/Merge/5.0
2006-03-06 15:15:23 +04:00
msvensson@devsrv-b.mysql.com
2660607096
Merge devsrv-b.mysql.com:/space/magnus/mysql-5.0
...
into devsrv-b.mysql.com:/space/magnus/bug17377/my50-bug17377
2006-03-06 12:04:54 +01:00
msvensson@neptunus.(none)
e4705ea4bf
Merge bk-internal:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-06 11:51:46 +01:00
bar@mysql.com
e019d60536
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b15949
2006-03-06 14:50:34 +04:00
msvensson@neptunus.(none)
40b3222b74
Merge neptunus.(none):/home/msvensson/mysql/bug10460/my51-bug10460
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-06 11:39:36 +01:00
gluh@mysql.com
69e8b9d06e
4.1 -> 5.0 merge
2006-03-06 14:38:31 +04:00
gluh@eagle.intranet.mysql.r18.ru
f1eaf7e8ec
Fix for bug#14385 GRANT and mapping to correct user account problems
...
Check if the host of table hash record exactly matches host from GRANT command
2006-03-06 14:03:40 +04:00