diff options
author | unknown <stewart@mysql.com> | 2005-01-20 13:51:32 +1100 |
---|---|---|
committer | unknown <stewart@mysql.com> | 2005-01-20 13:51:32 +1100 |
commit | c11e42c066b78ade152fe1eb9b4e272df38ede49 (patch) | |
tree | 5ad87be7a7289c84dfe9a2c00915000638ccead1 /ndb/src/mgmapi/mgmapi.cpp | |
parent | 22ae0e897a042f3c1d7660e72ff2739990062471 (diff) | |
parent | e4862d91cde282d998cfa7c8186710b272e965fa (diff) | |
download | mariadb-git-c11e42c066b78ade152fe1eb9b4e272df38ede49.tar.gz |
Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports-impl3
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports-impl4
ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/mgmsrv/Services.cpp:
Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
Diffstat (limited to 'ndb/src/mgmapi/mgmapi.cpp')
-rw-r--r-- | ndb/src/mgmapi/mgmapi.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ndb/src/mgmapi/mgmapi.cpp b/ndb/src/mgmapi/mgmapi.cpp index f44cc5fb6a3..742e2d433e1 100644 --- a/ndb/src/mgmapi/mgmapi.cpp +++ b/ndb/src/mgmapi/mgmapi.cpp @@ -314,8 +314,8 @@ ndb_mgm_call(NdbMgmHandle handle, const ParserRow<ParserDummy> *command_reply, */ ndbout << "Error in mgm protocol parser. " << "cmd: '" << cmd - << "' status=" << ctx.m_status - << ", curr=" << ctx.m_currentToken + << "' status=" << (Uint32)ctx.m_status + << ", curr=" << (Uint32)ctx.m_currentToken << endl; DBUG_PRINT("info",("parser.parse returned NULL")); } |