Commit 4efcca02 authored by unknown's avatar unknown
Browse files

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

mysql-test/r/rpl_slave_status.result

+1 −1
Original line number Diff line number Diff line
@@ -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

mysql-test/t/rpl_slave_status.test

+3 −1
Original line number Diff line number Diff line
@@ -23,7 +23,9 @@ 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;

ndb/include/util/Parser.hpp

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ template<class T> 
inline

void

Parser<T>::setBreakOnInvalidArg(bool v){

  impl->m_breakOnInvalidArg;

  impl->m_breakOnInvalidArg = v;

}



#endif

ndb/src/mgmapi/mgmapi.cpp

+0 −3
Original line number Diff line number Diff line
@@ -678,12 +678,10 @@ ndb_mgm_get_status(NdbMgmHandle handle) 
  Vector<BaseString> split;

  tmp.split(split, ":");

  if(split.size() != 2){

    abort();

    return NULL;

  }

 

  if(!(split[0].trim() == "nodes")){

    abort();

    return NULL;

  }
@@ -731,7 +729,6 @@ ndb_mgm_get_status(NdbMgmHandle handle) 


  if(i+1 != noOfNodes){

    free(state);

    abort();

    return NULL;

  }