From d0b53181323af5f9d70f30aeb474b7815e5142b9 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 6 Sep 2005 15:39:20 +0200 Subject: [PATCH 1/3] Added synchronization to rpl_slave_status.test mysql-test/t/rpl_slave_status.test: Added synchronization to make result deterministic --- mysql-test/t/rpl_slave_status.test | 1 + 1 file changed, 1 insertion(+) diff --git a/mysql-test/t/rpl_slave_status.test b/mysql-test/t/rpl_slave_status.test index 2c5bd2bffb0..247e562eafa 100644 --- a/mysql-test/t/rpl_slave_status.test +++ b/mysql-test/t/rpl_slave_status.test @@ -19,6 +19,7 @@ select * from t1; connection master; delete from mysql.user where user='rpl'; flush privileges; +sync_slave_with_master; connection slave; stop slave; start slave; From eac9a337781a67eb6b64846465af6f89d356e174 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 12 Sep 2005 10:50:42 +0200 Subject: [PATCH 2/3] Reverted old fix with sync_slave_with_master and added a replace commands to eliminate nondeterminism in slave start --- mysql-test/r/rpl_slave_status.result | 2 +- mysql-test/t/rpl_slave_status.test | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mysql-test/r/rpl_slave_status.result b/mysql-test/r/rpl_slave_status.result index 8badbab85ff..2146132aeb0 100644 --- a/mysql-test/r/rpl_slave_status.result +++ b/mysql-test/r/rpl_slave_status.result @@ -19,7 +19,7 @@ flush privileges; stop slave; start slave; show slave status; -Slave_IO_State Connecting to master +Slave_IO_State # Master_Host 127.0.0.1 Master_User rpl Master_Port MASTER_MYPORT diff --git a/mysql-test/t/rpl_slave_status.test b/mysql-test/t/rpl_slave_status.test index 247e562eafa..67d3816f443 100644 --- a/mysql-test/t/rpl_slave_status.test +++ b/mysql-test/t/rpl_slave_status.test @@ -19,12 +19,13 @@ select * from t1; connection master; delete from mysql.user where user='rpl'; flush privileges; -sync_slave_with_master; connection slave; stop slave; start slave; --replace_result $MASTER_MYPORT MASTER_MYPORT ---replace_column 7 # 8 # 9 # 22 # 23 # +# Column 1 is replaced, since the output can be either +# "Connecting to master" or "Waiting for master update" +--replace_column 1 # 7 # 8 # 9 # 22 # 23 # --vertical_results show slave status; From 0a3202bedfbe3666e29690b12ce94123e73f8945 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 12 Sep 2005 14:03:23 +0200 Subject: [PATCH 3/3] removed a few aborts from mgmapi corrected typo in ndb Parser --- ndb/include/util/Parser.hpp | 2 +- ndb/src/mgmapi/mgmapi.cpp | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/ndb/include/util/Parser.hpp b/ndb/include/util/Parser.hpp index c117498e1ba..3baf7601a6c 100644 --- a/ndb/include/util/Parser.hpp +++ b/ndb/include/util/Parser.hpp @@ -285,7 +285,7 @@ template inline void Parser::setBreakOnInvalidArg(bool v){ - impl->m_breakOnInvalidArg; + impl->m_breakOnInvalidArg = v; } #endif diff --git a/ndb/src/mgmapi/mgmapi.cpp b/ndb/src/mgmapi/mgmapi.cpp index bf78adec970..06b534ac0ca 100644 --- a/ndb/src/mgmapi/mgmapi.cpp +++ b/ndb/src/mgmapi/mgmapi.cpp @@ -638,12 +638,10 @@ ndb_mgm_get_status(NdbMgmHandle handle) Vector split; tmp.split(split, ":"); if(split.size() != 2){ - abort(); return NULL; } if(!(split[0].trim() == "nodes")){ - abort(); return NULL; } @@ -692,7 +690,6 @@ ndb_mgm_get_status(NdbMgmHandle handle) if(i+1 != noOfNodes){ free(state); - abort(); return NULL; }