diff options
| author | unknown <tulin@dl145c.mysql.com> | 2005-09-12 14:11:28 +0200 |
|---|---|---|
| committer | unknown <tulin@dl145c.mysql.com> | 2005-09-12 14:11:28 +0200 |
| commit | 4efcca023b47e9d8fff148da2c65254ddbee6c9b (patch) | |
| tree | 3277672a0e0bb82fb801050c58afbe0ef04aef26 /ndb/src | |
| parent | 2eb6b134a6e95ca354e7fa124d863b41e7a89976 (diff) | |
| parent | 0a3202bedfbe3666e29690b12ce94123e73f8945 (diff) | |
| download | mariadb-git-4efcca023b47e9d8fff148da2c65254ddbee6c9b.tar.gz | |
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
Diffstat (limited to 'ndb/src')
| -rw-r--r-- | ndb/src/mgmapi/mgmapi.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/ndb/src/mgmapi/mgmapi.cpp b/ndb/src/mgmapi/mgmapi.cpp index c10eb073855..8263e8cbc93 100644 --- a/ndb/src/mgmapi/mgmapi.cpp +++ b/ndb/src/mgmapi/mgmapi.cpp @@ -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; } |