Commit graph

5243 commits

Author SHA1 Message Date
tomas@poseidon.ndb.mysql.com
911d878ca9 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
2005-07-15 15:08:38 +02:00
tomas@poseidon.ndb.mysql.com
674b6bb151 Merge 2005-07-12 20:01:22 +02:00
svoj@mysql.com
e98959dfbe Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/svoj/devel/mysql/WL2535-mysql-5.1
2005-06-28 16:07:16 +05:00
marty@flipper.bredbandsbolaget.se
67c5214ee4 Made upgrade compatibility in 5.1 range to latest build version 2005-06-23 12:16:20 +02:00
ndbdev@dl145b.mysql.com
dcef1c7532 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-22 19:07:29 +02:00
tulin@dl145b.mysql.com
b4f774f62b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-21 15:14:21 +02:00
tulin@dl145b.mysql.com
a6d0581275 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-21 08:49:21 +02:00
tulin@dl145b.mysql.com
566e9ec32a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-21 07:52:33 +02:00
ndbdev@dl145b.mysql.com
8d3a587453 Merge dl145c:tomas/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-17 14:22:33 +02:00
ndbdev@dl145b.mysql.com
dd891e35a3 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-16 21:39:06 +02:00
ndbdev@dl145b.mysql.com
b6eebbecc2 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-16 13:42:15 +02:00
ndbdev@dl145b.mysql.com
a398734315 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-16 12:02:17 +02:00
ndbdev@dl145b.mysql.com
be7c5c1900 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-15 20:07:31 +02:00
ndbdev@dl145b.mysql.com
3e26223773 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-14 10:11:22 +02:00
joreland@mysql.com
84a04b4a9d merge 2005-06-13 14:09:09 +02:00
joreland@mysql.com
54cff2bc30 merge 2005-06-13 08:05:29 +02:00
svoj@mysql.com
1e75a266b3 Merge mysql.com:/mnt/archive/svoj/mysql/mysql-5.1
into mysql.com:/home/svoj/devel/mysql/WL2535-mysql-5.1
2005-06-07 21:56:13 +05:00
ndbdev@dl145b.mysql.com
723173c0f3 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-07 12:50:45 +02:00
ndbdev@dl145b.mysql.com
2fb1fb5877 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-07 06:50:50 +02:00
ndbdev@dl145b.mysql.com
161a58ab4b merge 2005-06-06 23:39:19 +02:00
tomas@poseidon.ndb.mysql.com
d5e7d650f0 CommandInterpreter.cpp:
Bug #11050  	ndb_mgm "show" prints incorrectly after master data node fails
2005-06-02 23:11:54 +02:00
tomas@poseidon.ndb.mysql.com
27b48cbaee Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
2005-06-02 01:18:03 +02:00
tomas@poseidon.ndb.mysql.com
5088b28d09 Merge 2005-05-31 14:37:47 +02:00
svoj@mysql.com
5193b4ec70 WL#2535 - smarter "index merge" in fulltext 2005-05-27 00:43:40 +05:00
ndbdev@dl145c.mysql.com
30def9f3f8 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-05-23 10:45:48 +02:00
ndbdev@dl145c.mysql.com
f0f8b0a97b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-05-20 06:25:02 +02:00
tulin@dl145c.mysql.com
be861a7ccf merge 2005-05-19 09:04:24 +02:00
tulin@dl145c.mysql.com
23f79bd1f2 merge 2005-05-17 10:17:53 +02:00
tulin@dl145c.mysql.com
e5976800f7 make dist target fixes 2005-05-16 14:11:42 +02:00
tulin@dl145b.mysql.com
b501f6fa38 conf-daily-sql-ndbmaster.txt:
Rename: ndb/test/run-test/conf-daily-sql-ndbmaster.txt -> storage/ndb/test/run-test/conf-daily-sql-ndbmaster.txt
conf-daily-devel-ndbmaster.txt:
  Rename: ndb/test/run-test/conf-daily-devel-ndbmaster.txt -> storage/ndb/test/run-test/conf-daily-devel-ndbmaster.txt
conf-daily-basic-shark.txt:
  Rename: ndb/test/run-test/conf-daily-basic-shark.txt -> storage/ndb/test/run-test/conf-daily-basic-shark.txt
conf-daily-basic-ndbmaster.txt:
  Rename: ndb/test/run-test/conf-daily-basic-ndbmaster.txt -> storage/ndb/test/run-test/conf-daily-basic-ndbmaster.txt
conf-daily-basic-dl145a.txt:
  Rename: ndb/test/run-test/conf-daily-basic-dl145a.txt -> storage/ndb/test/run-test/conf-daily-basic-dl145a.txt
2005-05-13 10:55:12 +02:00
tulin@dl145c.mysql.com
12b4fb158c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-05-10 20:35:14 +02:00
ndbdev@dl145b.mysql.com
7b7ec96666 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-05-10 00:45:27 +02:00
ndbdev@dl145b.mysql.com
58aa78e32d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-05-09 20:28:54 +02:00
lars@mysql.com
e76c641190 Merge mysql.com:/home/bk/mysql-5.0 into mysql.com:/home/bk/mysql-5.1 2005-05-09 11:45:59 +02:00
lars@mysql.com
05cbb3962c Manual merge 5.0->5.1 2005-05-06 15:04:07 +02:00
tulin@dl145b.mysql.com
8aeff7c798 testSuperPool.cpp:
Rename: ndb/src/kernel/vm/testSuperPool.cpp -> storage/ndb/src/kernel/vm/testSuperPool.cpp
SuperPool.hpp:
  Rename: ndb/src/kernel/vm/SuperPool.hpp -> storage/ndb/src/kernel/vm/SuperPool.hpp
SuperPool.cpp:
  Rename: ndb/src/kernel/vm/SuperPool.cpp -> storage/ndb/src/kernel/vm/SuperPool.cpp
DbtupScan.cpp:
  Rename: ndb/src/kernel/blocks/dbtup/DbtupScan.cpp -> storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp
2005-05-04 15:13:00 +02:00
tulin@dl145b.mysql.com
243e76a1af Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-05-04 13:33:16 +02:00
tomas@poseidon.ndb.mysql.com
29aa70c5c9 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-clean
2005-05-02 13:19:50 +02:00
tomas@poseidon.ndb.mysql.com
145ae3c6f5 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-clean
2005-05-02 13:18:26 +02:00
brian@zim.(none)
72955bd0e2 Missed a file for storage change (thanks go to Guilhem who noticed it) 2005-04-27 01:32:03 -07:00
brian@zim.(none)
3e4607a3b8 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
into zim.(none):/home/brian/mysql/mysql-5.1
2005-04-26 19:07:13 -07:00
brian@zim.(none)
2193fd8666 All changes for change to all storage engines being under storage directory. 2005-04-26 19:04:36 -07:00
brian@zim.(none)
2a7c71e309 Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00