mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 05:22:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
45836 commits 2784 branches 343 tags 1.6 GiB
Commit graph

286 commits

Author SHA1 Message Date
stewart@mysql.com[stewart]
64361ee36f [PATCH] WL#3704 mgmapi timeouts: Add bool timeout flag to Streams 
Index: ndb-work/storage/ndb/include/util/InputStream.hpp
===================================================================
 2007-03-22 22:33:43 +11:00
stewart@mysql.com[stewart]
36888199ac [PATCH] WL#3704 mgmapi timeouts: add ndb_mgm_set_timeout(h,ms) 
Add not so neat set_timeout call to make testMgm work

Index: ndb-work/storage/ndb/include/mgmapi/mgmapi.h
===================================================================
 2007-03-22 22:33:19 +11:00
stewart@mysql.com[stewart]
395a24409d [PATCH] WL#3704 mgmapi timeouts: Add ndb_mgmd error injection 
Add error injection either for this connection or for whole server.

Currently nothing for injecting errors into *another* connection... but that's
perhaps getting tricky-dicky for this point in time. Perhaps needed for events
if we don't do anything fancy.

Index: ndb-work/storage/ndb/src/mgmsrv/MgmtSrvr.cpp
===================================================================
 2007-03-22 22:33:07 +11:00
jonas@perch.ndb.mysql.com
05a8790f0b Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-03-22 11:23:47 +01:00
jonas@perch.ndb.mysql.com
4a1c8d296b Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-03-22 11:21:26 +01:00
jonas@perch.ndb.mysql.com
155e3d1139 ndb - 
fix testprg
 2007-03-22 11:20:38 +01:00
jonas@perch.ndb.mysql.com
0e1974d2bf ndb - fix test prg 2007-03-22 11:17:57 +01:00
pekka@clam.(none)
2082a9e35b Merge clam.ndb.mysql.com:/export/space/pekka/ndb/version/my50-bug24028 
into  clam.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug24028
 2007-03-22 07:40:04 +01:00
tsmith@quadxeon.mysql.com
54e7bc8daa Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-03-22 01:04:39 +01:00
jonas@perch.ndb.mysql.com
8c3751209c Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-03-20 16:36:31 +01:00
jonas@perch.ndb.mysql.com
42b3e0a5af Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
 2007-03-20 16:32:11 +01:00
kostja@bodhi.local
bdb10baec1 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
 2007-03-20 00:42:11 +03:00
jonas@perch.ndb.mysql.com
229ee6d4f1 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-03-19 14:55:13 +01:00
jonas@perch.ndb.mysql.com
886e11736b ndb - test_event 
Fix compile error with gcc4
 2007-03-19 14:51:17 +01:00
jonas@perch.ndb.mysql.com
6856693904 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-03-19 12:39:03 +01:00
jonas@perch.ndb.mysql.com
09e403aa9e ndb - bug#20185 
Fix race in testprg...causing random TC crashes
 2007-03-19 12:31:23 +01:00
jonas@perch.ndb.mysql.com
582312fd34 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-03-19 11:15:05 +01:00
jonas@perch.ndb.mysql.com
bdb70f7b43 ndb - autotest 
increase some timeouts...
 2007-03-19 11:13:10 +01:00
kostja@bodhi.local
7d84ef0e11 Bug#26765 "typo when running mysql-test-run" 
Fix a typo (togheter -> together)
 2007-03-15 23:17:44 +03:00
jonas@perch.ndb.mysql.com
85220e3940 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-03-15 13:37:04 +01:00
jonas@perch.ndb.mysql.com
1bf8202fce ndb - bug#27169 
Fix bug in SUMA::resend_bucket which could cause mysqld to crash
 2007-03-15 13:30:42 +01:00
jonas@perch.ndb.mysql.com
f8483eccc3 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-03-15 11:06:57 +01:00
jonas@perch.ndb.mysql.com
1c203fcc04 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
 2007-03-15 11:06:01 +01:00
jonas@perch.ndb.mysql.com
14de245543 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-03-15 07:16:44 +01:00
jonas@perch.ndb.mysql.com
1fa2a64778 ndb - 
fix test_event -n EventOperationApplier
 2007-03-15 07:08:15 +01:00
jonas@perch.ndb.mysql.com
a7714519a7 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-03-14 15:41:24 +01:00
jonas@perch.ndb.mysql.com
72bd367013 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-03-14 15:40:06 +01:00
jonas@perch.ndb.mysql.com
3b21f00f87 ndb - bug#27005 
Handle API failure during resend
    API failure could cause release of table object, which will make resend crash
      when dereferencing table object
      
    Solution, use table_id+hash+schemaversion instead of *raw* pointer in resend
 2007-03-14 15:37:47 +01:00
kent@kent-amd64.(none)
ac91a4a89f Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
 2007-03-14 14:37:50 +01:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
9b77ac20a5 Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.merge
 2007-03-14 10:16:24 +08:00
jonas@perch.ndb.mysql.com
023ce289b6 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-03-13 13:56:51 +01:00
jonas@perch.ndb.mysql.com
4a27e9adb9 ndb - bug#27003 
merge to 5.1, adopt testprg to optimized node recovery
 2007-03-13 12:38:47 +01:00
jonas@perch.ndb.mysql.com
620731060f Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
 2007-03-13 12:07:33 +01:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
8b049838bf Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb.test 
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.test
 2007-03-13 18:18:17 +08:00
knielsen@ymer.(none)
4fe26832e4 Merge ymer.(none):/usr/local/mysql/mysql-5.0-ndb 
into  ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb
 2007-03-12 08:42:59 +01:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
2248cd3d3e bug#24568, NdbScanFilter NAND/NOR operations sometimes do not work as expected 
when merge from 5.0 to 5.1, update a function call in testScanFilter.cpp 
beacuase the function's definition is changed from 5.0 to 5.1
 2007-03-02 11:03:16 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
e1a90408db bug#24568, NdbScanFilter NAND/NOR operations sometimes do not work as expected, 
add a new file in 5.0 and rename it in 5.1 because the directory of ndb is changed from 5.0 to 5.1
 2007-03-02 09:41:47 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
2dc3fbf925 Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/bug24568-5.0-ndb-bj 
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug24568-5.1-new-ndb-bj
 2007-03-01 17:43:14 +08:00
jonas@perch.ndb.mysql.com
e8cd384de5 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-02-21 18:06:06 +01:00
jonas@eel.(none)
53fe7d831c Merge localhost:/home/jonas/src/51-work 
into  eel.(none):/home/jonas/src/51-work
 2007-02-21 16:44:39 +01:00
jonas@eel.(none)
5059ce2143 ndb - 
write testcase for bug#26450...
  no solution however...
 2007-02-20 20:33:53 +01:00
jonas@perch.ndb.mysql.com
5d37bbee56 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-02-20 01:00:18 +01:00
jonas@perch.ndb.mysql.com
1d99e609ed Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2007-02-20 00:58:25 +01:00
jonas@perch.ndb.mysql.com
9bc3503489 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-02-19 22:56:15 +01:00
jonas@perch.ndb.mysql.com
f2e2e7a6e7 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2007-02-19 22:53:17 +01:00
jonas@perch.ndb.mysql.com
6c54eccda2 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
 2007-02-19 21:19:21 +01:00
jonas@perch.ndb.mysql.com
20c8b292e7 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-02-19 20:34:48 +01:00
jonas@perch.ndb.mysql.com
1cfd066e90 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2007-02-19 20:21:28 +01:00
jonas@perch.ndb.mysql.com
44fa3eaaf6 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-02-18 00:23:08 +01:00
jonas@perch.ndb.mysql.com
4d80c3f639 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2007-02-17 23:57:09 +01:00
jonas@perch.ndb.mysql.com
44f1c6249b Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-02-16 21:44:39 +01:00
jonas@eel.(none)
c46900c1a9 ndb - atrt minor fixes 2007-02-16 21:09:38 +01:00
jonas@perch.ndb.mysql.com
80fe0fe445 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-02-16 01:53:29 +01:00
jonas@eel.(none)
685423e587 ndb - autotest 
increase timeout on slow test
 2007-02-16 01:40:50 +01:00
jonas@eel.(none)
b030cc5516 ndb autotest - 
Fix testcase so that it does not leak tables...causing subsequent errors
 2007-02-16 01:36:22 +01:00
jonas@perch.ndb.mysql.com
af1e269165 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-02-15 23:17:51 +01:00
jonas@eel.(none)
b95714e138 ndb - new atrt 
Fix bug when restarting cluster after failure
      (fs was not cleared)
    Fix cosmetic bug that made rsync be run several times when gathering result
 2007-02-15 23:10:32 +01:00
jonas@eel.(none)
1d54870364 ndb - 
fix ao_ignore behavior change in hugo
  (affecting testOperations & testTransactions)
 2007-02-15 18:39:17 +01:00
ndbdev@ndbmaster.mysql.com
3685960425 adopt to changes in load_defaults 2007-02-13 14:32:07 +01:00
jonas@perch.ndb.mysql.com
fc94ac8a10 ndb - new atrt 2007-02-13 02:38:54 +01:00
jonas@eel.(none)
3edab3e4c8 ndb - some more hugo abort option fix 2007-02-05 21:38:16 +01:00
jonas@eel.(none)
35bfea9466 ndb - 
Add abort option to lots of Hugo code, 
as it assumes it and default value has changed
 2007-02-05 20:28:11 +01:00
jonas@eel.(none)
ef38f9b780 ndb - bug#25984 - more than 7 failed node restart can cause cluster failure 
new behaviour is as follows:
1) node is refused to start, and should fail with message in error log that it must be restarted --initial
2) if cluster failure in this situation, node must also be restarted --intial
   if not SR will fail, with this message
 2007-02-02 17:07:15 +01:00
jonas@eel.(none)
9f69d9ffde Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  eel.(none):/home/jonas/src/51-work
 2007-02-02 16:21:42 +01:00
jonas@eel.(none)
4b965407d2 ndb - test prg 
fix failure during start
 2007-02-02 16:14:48 +01:00
jonas@perch.ndb.mysql.com
0a32761857 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-01-30 19:45:44 +01:00
jonas@perch.ndb.mysql.com
08d5217056 ndb - interface change of handling of abort option 
1) move AbortOption from NdbTransaction to NdbOperation

2) let each operation have a "default" abort option dependant on
   operation type

   - read - AO_IgnoreError
   - dml - AbortOnError
   - scan take over - AbortOnError

3) Changed default value to execute() from AbortOnError to DefaultAbortOption, which does not change the operations abort-option.

   Another value to execute(AO) is equivalent to setting AO on each operation before calling execute

4) execute() does _only_ return -1 if transaction has been aborted
   otherwise, you need to check each operation for error code
 2007-01-30 19:45:14 +01:00
jonas@perch.ndb.mysql.com
4ffcd999de Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-01-30 19:33:33 +01:00
jonas@perch.ndb.mysql.com
3a3ed75655 ndb - minor style fixes 2007-01-30 19:26:40 +01:00
jonas@perch.ndb.mysql.com
3f2a9eeba2 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-01-28 22:03:42 +01:00
jonas@eel.(none)
1e0418cfa2 ndb - bug#25794 
Fix read after delete (in same op)
  - lqh, handling of attrinfo
  - tup, setup read for disk/varchar
 2007-01-23 19:27:55 +01:00
mskold/marty@mysql.com/linux.site
3c36b92a1d Changed Dictionary::Table::setTablespace/getTablespace to setTablespaceName/getTablespaceName 2007-01-16 09:19:41 +01:00
jonas@perch.ndb.mysql.com
ef283377a9 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-01-11 21:13:17 +01:00
jonas@perch.ndb.mysql.com
a4570b092a fix merge error 2007-01-11 21:06:36 +01:00
jonas@perch.ndb.mysql.com
546c2f5069 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2007-01-11 21:02:38 +01:00
jonas@perch.ndb.mysql.com
403efda294 ndb - bug#25468 
handle partially transfered LCP_FRAG_REP after node failure
  recommit to 51-work
 2007-01-10 20:50:19 +01:00
jonas@perch.ndb.mysql.com
c73b27f59b Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2007-01-03 06:47:23 +01:00
kent@kent-amd64.(none)
58763e383e Merge mysql.com:/home/kent/bk/main/mysql-5.0 
into  mysql.com:/home/kent/bk/main/mysql-5.1
 2006-12-31 01:32:21 +01:00
kent@kent-amd64.(none)
895e442dbf Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/kent/bk/main/mysql-5.1
 2006-12-31 01:04:59 +01:00
tomas@poseidon.
044c410968 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  poseidon.:/home/tomas/mysql-5.1-new-ndb
 2006-12-27 11:01:54 +01:00
kent@mysql.com/kent-amd64.(none)
1e3237fefa Many files: 
Changed header to GPL version 2 only
 2006-12-27 02:23:51 +01:00
kent@kent-amd64.(none)
be15e3bc15 Merge mysql.com:/home/kent/bk/main/mysql-5.0 
into  mysql.com:/home/kent/bk/main/mysql-5.1
 2006-12-23 20:20:40 +01:00
jonas@perch.ndb.mysql.com
2e37545419 merge fix 2006-12-15 17:12:41 +01:00
jonas@perch.ndb.mysql.com
e8e875ca33 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-12-15 16:57:43 +01:00
jonas@perch.ndb.mysql.com
315a4e18c8 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-12-05 22:45:17 +01:00
jonas@perch.ndb.mysql.com
d720cd2786 ndb - bug#24664 
1) run lcp snapshot for both MM and DD tables (so I dont have to change restore to use WRITE)
  2) fix >= and > bug in lcp skip/keep handling
  3) very cool test prog for this :-)
 2006-12-05 15:10:56 +01:00
jonas@perch.ndb.mysql.com
32c67ca05f Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-12-01 11:32:52 +01:00
jonas@perch.ndb.mysql.com
13c44a9197 ndb - bug#24717 
fixes to testprogram to test new impl. in 5.1
 2006-12-01 11:08:53 +01:00
jonas@perch.ndb.mysql.com
75467cc9f1 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-12-01 10:33:28 +01:00
jonas@perch.ndb.mysql.com
60b19639b9 ndb - bug#24543 
Resend if master dies during alloc node id
 2006-11-23 14:34:24 +01:00
jonas@perch.ndb.mysql.com
9e0be46731 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-11-21 14:18:52 +01:00
pekka@orca.ndb.mysql.com
caaadb9b05 Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-misc 
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-misc
 2006-11-16 18:15:03 +01:00
stewart@willster.(none)
dd2cea1698 remove OSE 2006-11-03 02:18:45 +11:00
jonas@perch.ndb.mysql.com
d82797ec8f Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-10-19 11:23:34 +02:00
jonas@perch.ndb.mysql.com
61d7b5ca42 ndb - add temporary tables to hugo 
and use it for testOperations/testTransactions
 2006-10-19 11:20:04 +02:00
stewart@willster.(none)
73831dad50 Bug #19148 Backup causes cluster down if _really_ early abort happens 
Early abort, failing to allocate buffers, would go down the abort track and
 end up trying to sendDropTriggers (as the standard stop backup does). 
However, it is possible to not have any tables yet defined in the backup 
(due to allocating buffers is before this). Simple check in sendDropTrig 
(and continue to next step). Files may be open, so we continue to close them.

Also updated ERROR_Codes (and added one to test this bug).
 2006-10-18 18:19:16 +10:00
pekka@orca.ndb.mysql.com
e52bd4be2b Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb 
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-bug21191
 2006-10-15 12:11:52 +02:00
pekka@orca.ndb.mysql.com
375faa3b52 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-10-11 05:16:50 +02:00
jonas@perch.ndb.mysql.com
fe61968dc8 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-10-10 11:08:23 +02:00
jonas@perch.ndb.mysql.com
5590e99d2e Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-10-10 11:06:51 +02:00