pekka@orca.ndb.mysql.com
|
26e5b93203
|
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
into orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb
|
2006-08-22 14:19:10 +02:00 |
|
jonas@perch.ndb.mysql.com
|
5067c4214b
|
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
|
2006-08-22 12:42:56 +02:00 |
|
jonas@perch.ndb.mysql.com
|
770c2edcdd
|
ndb - reenable "random" failing test
|
2006-08-22 12:41:24 +02:00 |
|
jonas@perch.ndb.mysql.com
|
2ae18a6be4
|
ndb -
add another possible ok error in testcase
|
2006-08-22 11:55:25 +02:00 |
|
pekka@orca.ndb.mysql.com
|
b97a4b7f44
|
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1
into orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb
|
2006-08-22 10:24:58 +02:00 |
|
jonas@perch.ndb.mysql.com
|
a1ea21bf26
|
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
|
2006-08-22 09:49:28 +02:00 |
|
jonas@perch.ndb.mysql.com
|
66801f44f9
|
ndb -
reenable some test after adding sync_with_master to end of test
to make sure that binlog has been applied to slave before end of test
|
2006-08-22 09:48:15 +02:00 |
|
jonas@perch.ndb.mysql.com
|
e0f7590e7c
|
ndb -
fix incorrect assertion in dbacc
|
2006-08-22 09:45:35 +02:00 |
|
cmiller@zippy.cornsilk.net
|
d170f1b124
|
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
|
2006-08-21 16:59:53 -04:00 |
|
rburnett@bk-internal.mysql.com
|
f98b21b732
|
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
|
2006-08-21 20:27:32 +02:00 |
|
cmiller@zippy.cornsilk.net
|
f2f90320de
|
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
|
2006-08-21 12:59:46 -04:00 |
|
cmiller@zippy.cornsilk.net
|
ff57b304a4
|
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
|
2006-08-21 12:55:43 -04:00 |
|
joerg@trift2.
|
47d6296bc7
|
mysql-test/mysql-test-run.pl : Use fixed path names for all NDB binaries,
because searching for them makes the script abort with all non-NDB builds.
|
2006-08-21 16:19:29 +02:00 |
|
kent@mysql.com/g4-2.local
|
b329f2c3ef
|
Many files:
Deleted config/ac-macros/ha_berkeley.m4
Removed more referenses to bdb
|
2006-08-21 15:34:29 +02:00 |
|
rburnett@bk-internal.mysql.com
|
e37e0786fc
|
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
|
2006-08-21 14:38:58 +02:00 |
|
jonas@perch.ndb.mysql.com
|
c7a78551c6
|
ndb - bug#16310
better error message for creating table with non-existing tablespace
|
2006-08-21 14:09:50 +02:00 |
|
jonas@perch.ndb.mysql.com
|
41c876c3f2
|
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
|
2006-08-21 09:48:48 +02:00 |
|
jonas@perch.ndb.mysql.com
|
8ea0b13306
|
ndb - bug#21710
fix bug in drop_file during pageout (LCP)
|
2006-08-21 09:26:52 +02:00 |
|
jonas@perch.ndb.mysql.com
|
21bfd9849b
|
ndb - revert timeout changes, as a test depends on it, it mysterious ways
(mysql-test-run only)
|
2006-08-21 07:53:27 +02:00 |
|
jpipes@shakedown.(none)
|
56443ae201
|
Fix for bug #21642: "configure" with no arguments does not build
|
2006-08-20 17:24:48 -04:00 |
|
holyfoot/hf@mysql.com/deer.(none)
|
cf76884b38
|
Fix for the failing gis.test
|
2006-08-18 22:29:35 +05:00 |
|
joerg@trift2.
|
1f79db41fa
|
mysql-test-run.pl : Fix the search path for "ndb_mgmd" and "ndbd". bug#21721
|
2006-08-18 18:24:38 +02:00 |
|
rburnett@bk-internal.mysql.com
|
d094b5f2f5
|
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
|
2006-08-18 15:46:41 +02:00 |
|
rburnett@bk-internal.mysql.com
|
4b7e3775be
|
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
|
2006-08-17 22:30:32 +02:00 |
|
rburnett@production.mysql.com
|
284fa931bb
|
A couple of adjustments to the merge to fix the broken build
instance.cc:
Removed wrongly placed closing brace
item_geofunc.cc:
needed to pass in a TABLE_SHARE* instead of a TABLE*
|
2006-08-17 22:24:35 +02:00 |
|
jonas@perch.ndb.mysql.com
|
40754dd6e3
|
ndb - rpl_ndb_basic
fix for change of deadlock timeout in config.ini
|
2006-08-17 20:59:42 +02:00 |
|
jonas@perch.ndb.mysql.com
|
a1420b1df8
|
merge
|
2006-08-17 20:51:44 +02:00 |
|
jonas@perch.ndb.mysql.com
|
560fc3e3b3
|
Merge perch.ndb.mysql.com:/home/jonas/src/51-clean
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
|
2006-08-17 19:49:00 +02:00 |
|
rburnett@bk-internal.mysql.com
|
9d531c4f43
|
rename to avoid case sensitive collision
|
2006-08-17 18:50:58 +02:00 |
|
rburnett@bk-internal.mysql.com
|
d65095b451
|
Merge bk-internal.mysql.com:/data0/bk/tmp_reg
into bk-internal.mysql.com:/data0/bk/mysql-5.1
|
2006-08-17 17:19:41 +02:00 |
|
cmiller@zippy.cornsilk.net
|
64092ca93b
|
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
|
2006-08-17 10:55:57 -04:00 |
|
cmiller@zippy.cornsilk.net
|
6998c5140b
|
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
|
2006-08-17 10:53:12 -04:00 |
|
cmiller@zippy.cornsilk.net
|
7d38d61398
|
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
|
2006-08-17 10:49:56 -04:00 |
|
cmiller@zippy.cornsilk.net
|
030ddb48f3
|
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
|
2006-08-17 10:47:23 -04:00 |
|
cmiller@zippy.cornsilk.net
|
c627a6ce84
|
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
|
2006-08-17 10:42:50 -04:00 |
|
rburnett@bk-internal.mysql.com
|
1bfe766869
|
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
|
2006-08-17 16:37:16 +02:00 |
|
jonas@perch.ndb.mysql.com
|
ed1e0b087c
|
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
|
2006-08-17 15:23:13 +02:00 |
|
jonas@perch.ndb.mysql.com
|
7e9b2ef964
|
ndb - pb random failures
Fix bug in lcp during drop table
Make sure that file thread is not started until meta data has completed
|
2006-08-17 15:18:06 +02:00 |
|
pgalbraith/patg@govinda.patg.net
|
dd1d46c2cd
|
merge warning test results (!)
|
2006-08-16 20:39:33 -07:00 |
|
pgalbraith/patg@govinda.patg.net
|
ceb7cb55e7
|
test result changes (non-functional) for 5.1-5.0 merge
|
2006-08-16 17:16:36 -07:00 |
|
iggy@rolltop.ignatz42.dyndns.org
|
00ab7be7b9
|
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint_20328
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-merge
|
2006-08-16 19:31:33 -04:00 |
|
iggy@rolltop.ignatz42.dyndns.org
|
af844dbed6
|
manual merge
|
2006-08-16 19:19:49 -04:00 |
|
iggy@rolltop.ignatz42.dyndns.org
|
ca6532af50
|
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint_20328
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint_20328
|
2006-08-16 16:16:10 -04:00 |
|
iggy@rolltop.ignatz42.dyndns.org
|
a86f035a08
|
Bug#20328 - Correction to test/result for broken Windows build.
|
2006-08-16 13:55:16 -04:00 |
|
pgalbraith/patg@govinda.patg.net
|
370f22418b
|
merge 5.0 -> 5.1, re-enabling federated, disabled partition
|
2006-08-16 10:47:53 -07:00 |
|
patg@govinda.patg.net
|
b56ff54805
|
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into govinda.patg.net:/home/patg/mysql-build/mysql-5.1-clean2
|
2006-08-16 10:05:24 -07:00 |
|
patg@govinda.patg.net
|
79ad722e39
|
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1
into govinda.patg.net:/home/patg/mysql-build/mysql-5.1-clean2
|
2006-08-16 10:03:24 -07:00 |
|
rburnett@bk-internal.mysql.com
|
38a36da86d
|
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
into bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
|
2006-08-16 17:47:20 +02:00 |
|
reggie@big_geek.
|
55165b2f55
|
small fix to enable the test suite to find executables and scripts on Windows
|
2006-08-16 10:19:48 -05:00 |
|
msvensson@shellback.(none)
|
da60a5194c
|
Merge shellback.(none):/home/msvensson/mysql/bug20328/my50-bug20328
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
|
2006-08-16 17:14:40 +02:00 |
|