From: Date: May 23 2006 6:46am
Subject: bk commit into 5.0 tree (stewart:1.2137) BUG#20016
List-Archive: http://lists.mysql.com/commits/6746
X-Bug: 20016
Message-Id: <20060523044602.CAA07140BD5A@localhost.localdomain>

Below is the list of changes that have just been committed into a local
5.0 repository of stewart. When stewart does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2137 06/05/23 14:45:56 stewart@stripped +1 -0
  BUG#20016 error in mgm protocol parser error message incorrect
  
  fix display of mgm protocol parser error in mgmapi

  ndb/src/mgmapi/mgmapi.cpp
    1.61 06/05/23 14:45:51 stewart@stripped +3 -2
    fix display of mgm protocol parser error.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	stewart
# Host:	willster.(none)
# Root:	/home/stewart/Documents/MySQL/5.0/bug20016

--- 1.60/ndb/src/mgmapi/mgmapi.cpp	2006-05-17 08:23:26 +10:00
+++ 1.61/ndb/src/mgmapi/mgmapi.cpp	2006-05-23 14:45:51 +10:00
@@ -361,8 +361,9 @@
        * 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));
     }