database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-build

Browse Source 
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-build


mysql-test/suite/ndb_team/t/ndb_autodiscover.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/suite/ndb_team/t/ndb_autodiscover3.test:
  Manual merge, use already existing way in 5.1
This commit is contained in:
unknown
2008-02-21 14:11:01 +01:00
parent b4e1e5e5dc ae1eaff2d4
commit 996e34fd9e
2 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
mysql-test/include/ndb_wait_connected.inc Normal file
View File

@ -0,0 +1,26 @@
# Check that mysqld has reconnected to ndbd after
# restart of ndbd
#
--disable_query_log
--disable_result_log
let $mysql_errno= 1;
let $counter= 600;
while ($mysql_errno)
{
--error 0,157
CREATE TABLE ndb_wait_connected (a int primary key);
if ($mysql_errno)
{
if (!$counter)
{
die Failed waiting for mysqld to reconnect to ndbd;
}
dec $counter;
--sleep 0.1
}
}
DROP TABLE ndb_wait_connected;
--enable_query_log
--enable_result_log

1
mysql-test/suite/ndb_team/t/ndb_autodiscover.test
View File

@ -491,6 +491,7 @@ select * from t1;
select * from t1; select * from t1;
--exec $NDB_MGM --no-defaults -e "all start" > /dev/null --exec $NDB_MGM --no-defaults -e "all start" > /dev/null
--exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults > /dev/null --exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults > /dev/null
--source include/ndb_wait_connected.inc
use test; use test;
drop database test_only_ndb_tables; drop database test_only_ndb_tables;