unknown ab4c64b49d Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca ...

into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb


mysql-test/ndb/ndb_config_2_node.ini:
  Auto merged
storage/ndb/include/ndb_global.h.in:
  Auto merged
storage/ndb/src/common/portlib/NdbTick.c:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/restore.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp:
  Auto merged
storage/ndb/src/kernel/vm/WatchDog.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/tools/restore/Restore.cpp:
  Auto merged

2007-06-05 18:00:42 +02:00

..

basic_log.result

ndbcluster.sh:

2004-12-08 21:48:32 +00:00

basic.result

updated ndb_mgm test

2005-01-09 23:02:06 +01:00

basic.test

ndbcluster.sh:

2004-12-08 21:48:32 +00:00

Makefile.am

fixes for 'make dist' and 'make distcheck'

2006-04-12 14:08:24 +02:00

ndb_config_1_node.ini

Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca

2007-06-04 10:29:57 +02:00

ndb_config_2_node.ini

Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca

2007-06-05 18:00:42 +02:00

ndb_config_4_node.ini

correcting previous commit

2007-05-08 19:07:36 +02:00

ndbcluster.sh

minor fix of ndb cluster startup script

2007-03-21 08:02:11 +01:00

restart_log.result

ndbcluster.sh:

2004-12-08 22:56:23 +00:00

restart.result

ndbcluster.sh:

2004-12-08 22:56:23 +00:00

restart.test

updated ndb_mgm test

2005-01-09 23:02:06 +01:00