rburnett@bk-internal.mysql.com
b1f4ea4555
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-06-24 06:01:57 +02:00
elliot@mysql.com
a5181fdcde
Post merge fix.
2006-06-23 17:59:24 -04:00
elliot@mysql.com
d4796d9df6
Merge mysql.com:/home/emurphy/src/bk-clean/tmp_merge
...
into mysql.com:/home/emurphy/src/bk-clean/mysql-5.1
2006-06-23 17:27:54 -04:00
rburnett@bk-internal.mysql.com
d9d2bf5b94
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-06-23 15:29:33 +02:00
monty@mysql.com
059c45d016
Suppress memory leak from 'kill_server'
...
(Happens if main thread exists before kill_server thread, which is ok)
2006-06-23 10:46:16 +03:00
monty@mysql.com
649157954b
Fixed failure with rpl_truncate_7ndb.test when using statement based replication.
...
is_injective -> table_flag() HA_HAS_OWN_BINLOGGING
(Faster and easier to understand)
Allow cluster_binlogging also in mixed replication mode.
2006-06-22 22:44:21 +03:00
gluh@eagle.intranet.mysql.r18.ru
2415b3210e
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-kt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-kt
2006-06-22 19:21:59 +05:00
gluh@eagle.intranet.mysql.r18.ru
4c746fdb8e
test fix(to satisfy Win)
2006-06-22 19:20:29 +05:00
bar@bar.intranet.mysql.r18.ru
025180044e
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-kt
...
into mysql.com:/usr/home/bar/mysql-5.1.b20086
2006-06-22 18:55:44 +05:00
bar@bar.intranet.mysql.r18.ru
5694d5a63c
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-kt
...
into mysql.com:/usr/home/bar/mysql-5.1.b20086
2006-06-22 18:51:50 +05:00
bar@bar.intranet.mysql.r18.ru
ac487f52aa
Merge mysql.com:/usr/home/bar/mysql-5.1-new.19392
...
into mysql.com:/usr/home/bar/mysql-5.1-kt
2006-06-22 18:38:26 +05:00
monty@mysql.com
b8ab496057
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2006-06-22 12:21:41 +03:00
rburnett@bk-internal.mysql.com
d9fb74e40e
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-06-22 01:25:57 +02:00
mikael@dator5.(none)
9543cae6cf
Merge dator5.(none):/home/pappa/clean-mysql-5.1
...
into dator5.(none):/home/pappa/bug19281
2006-06-21 19:25:56 -04:00
mikael@dator5.(none)
cb5043199b
mmanual merge
2006-06-21 19:08:30 -04:00
rburnett@bk-internal.mysql.com
8472ce9ff8
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-06-21 17:51:54 +02:00
mikael@dator5.(none)
eab0cfbc25
Merge dator5.(none):/home/pappa/clean-mysql-5.1
...
into dator5.(none):/home/pappa/bug19281
2006-06-21 11:41:06 -04:00
monty@mysql.com
bb02e07777
Change table_id's to # to make tests portable
2006-06-21 18:27:45 +03:00
ramil@myoffice.izhnet.ru
3228ce7f9e
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/usr/home/ram/work/mysql-5.1
2006-06-21 19:14:59 +05:00
rburnett@bk-internal.mysql.com
5a558eaf89
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-06-21 15:33:22 +02:00
lars@mysql.com
207c0baf45
After merge fix
2006-06-21 15:30:26 +02:00
ramil@mysql.com
db2acfc926
Fix for bug #20601 : rpl_ndb_log.test failure
2006-06-21 18:16:07 +05:00
lars@mysql.com
6b8c196584
Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-06-21 14:14:37 +02:00
lars@dl145j.mysql.com
ed0e98529c
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-06-21 13:51:28 +02:00
lars@mysql.com
6839e64298
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-06-21 13:42:02 +02:00
monty@narttu.mysql.fi
20c00662eb
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2006-06-21 13:24:56 +03:00
gluh@eagle.intranet.mysql.r18.ru
8097ba2046
after merge fixes
2006-06-21 14:53:40 +05:00
mskold@linux.site
7704d973d4
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/marty/MySQL/mysql-5.1
2006-06-21 10:10:01 +02:00
bar@mysql.com
bfae7303d7
Bug#20086: Can't get data from key partitioned tables with VARCHAR key
...
The problem appeared because the same values produced different hash
during INSERT and SELECT for VARCHAR data type.
Fix:
VARCHAR required special treatment to avoid hashing of length bytes
(leftmost one or two bytes) as well as trailing bytes beyond real length,
which could contain garbage. Fix is done by introducing hash() - new method
in the Field class.
2006-06-21 13:00:19 +05:00
anozdrin@mysql.com
5ce56c1cdc
Disable IM tests.
2006-06-21 11:44:54 +04:00
mskold@mysql.com
bd3f9cc0a5
Merge mysql.com:/home/marty/MySQL/mysql-5.0-backed
...
into mysql.com:/home/marty/MySQL/mysql-5.1
2006-06-21 09:42:15 +02:00
mskold@mysql.com
e77850e573
Fix for Bug #19906 REPLACE doesn't update TEXT fields correctly
2006-06-21 09:36:50 +02:00
anozdrin@mysql.com
bb94cb24c5
Re-enable IM tests.
2006-06-21 02:17:39 +04:00
anozdrin@mysql.com
ddaebd13dc
Fix merge 5.0 -> 5.1.
2006-06-21 02:16:38 +04:00
anozdrin@booka.site
3a6ad23f43
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/alik/MySQL/devel/5.1-merged
2006-06-21 02:00:49 +04:00
evgen@moonbone.local
6b694bcd58
rpl_ndb_log.result:
...
Corrected test case result
2006-06-21 00:45:01 +04:00
mikael@dator5.(none)
da260e9e3f
Merge dator5.(none):/home/pappa/bug16000
...
into dator5.(none):/home/pappa/bug19281
2006-06-20 16:43:25 -04:00
mikael@dator5.(none)
a3d5c3bf6d
BUG#16000: .par file left behind plus unnecessary messages to error.log
...
New test cases
2006-06-20 16:38:42 -04:00
mikael@dator5.(none)
4f599159c7
Merge dator5.(none):/home/pappa/bug19309
...
into dator5.(none):/home/pappa/bug19281
2006-06-20 15:18:16 -04:00
mikael@dator5.(none)
39b9c16e1a
Merge dator5.(none):/home/pappa/clean-mysql-5.1
...
into dator5.(none):/home/pappa/bug19309
2006-06-20 15:13:44 -04:00
mikael@dator5.(none)
4dd8f90912
Merge dator5.(none):/home/pappa/clean-mysql-5.1
...
into dator5.(none):/home/pappa/bug19281
2006-06-20 15:09:48 -04:00
elliot@mysql.com
37e5ec9f50
Applying patch from SergeyV
...
Fixes bug#17264, for alter table on win32 for successfull operation completion
it is used TL_WRITE(=10) lock instead of TL_WRITE_ALLOW_READ(=6), however here
in innodb handler TL_WRTIE is lifted to TL_WRITE_ALLOW_WRITE, which causes
race condition when several clients do alter table simultaneously.
2006-06-20 13:43:13 -04:00
evgen@moonbone.local
66371d22e2
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into moonbone.local:/work/tmp_merge-5.1-opt-mysql
2006-06-20 20:13:37 +04:00
evgen@moonbone.local
75164ffc2f
rpl_ndb_log.result:
...
Fixed failing test case
2006-06-20 20:11:08 +04:00
rburnett@bk-internal.mysql.com
154961b26a
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-06-20 18:06:22 +02:00
anozdrin@mysql.com
42ef881906
Merge mysql.com:/home/alik/MySQL/devel/5.0-to-be-merged
...
into mysql.com:/home/alik/MySQL/devel/5.1-merged
2006-06-20 18:28:28 +04:00
mikael@dator5.(none)
805ba2462e
Fixed test case
2006-06-20 10:16:08 -04:00
mikael@dator5.(none)
e8d39758c7
Merge dator5.(none):/home/pappa/clean-mysql-5.1
...
into dator5.(none):/home/pappa/bug19281
2006-06-20 10:08:30 -04:00
rburnett@bk-internal.mysql.com
2d6fb900eb
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-06-20 14:51:32 +02:00
svoj@may.pils.ru
1c42c9730d
Merge may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.0
...
into may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.1
2006-06-20 16:45:51 +05:00