summaryrefslogtreecommitdiff
path: root/ndb/src
diff options
context:
space:
mode:
authorstewart@mysql.com <>2006-06-08 02:33:25 +1000
committerstewart@mysql.com <>2006-06-08 02:33:25 +1000
commitd8ab58e30438ba431eea3e12e3a228e3f4817d7a (patch)
treeeae1cff8e8c2d642ae45721011217da55dbf7fb7 /ndb/src
parent60e15a24f44d0e17e209151e8e7dbf3083eb37c2 (diff)
parent5897bad1987f87c0bc2254cd84902d7deeac9b07 (diff)
downloadmariadb-git-d8ab58e30438ba431eea3e12e3a228e3f4817d7a.tar.gz
Merge mysql.com:/home/stewart/Documents/MySQL/5.0/bug20016
into mysql.com:/home/stewart/Documents/MySQL/5.0/merge-queue
Diffstat (limited to 'ndb/src')
-rw-r--r--ndb/src/mgmapi/mgmapi.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/ndb/src/mgmapi/mgmapi.cpp b/ndb/src/mgmapi/mgmapi.cpp
index 70c492be8b1..ceb9b8ab8ae 100644
--- a/ndb/src/mgmapi/mgmapi.cpp
+++ b/ndb/src/mgmapi/mgmapi.cpp
@@ -361,8 +361,9 @@ ndb_mgm_call(NdbMgmHandle handle, const ParserRow<ParserDummy> *command_reply,
* Print some info about why the parser returns NULL
*/
fprintf(handle->errstream,
- "Error in mgm protocol parser. cmd: >%s< status: %d curr: %d\n",
- cmd, (Uint32)ctx.m_status, ctx.m_currentToken);
+ "Error in mgm protocol parser. cmd: >%s< status: %d curr: %s\n",
+ cmd, (Uint32)ctx.m_status,
+ (ctx.m_currentToken)?ctx.m_currentToken:"NULL");
DBUG_PRINT("info",("ctx.status: %d, ctx.m_currentToken: %s",
ctx.m_status, ctx.m_currentToken));
}