ingo@mysql.com
bd37ef8ad5
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-bug8841
2006-02-16 10:31:32 +01:00
msvensson@neptunus.(none)
23c694a596
Merge msvensson@devsrv-b:/space/magnus/my51-bug17386
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-16 10:24:50 +01:00
msvensson@neptunus.(none)
5e18443df3
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-16 10:23:33 +01:00
msvensson@neptunus.(none)
ee51f00821
Merge neptunus.(none):/home/msvensson/mysql/bug16333/my51-bug16333
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-16 10:22:04 +01:00
msvensson@neptunus.(none)
6282d5aa4f
Merge neptunus.(none):/home/msvensson/mysql/bug16333/my50-bug16333
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-16 10:20:42 +01:00
msvensson@neptunus.(none)
6a2c609fa4
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-16 10:18:12 +01:00
ingo@mysql.com
cc538673ce
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-bug8841
2006-02-16 10:17:30 +01:00
mskold@mysql.com
ae586462b2
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb_improved_on-line_discover
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-ndb_improved_on-line_discover
2006-02-16 10:15:44 +01:00
msvensson@neptunus.(none)
c00adf2028
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-16 10:09:53 +01:00
msvensson@neptunus.(none)
2c2d404fd7
Merge neptunus.(none):/home/msvensson/mysql/bug16333/my50-bug16333
...
into neptunus.(none):/home/msvensson/mysql/bug16333/my51-bug16333
2006-02-16 10:08:02 +01:00
mskold@mysql.com
e62db4e18c
Improvement of on-line discovery in injector thread
2006-02-16 10:07:31 +01:00
msvensson@neptunus.(none)
7d9eba0441
ndb_load disabled
2006-02-16 10:03:13 +01:00
jonas@perch.ndb.mysql.com
5283af4efe
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb-new
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-02-16 09:12:45 +01:00
jonas@perch.ndb.mysql.com
6c809561fe
Merge perch.ndb.mysql.com:/home/jonas/src/51-ndb
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-02-16 09:07:17 +01:00
jonas@perch.ndb.mysql.com
0e605ba313
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-02-16 09:05:58 +01:00
ingo@mysql.com
65a4e27633
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-bug8841
2006-02-16 08:59:55 +01:00
ingo@mysql.com
233155e64e
Merge mysql.com:/home/mydev/mysql-5.1
...
into mysql.com:/home/mydev/mysql-5.1-bug8841
2006-02-16 07:01:15 +01:00
stewart@mysql.com
05696de46f
Merge mysql.com:/home/stewart/Documents/MySQL/5.0/bug17411-thisisaverylongnamethatshouldbewaylongerthanthe128limitthatweprivouslyhadbutireallywantotestitandseethatitdoesreallywork.nowitshouldbeabout160charslongnonow.iwonderifanythingwillchokeornotwiththisoutrageouslylongpathname
...
into mysql.com:/home/stewart/Documents/MySQL/5.1/new
2006-02-16 15:51:37 +11:00
stewart@mysql.com
86332f4369
Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main
...
into mysql.com:/home/stewart/Documents/MySQL/5.0/bug17411-thisisaverylongnamethatshouldbewaylongerthanthe128limitthatweprivouslyhadbutireallywantotestitandseethatitdoesreallywork.nowitshouldbeabout160charslongnonow.iwonderifanythingwillchokeornotwiththisoutrageouslylongpathname
2006-02-16 15:47:48 +11:00
andrey@lmy004.
6354f2454d
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug16406
2006-02-16 05:23:04 +01:00
andrey@lmy004.
7b2650a256
small post-merge fixes for bug#16406
...
(pre-push)
2006-02-16 05:21:02 +01:00
jmiller@mysql.com
b84ee0dec8
Test case updates and new test cases added to CRBR
2006-02-16 04:42:16 +01:00
tomas@poseidon.ndb.mysql.com
704562f696
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-16 03:24:55 +01:00
tomas@poseidon.ndb.mysql.com
212d8c05e6
Bug #17415 special character tables are not handled correctly in ndb binlog/schema dist
2006-02-16 03:23:43 +01:00
andrey@lmy004.
95e87f0811
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug16406
2006-02-16 02:13:37 +01:00
jimw@mysql.com
6892c2a52a
Small post-merge fix to partition test
2006-02-15 17:01:31 -08:00
andrey@lmy004.
2158add8f0
merge
2006-02-16 01:27:36 +01:00
jmiller@mysql.com
20d12aa85b
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-02-16 01:06:16 +01:00
msvensson@neptunus.(none)
3fc22ca4b9
Bug#13809 mysql-test: --replace_result option works on Windows incorrect
2006-02-16 00:53:55 +01:00
andrey@lmy004.
d3e0875759
fix for bug#16406 (Events: DROP DATABASE doesn't automatically drop events)
...
WL#1034
- This changeset also changes the executor so its quite more stable now.
Stressing test case added that executes ~800 events per second and dropping
hundreds of events at once using DROP DATABASE.
(with fixes after review of JimW)
(with fixes after review of Serg)
2006-02-16 00:43:11 +01:00
tomas@poseidon.ndb.mysql.com
cd8f8449e2
Bug #17414 ndb schema distribution functionality does not work on mysql servers without binlog
2006-02-16 00:30:56 +01:00
jimw@mysql.com
5e6b6c9935
Merge bk-internal:/home/bk/mysql-5.1-new
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-02-15 15:08:20 -08:00
andrey@lmy004.
00b188cc52
build fixes
2006-02-15 23:43:11 +01:00
msvensson@neptunus.(none)
47257f1317
Bug#16795 ndb_cache_multi2
...
- remove timing dependent part of test, wait until condition occurs or sleep max 10 seconds
2006-02-15 22:46:16 +01:00
msvensson@neptunus.(none)
cac0931b8c
Add possibility to have a negative expression in "if" and "while" in mysqltest
2006-02-15 22:43:42 +01:00
andrey@lmy004.
a613782f96
more cosmetic before push of fix for bug#17289
2006-02-15 22:32:25 +01:00
jimw@mysql.com
95b45389cd
Merge bk-internal:/home/bk/mysql-5.1-new
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-02-15 13:11:51 -08:00
ingo@mysql.com
e116d697bd
Merge mysql.com:/home/mydev/mysql-5.1
...
into mysql.com:/home/mydev/mysql-5.1-bug8841
2006-02-15 21:54:01 +01:00
andrey@lmy004.
189baa169b
merging before test + push
2006-02-15 21:51:57 +01:00
andrey@lmy004.
8193669f0a
cosmetic post-review changes
2006-02-15 21:40:38 +01:00
andrey@lmy004.
46fcb188d0
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug16410
2006-02-15 21:32:58 +01:00
andrey@lmy004.
c29fdc8844
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug16410
2006-02-15 21:26:33 +01:00
serg@serg.mylan
1f07d78c2a
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-02-15 21:25:31 +01:00
serg@serg.mylan
53d7570b9e
Item_case_expr::type() cannot be called without fix_fields() :(
2006-02-15 21:22:53 +01:00
msvensson@neptunus.(none)
bb52ae8ca6
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-15 21:15:45 +01:00
jimw@mysql.com
d33b03abef
Merge mysql.com:/home/jimw/my/mysql-5.0-clean
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-02-15 12:06:20 -08:00
joerg@mysql.com
26ddd4fa45
config/ac-macros/ha_ndbcluster.m4 : Get back the message "Using NDB Cluster".
2006-02-15 21:04:42 +01:00
jimw@mysql.com
9b333dd393
Merge mysql.com:/home/jimw/my/mysql-5.1-16782
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-02-15 11:39:54 -08:00
jimw@mysql.com
246a2a7f0c
Merge mysql.com:/home/jimw/my/mysql-5.1-16775
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-02-15 11:36:45 -08:00
jimw@mysql.com
28a88a07ce
Merge mysql.com:/home/jimw/my/mysql-5.0-clean
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-02-15 11:22:03 -08:00