Commit 4efcca02 authored by unknown's avatar unknown

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

into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.0


mysql-test/t/rpl_slave_status.test:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
parents 2eb6b134 0a3202be
...@@ -19,7 +19,7 @@ flush privileges; ...@@ -19,7 +19,7 @@ flush privileges;
stop slave; stop slave;
start slave; start slave;
show slave status; show slave status;
Slave_IO_State Connecting to master Slave_IO_State #
Master_Host 127.0.0.1 Master_Host 127.0.0.1
Master_User rpl Master_User rpl
Master_Port MASTER_MYPORT Master_Port MASTER_MYPORT
......
...@@ -23,7 +23,9 @@ connection slave; ...@@ -23,7 +23,9 @@ connection slave;
stop slave; stop slave;
start slave; start slave;
--replace_result $MASTER_MYPORT MASTER_MYPORT --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 --vertical_results
show slave status; show slave status;
......
...@@ -285,7 +285,7 @@ template<class T> ...@@ -285,7 +285,7 @@ template<class T>
inline inline
void void
Parser<T>::setBreakOnInvalidArg(bool v){ Parser<T>::setBreakOnInvalidArg(bool v){
impl->m_breakOnInvalidArg; impl->m_breakOnInvalidArg = v;
} }
#endif #endif
...@@ -678,12 +678,10 @@ ndb_mgm_get_status(NdbMgmHandle handle) ...@@ -678,12 +678,10 @@ ndb_mgm_get_status(NdbMgmHandle handle)
Vector<BaseString> split; Vector<BaseString> split;
tmp.split(split, ":"); tmp.split(split, ":");
if(split.size() != 2){ if(split.size() != 2){
abort();
return NULL; return NULL;
} }
if(!(split[0].trim() == "nodes")){ if(!(split[0].trim() == "nodes")){
abort();
return NULL; return NULL;
} }
...@@ -731,7 +729,6 @@ ndb_mgm_get_status(NdbMgmHandle handle) ...@@ -731,7 +729,6 @@ ndb_mgm_get_status(NdbMgmHandle handle)
if(i+1 != noOfNodes){ if(i+1 != noOfNodes){
free(state); free(state);
abort();
return NULL; return NULL;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment