unknown 68c97505b3 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb ...

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/set_var.cc:
  Auto merged
BitKeeper/deleted/.del-ndb_config_1_node.ini:
  Auto merged
BitKeeper/deleted/.del-ndb_config_4_node.ini:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Auto merged
mysql-test/ndb/ndb_config_2_node.ini:
  manual merge

2007-05-08 18:31:54 +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

increate hearbeat interval to avoid load related start up issues in mysql-test-run

2007-05-08 18:30:03 +02:00

ndb_config_2_node.ini

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb

2007-05-08 18:31:54 +02:00

ndb_config_4_node.ini

increate hearbeat interval to avoid load related start up issues in mysql-test-run

2007-05-08 18:30:03 +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