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

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

8 files changed, 16 insertions, 3 deletions

diff --git a/mysql-test/t/ndb_autodiscover3.test b/mysql-test/t/ndb_autodiscover3.test
index 73b4bf8b94f..259da6e3501 100644
--- a/mysql-test/t/ndb_autodiscover3.test
+++ b/mysql-test/t/ndb_autodiscover3.test
@@ -1,5 +1,6 @@
 -- source include/have_ndb.inc
 -- source include/have_multi_ndb.inc
+-- source include/ndb_default_cluster.inc
 -- source include/not_embedded.inc
 
 
@@ -7,6 +8,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
 #
@@ -17,7 +23,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
 
 --error 1297
 insert into t1 values (2);
@@ -35,7 +41,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
 
 --connection server2
 create table t2 (a int key) engine=ndbcluster;
@@ -49,7 +55,7 @@ select * from t2 order by a limit 3;
 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
 
 --connection server1
 show tables;
diff --git a/ndb/tools/delete_all.cpp b/ndb/tools/delete_all.cpp
index ae380560e35..9b6a8cf94c6 100644
--- a/ndb/tools/delete_all.cpp
+++ b/ndb/tools/delete_all.cpp
@@ -67,6 +67,7 @@ int main(int argc, char** argv){
     return NDBT_ProgramExit(NDBT_WRONGARGS);
 
   Ndb_cluster_connection con(opt_connect_str);
+  con.set_name("ndb_delete_all");
   if(con.connect(12, 5, 1) != 0)
   {
     ndbout << "Unable to connect to management server." << endl;
diff --git a/ndb/tools/desc.cpp b/ndb/tools/desc.cpp
index c2f3ea8b615..83258515796 100644
--- a/ndb/tools/desc.cpp
+++ b/ndb/tools/desc.cpp
@@ -69,6 +69,7 @@ int main(int argc, char** argv){
     return NDBT_ProgramExit(NDBT_WRONGARGS);
 
   Ndb_cluster_connection con(opt_connect_str);
+  con.set_name("ndb_desc");
   if(con.connect(12, 5, 1) != 0)
   {
     ndbout << "Unable to connect to management server." << endl;
diff --git a/ndb/tools/drop_index.cpp b/ndb/tools/drop_index.cpp
index 23ebfff6cf4..256c40e1924 100644
--- a/ndb/tools/drop_index.cpp
+++ b/ndb/tools/drop_index.cpp
@@ -61,6 +61,7 @@ int main(int argc, char** argv){
   }
   
   Ndb_cluster_connection con(opt_connect_str);
+  con.set_name("ndb_drop_index");
   if(con.connect(12, 5, 1) != 0)
   {
     return NDBT_ProgramExit(NDBT_FAILED);
diff --git a/ndb/tools/drop_tab.cpp b/ndb/tools/drop_tab.cpp
index d965be29f31..a7accb904a4 100644
--- a/ndb/tools/drop_tab.cpp
+++ b/ndb/tools/drop_tab.cpp
@@ -61,6 +61,7 @@ int main(int argc, char** argv){
   }
 
   Ndb_cluster_connection con(opt_connect_str);
+  con.set_name("ndb_drop_table");
   if(con.connect(12, 5, 1) != 0)
   {
     ndbout << "Unable to connect to management server." << endl;
diff --git a/ndb/tools/listTables.cpp b/ndb/tools/listTables.cpp
index db88f9bc25c..009789824e8 100644
--- a/ndb/tools/listTables.cpp
+++ b/ndb/tools/listTables.cpp
@@ -219,6 +219,7 @@ int main(int argc, char** argv){
   _tabname = argv[0];
 
   ndb_cluster_connection = new Ndb_cluster_connection(opt_connect_str);
+  ndb_cluster_connection->set_name("ndb_show_tables");
   if (ndb_cluster_connection->connect(12,5,1))
     fatal("Unable to connect to management server.");
   if (ndb_cluster_connection->wait_until_ready(30,0) < 0)
diff --git a/ndb/tools/select_all.cpp b/ndb/tools/select_all.cpp
index 69bd5b0f917..27d96a9c6ed 100644
--- a/ndb/tools/select_all.cpp
+++ b/ndb/tools/select_all.cpp
@@ -108,6 +108,7 @@ int main(int argc, char** argv){
   }
 
   Ndb_cluster_connection con(opt_connect_str);
+  con.set_name("ndb_select_all");
   if(con.connect(12, 5, 1) != 0)
   {
     ndbout << "Unable to connect to management server." << endl;
diff --git a/ndb/tools/select_count.cpp b/ndb/tools/select_count.cpp
index 8933d803f53..552d156b665 100644
--- a/ndb/tools/select_count.cpp
+++ b/ndb/tools/select_count.cpp
@@ -83,6 +83,7 @@ int main(int argc, char** argv){
   }
 
   Ndb_cluster_connection con(opt_connect_str);
+  con.set_name("ndb_select_count");
   if(con.connect(12, 5, 1) != 0)
   {
     ndbout << "Unable to connect to management server." << endl;