database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

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

Browse Source 
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
This commit is contained in:
unknown
2005-09-12 14:11:28 +02:00
parent 2eb6b134a6 0a3202bedf
commit 4efcca023b
4 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/rpl_slave_status.result
View File

@@ -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

4
mysql-test/t/rpl_slave_status.test
View File

@@ -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;

2
ndb/include/util/Parser.hpp
View File

@@ -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

3
ndb/src/mgmapi/mgmapi.cpp
View File

@@ -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)
if(i+1 != noOfNodes){ if(i+1 != noOfNodes){
free(state); free(state);
abort();
return NULL; return NULL;
} }