Commit 8bdb42e0 authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
parents 0679e0a6 ee59e734

mysql-test/t/ndb_autodiscover3.test

+9 −3
Original line number Diff line number Diff line 
-- source include/have_ndb.inc

-- source include/have_multi_ndb.inc

-- source include/ndb_default_cluster.inc

-- source include/not_embedded.inc



# see bug#21563
@@ -9,6 +10,11 @@ 
drop table if exists t1, t2;

--enable_warnings



# Workaround for Bug#27644

# ndb: connecting api node/mysqld may "steal" node_id from running mysqld

# - let ndb_waiter use a fixed node id so "steal" cannot happen

--let connect_str = "nodeid=6;$NDB_CONNECTSTRING"



#

# Transaction ongoing while cluster is restarted

#
@@ -19,7 +25,7 @@ begin; 
insert into t1 values (1);



--exec $NDB_MGM --no-defaults -e "all restart" >> $NDB_TOOLS_OUTPUT

--exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults >> $NDB_TOOLS_OUTPUT

--exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults -c $connect_str >> $NDB_TOOLS_OUTPUT

# Wait for mysqld to reconnect and exit from readonly mode

# Should preferrably be a "while (!"select ndb_readonly")" loop

sleep 2;
@@ -39,7 +45,7 @@ insert into t2 values (1,1),(2,1),(3,1),(4,1),(5,1),(6,1),(7,1),(8,1),(9,1),(10, 
select * from t2 order by a limit 3;



--exec $NDB_MGM --no-defaults -e "all restart -i" >> $NDB_TOOLS_OUTPUT

--exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults >> $NDB_TOOLS_OUTPUT

--exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults -c $connect_str >> $NDB_TOOLS_OUTPUT

# to ensure mysqld has connected again, and recreated system tables

--exec $NDB_TOOLS_DIR/ndb_desc --no-defaults -r 30 -d cluster ndb_apply_status >> $NDB_TOOLS_OUTPUT

sleep 2;
@@ -58,7 +64,7 @@ select * from t2 order by a limit 3; 
reset master;



--exec $NDB_MGM --no-defaults -e "all restart -i" >> $NDB_TOOLS_OUTPUT

--exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults >> $NDB_TOOLS_OUTPUT

--exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults -c $connect_str >> $NDB_TOOLS_OUTPUT

# to ensure mysqld has connected again, and recreated system tables

--exec $NDB_TOOLS_DIR/ndb_desc --no-defaults -r 30 -d cluster ndb_apply_status >> $NDB_TOOLS_OUTPUT

sleep 2;