MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:tomas Date:April 5 2007 7:12am
Subject:bk commit into 5.0 tree (tomas:1.2433) BUG#27644
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-04-05 09:12:30+02:00, tomas@stripped +1 -0
  Bug#27644 ndb: connecting api node/mysqld may "steal" node_id from running mysqld
  - test case workaround to avoid random failures

  mysql-test/t/ndb_autodiscover3.test@stripped, 2007-04-05 09:12:28+02:00, tomas@stripped +9 -3
    Bug#27644 ndb: connecting api node/mysqld may "steal" node_id from running mysqld
    - test case workaround to avoid random failures

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	whalegate.ndb.mysql.com
# Root:	/home/tomas/mysql-5.0-ndb

--- 1.1/mysql-test/t/ndb_autodiscover3.test	2006-05-15 16:23:55 +02:00
+++ 1.2/mysql-test/t/ndb_autodiscover3.test	2007-04-05 09:12:28 +02:00
@@ -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 @@
 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 @@
 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;
 
 --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;
Thread
bk commit into 5.0 tree (tomas:1.2433) BUG#27644tomas5 Apr