Commit graph

178 commits

Author SHA1 Message Date
tomas@poseidon.ndb.mysql.com[tomas]
c69b482102 ndb - test_event
Fix problem when creating shadow table
2005-11-05 22:54:25 +01:00
monty@mysql.com
a6f5375cb0 Merge mysql.com:/home/my/mysql-5.0
into  mysql.com:/home/my/mysql-5.1
2005-11-05 01:32:55 +02:00
tomas@poseidon.ndb.mysql.com
2afe5e9b53 merge 2005-10-07 09:29:55 +02:00
tomas@poseidon.ndb.mysql.com
35a520d2c2 merge error 2005-09-15 12:53:59 +02:00
tomas@poseidon.ndb.mysql.com[tomas]
8069a6833a ndb-wl2325.patch 2005-09-15 11:33:50 +02:00
jonas@eel.(none)
b5954b69a0 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1
into  eel.(none):/home/jonas/src/mysql-5.1-push
2005-09-09 21:05:59 +02:00
ndbdev@dl145b.mysql.com
46cc62e216 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-09-09 15:26:47 +02:00
jonas@eel.(none)
5fa930ad2d 5.0->5.1 merge fix
5.1 has moved ndb into storage
2005-09-09 13:44:48 +02:00
jonas@eel.(none)
315b8ef3bb Merge eel.(none):/home/jonas/src/mysql-5.0
into  eel.(none):/home/jonas/src/mysql-5.1-push
2005-09-09 13:30:38 +02:00
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
02056f8e3a Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
2005-08-25 13:11:38 -04:00
tulin@dl145b.mysql.com
8cea968418 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-07-22 23:15:51 +02:00
ndbdev@dl145b.mysql.com
1dd2efba70 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-07-22 15:16:37 +02:00
ndbdev@dl145b.mysql.com
c3b9a42abd Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-07-22 15:01:11 +02:00
mronstrom@mysql.com
b25cbdba14 Fixed test cases for hash and linear hash and fixed guess in NDB API
for this as well
2005-07-21 14:56:07 +02:00
ndbdev@dl145b.mysql.com
d931417cc3 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-07-21 12:50:24 +02:00
mronstrom@mysql.com
67087e2aa7 Patch for push of wl1354 Partitioning 2005-07-18 13:31:02 +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
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
54cff2bc30 merge 2005-06-13 08:05:29 +02: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
tulin@dl145c.mysql.com
23f79bd1f2 merge 2005-05-17 10:17:53 +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
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
lars@mysql.com
05cbb3962c Manual merge 5.0->5.1 2005-05-06 15:04:07 +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
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