Commit graph

44609 commits

Author SHA1 Message Date
tomas@whalegate.ndb.mysql.com
128b118bf0 Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-03-26 10:11:15 +02:00
tomas@whalegate.ndb.mysql.com
690b16be05 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-03-26 10:01:43 +02:00
tomas@whalegate.ndb.mysql.com
01189d9627 Bug #26900 ndb_restore printout option does not give structured data
- set sizes for data
2007-03-26 09:58:01 +02:00
mats@romeo.(none)
6269e4f216 Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
into  romeo.(none):/home/bk/b22583-mysql-5.1-new-rpl
2007-03-26 09:02:38 +02:00
brian@zim.(none)
ff9da1f048 New comments, additional init for rebuild options. 2007-03-25 11:38:49 -07:00
tomas@whalegate.ndb.mysql.com
4d228c2f8f Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-03-25 16:44:44 +02:00
tomas@whalegate.ndb.mysql.com
cc47508432 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca-single-user
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-03-25 16:44:06 +02:00
pekka@clam.(none)
5f061a7e5c Merge clam.ndb.mysql.com:/export/space/pekka/ndb/version/my51-ndb
into  clam.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug24028
2007-03-25 15:06:19 +02:00
brian@zim.(none)
8c322769dc Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
into  zim.(none):/home/bk/mysql-5.1-arch
2007-03-23 19:05:48 -07:00
brian@zim.(none)
bbe97fa4e3 Added delayed open of file descriptors to cut down on issues surrounding large collections of partitions being open by many threads. 2007-03-23 18:51:56 -07:00
tomas@whalegate.ndb.mysql.com
d5f63f25c5 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-03-23 21:50:57 +01:00
tomas@whalegate.ndb.mysql.com
ac0da397db rpl_ndb_sync.result, ndb_partition_key.result:
test case
2007-03-23 21:49:49 +01:00
baker@bk-internal.mysql.com
503d7b20cb Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2007-03-23 20:25:36 +01:00
joerg@trift2.
751531fca7 mysql-test/t/query_cache_sql_prepare.test : Prevent this test from running in "embedded". 2007-03-23 17:31:10 +01:00
tomas@whalegate.ndb.mysql.com
972837350b result file updates, message format changes 2007-03-23 17:22:52 +01:00
tomas@whalegate.ndb.mysql.com
78dce2dd97 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-single-user
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-03-23 17:17:44 +01:00
tomas@whalegate.ndb.mysql.com
41dfbb6f2b enabled and extended single user test 2007-03-23 17:14:38 +01:00
tomas@whalegate.ndb.mysql.com
df278bd605 BUG#27254: Single User Mode.Mysql hangs if it tries delete a ndb table 2007-03-23 17:12:06 +01:00
tomas@whalegate.ndb.mysql.com
aadd161d65 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca-single-user
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-03-23 17:09:10 +01:00
tomas@whalegate.ndb.mysql.com
9af7e2c5a4 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca-single-user
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca-single-user
2007-03-23 17:08:33 +01:00
tomas@whalegate.ndb.mysql.com
a837d95d53 Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes 2007-03-23 17:07:33 +01:00
tomas@whalegate.ndb.mysql.com
f4fed734c6 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca-single-user
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-03-23 14:17:08 +01:00
tomas@whalegate.ndb.mysql.com
8823a1a29f correction of merge 2007-03-23 14:16:31 +01:00
tomas@whalegate.ndb.mysql.com
6c4a7a4469 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca-single-user
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-single-user
2007-03-23 14:09:30 +01:00
tomas@whalegate.ndb.mysql.com
9899df36bd Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca-single-user
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca-single-user
2007-03-23 14:06:00 +01:00
tomas@whalegate.ndb.mysql.com
29ac950b6f Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes 2007-03-23 13:52:03 +01:00
tomas@poseidon.mysql.com
210d055000 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
2007-03-23 13:10:58 +01:00
holyfoot/hf@hfmain.(none)
5e0596f4e1 Merge bk@192.168.21.1:mysql-5.1
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
2007-03-23 15:51:21 +04:00
joerg@trift2.
d6880edd86 Merge trift2.:/MySQL/M50/push-5.0
into  trift2.:/MySQL/M51/push-5.1
2007-03-23 11:31:14 +01:00
joerg@trift2.
a1ffb00288 Merge trift2.:/MySQL/M50/clone-5.0
into  trift2.:/MySQL/M50/push-5.0
2007-03-23 11:13:15 +01:00
joerg@trift2.
4ab912c92a Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2007-03-23 11:10:27 +01:00
joerg@trift2.
dbad0e1c23 Merge trift2.:/MySQL/M50/clone-5.0
into  trift2.:/MySQL/M51/push-5.1
2007-03-23 11:05:11 +01:00
joerg@trift2.
2e5e79cf37 Merge trift2.:/MySQL/M51/mysql-5.1
into  trift2.:/MySQL/M51/push-5.1
2007-03-23 10:57:17 +01:00
tomas@whalegate.ndb.mysql.com
05984c7aeb Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-03-23 08:20:36 +01:00
dfischer/mysqldev@mysql.com/production.mysql.com
b9a317de70 Raise version number after cloning 5.1.17-beta 2007-03-23 07:27:46 +01:00
holyfoot/hf@mysql.com/hfmain.(none)
e06a8826c9 fixes to make embedded-server test working 2007-03-23 10:16:30 +04:00
stewart@willster.(none)
21e9072775 WL#3704 mgmapi timeouts: fix compile warning 2007-03-23 15:25:58 +11:00
omer@linux.site
cbdd03c5d5 Merge linux.site:/home/omer/source/bld50_0321
into  linux.site:/home/omer/source/bld51_0322
2007-03-22 14:49:25 -07:00
holyfoot/hf@mysql.com/hfmain.(none)
7eb78d8d04 merging 2007-03-23 01:46:02 +04:00
holyfoot/hf@hfmain.(none)
2a54dcd997 Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
2007-03-23 01:05:45 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
e1044ab5d1 merging 2007-03-23 01:04:31 +04:00
omer@linux.site
6592ecef8b Merge obarnir@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  linux.site:/home/omer/source/bld50_0321
2007-03-22 13:49:47 -07:00
evgen@moonbone.local
a2219567a1 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  moonbone.local:/mnt/gentoo64/work/26813-bug-5.0-opt-mysql
2007-03-22 23:15:30 +03:00
evgen@moonbone.local
38e023781a sql_view.cc:
Post-fix for bug#26813.
2007-03-22 23:13:40 +03:00
holyfoot/hf@hfmain.(none)
a7f5f07b6f Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
2007-03-23 00:09:12 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
fc23f3356e Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt
2007-03-23 00:04:47 +04:00
holyfoot/hf@hfmain.(none)
81b59fb3cc Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
2007-03-22 23:59:20 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
68f9ff123c Merge bk@192.168.21.1:mysql-5.0-opt
into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt
2007-03-22 23:54:47 +04:00
holyfoot/hf@hfmain.(none)
0d55666960 Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
2007-03-22 23:51:09 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
e556a0431b Merge mysql.com:/home/hf/work/mrg/mysql-4.1-opt
into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt
2007-03-22 23:50:33 +04:00