into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
mysql-test/ndb/ndb_config_1_node.ini:
Auto merged
mysql-test/ndb/ndb_config_2_node.ini:
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/mgmsrv/ConfigInfo.cpp:
Auto merged
storage/ndb/src/ndbapi/ndberror.c:
Auto merged
(mysql-test-run only)
mysql-test/ndb/ndb_config_1_node.ini:
revert timeout changes, as a test depends on it, it mysterious ways
mysql-test/ndb/ndb_config_2_node.ini:
revert timeout changes, as a test depends on it, it mysterious ways
mysql-test/ndb/ndb_config_4_node.ini:
revert timeout changes, as a test depends on it, it mysterious ways
mysql-test/t/rpl_ndb_basic.test:
revert timeout changes, as a test depends on it, it mysterious ways
Increase deadlock-timeout to cater for slow test-machines (possibly running several tests in parallell)
This will hopefully remove some volatile testfailures in pushbuild
(i've seen a couple by looking at logs)
mysql-test/ndb/ndb_config_1_node.ini:
Increase deadlock-timeout to cater for slow test-machines (possibly running several tests in parallell)
mysql-test/ndb/ndb_config_2_node.ini:
Increase deadlock-timeout to cater for slow test-machines (possibly running several tests in parallell)
mysql-test/ndb/ndb_config_4_node.ini:
Increase deadlock-timeout to cater for slow test-machines (possibly running several tests in parallell)