diff options
| author | unknown <joreland@mysql.com> | 2005-02-24 06:24:46 +0100 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2005-02-24 06:24:46 +0100 |
| commit | dcdbfa65276ee2d1ba79c1a8a65e49a22d56d524 (patch) | |
| tree | a868ab5431bd7309ec3f170d3ef8d81c706e1fb1 /ndb | |
| parent | e0b2dab77d0f8166c710c3b97faede85fa4e847c (diff) | |
| parent | 885e13aba29171ebfbeb3c548781b270b76520ed (diff) | |
| download | mariadb-git-dcdbfa65276ee2d1ba79c1a8a65e49a22d56d524.tar.gz | |
merge
BitKeeper/etc/logging_ok:
auto-union
include/mysql_com.h:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
sql/handler.h:
Auto merged
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/log.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'ndb')
| -rw-r--r-- | ndb/src/mgmsrv/MgmtSrvr.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/ndb/src/mgmsrv/MgmtSrvr.cpp b/ndb/src/mgmsrv/MgmtSrvr.cpp index cf98f3a09ae..e915216c793 100644 --- a/ndb/src/mgmsrv/MgmtSrvr.cpp +++ b/ndb/src/mgmsrv/MgmtSrvr.cpp @@ -2251,9 +2251,6 @@ MgmtSrvr::alloc_node_id(NodeId * nodeId, id_found= tmp; break; } - assert(no_mgm > 1); - assert(*nodeId != 0); - assert(type != NDB_MGM_NODE_TYPE_MGM); if (id_found) { // mgmt server may only have one match error_string.appfmt("Ambiguous node id's %d and %d.\n" "Suggest specifying node id in connectstring,\n" |