holyfoot@deer.(none)
b5afca05a4
WL#2645 (mysql_upgrade tool)
2006-04-10 20:54:43 +05:00
holyfoot@mysql.com
a5d18bc8ab
Merging
2006-04-10 20:54:42 +05:00
aivanov@mysql.com
d70035ca8b
Merge mysql.com:/home/alexi/bugs/mysql-5.0-15868-work
...
into mysql.com:/home/alexi/bugs/mysql-5.1-15868
Null-merge
2006-04-10 19:54:41 +04:00
aivanov@mysql.com
bb94bb30d0
Fixed BUG#15868: InnoDB hangs under 200 threads making INSERTs: 'thread thrashing'.
...
Applied changes due Heikki Tuuri.
2006-04-10 19:47:41 +04:00
brian@zim.(none)
ba5d08f340
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/dep-5.1
2006-04-09 20:07:42 -07:00
brian@zim.(none)
c33ace09b3
Disabling test, added bug #18928
2006-04-09 19:43:36 -07:00
aelkin@mysql.com
0316e7a05b
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1
2006-04-09 23:47:11 +03:00
jonas@perch.ndb.mysql.com
da330a419c
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-04-09 22:17:55 +02:00
brian@zim.(none)
1d02038c1f
Disabled two broken test, created P1 showstoppers from them.
2006-04-09 11:57:25 -07:00
joerg@mysql.com
6dbb1edad8
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/M51/mysql-5.1
2006-04-09 19:17:26 +02:00
aelkin@mysql.com
5b6708e3ba
Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.0
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1
2006-04-09 19:38:59 +03:00
aelkin@mysql.com
95d1d4b5c3
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1
2006-04-09 19:35:31 +03:00
jonas@perch.ndb.mysql.com
d2443da447
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-04-09 18:19:41 +02:00
aivanov@mysql.com
2d5dd11852
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/alexi/bugs/mysql-5.1-15758
2006-04-09 20:19:40 +04:00
aelkin@dl145k.mysql.com
f5c527972f
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145k.mysql.com:/tmp/andrei/5.0.21-bug17284-temp_table
2006-04-09 18:14:30 +02:00
aivanov@mysql.com
61c7e4bac5
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alexi/bugs/mysql-5.0-15758
2006-04-09 20:14:29 +04:00
aivanov@mysql.com
1488caeca6
Merge mysql.com:/home/alexi/bugs/mysql-5.0-15758-work
...
into mysql.com:/home/alexi/bugs/mysql-5.1-15758
2006-04-09 17:48:47 +04:00
aelkin@mysql.com
cbee6eca95
BUG#18906 Test case rpl_temporary fails when using --vardir option
...
env variable name is fixed.
2006-04-09 13:27:53 +03:00
lars@mysql.com
ab71e2ac99
Merge mysql.com:/users/lthalmann/bk/mysql-5.0-release-bug18116
...
into mysql.com:/users/lthalmann/bk/mysql-5.0
2006-04-09 10:40:52 +02:00
jonas@perch.ndb.mysql.com
69d09a4a5b
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-04-09 09:36:59 +02:00
jonas@perch.ndb.mysql.com
263276c581
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-04-09 09:35:20 +02:00
aelkin@mysql.com
9cc16ddb1e
Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.0
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1
2006-04-08 18:51:29 +03:00
jonas@perch.ndb.mysql.com
50e5752e27
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-04-08 16:35:07 +02:00
jonas@perch.ndb.mysql.com
965d6ac6bf
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/51-work
2006-04-08 16:33:59 +02:00
joerg@mysql.com
208ae694bb
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/M51/mysql-5.1
2006-04-08 16:08:38 +02:00
aelkin@mysql.com
010a8a5728
#18906 : bushbuild reports rpl_temporary fails on solaris, AIX, QNX
...
Removing the problematic line from include test file.
2006-04-08 16:29:11 +03:00
aelkin@mysql.com
bac4263629
Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.0
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1
2006-04-08 15:31:47 +03:00
jonas@perch.ndb.mysql.com
64c8342f40
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-04-08 11:12:02 +02:00
jonas@perch.ndb.mysql.com
e5de83a62e
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-04-08 11:03:46 +02:00
ingo@mysql.com
26c4e82fee
Merge mysql.com:/home/mydev/mysql-5.1
...
into mysql.com:/home/mydev/mysql-5.1-aid
2006-04-08 10:48:33 +02:00
igor@rurik.mysql.com
2e662287ce
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into rurik.mysql.com:/home/igor/mysql-5.1
2006-04-07 17:56:33 -07:00
ingo@mysql.com
ddf81838a7
Merge mysql.com:/home/mydev/mysql-5.1
...
into mysql.com:/home/mydev/mysql-5.1-aid
2006-04-07 23:39:01 +02:00
aelkin@dl145j.mysql.com
61377e953d
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145j.mysql.com:/tmp/5.0.21-bug17284-temp_table
2006-04-07 22:42:55 +02:00
serg@serg.mylan
5eefa6ec1f
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-04-07 22:38:53 +02:00
serg@serg.mylan
c17d3a5148
plugin/fulltext/configure.in
...
no sense in building static library version of a plugin
plugin/fulltext/plugin_example.c
comments clarified. everything local to a plugin was declared static
2006-04-07 22:36:04 +02:00
igor@rurik.mysql.com
0d2e911204
Merge rurik.mysql.com:/home/igor/mysql-5.1
...
into rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-04-07 13:22:07 -07:00
igor@rurik.mysql.com
fb3b768205
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into rurik.mysql.com:/home/igor/mysql-5.0
2006-04-07 13:07:40 -07:00
aivanov@mysql.com
612266ec90
Fixed BUG#15758: "Holding adaptive search latch in
...
innobase_query_caching_of_table_permitted()".
Applied the patch due to Heikki Tuuri.
Also removed superfluous #ifdefs.
2006-04-07 23:58:17 +04:00
joerg@mysql.com
a0c3f51c10
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/M50/mtr-5.0
2006-04-07 20:26:12 +02:00
aelkin@mysql.com
bfbd922eb8
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/5.0.21-bug17284-temp_table
2006-04-07 21:21:23 +03:00
joerg@mysql.com
4a5985e694
Manual merge.
2006-04-07 19:50:07 +02:00
aelkin@mysql.com
d881fb36b9
Bug#17284 erroneous temp table cleanup on slave.
...
Idea of the fix is for master to send FD event with `created' as 0
to reconnecting slave (upon slave_net_timeout, no master crash) to avoid destroying temp tables.
In a case of a connect by slave to the master after its crash temp tables have been already
cleaned up so that slave can not keep `orphan' temp tables.
2006-04-07 20:44:37 +03:00
joerg@mysql.com
657d1bd182
Manual merge.
2006-04-07 19:42:46 +02:00
joerg@mysql.com
a7edbc647e
mysql-test/mysql-test-run.sh : Provide info about the options used.
2006-04-07 19:27:19 +02:00
igor@rurik.mysql.com
f053b7c9d0
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into rurik.mysql.com:/home/igor/mysql-5.0
2006-04-07 10:19:09 -07:00
jonas@perch.ndb.mysql.com
739b0d676b
ndb - bug#11034
...
fix mem leak (not during running of transactions, but a few bytes when shutting down)
2006-04-07 17:10:56 +02:00
joerg@mysql.com
06cba02907
Merge mysql.com:/M50/clone-5.0 into mysql.com:/M51/mysql-5.1
2006-04-07 16:45:47 +02:00
jonas@perch.ndb.mysql.com
7cd90d0081
ndb - bug#11033
...
silent valgrind warnings 5.0, ndb_autodiscover
2006-04-07 15:48:13 +02:00
bpontz@shasta.mysql.com
1ec9119308
configure.in:
...
increase version number for clone
2006-04-07 08:54:16 -04:00
ingo@mysql.com
2697018c5b
Merge mysql.com:/home/mydev/mysql-5.1
...
into mysql.com:/home/mydev/mysql-5.1-aid
2006-04-07 14:39:49 +02:00