From: Date: August 14 2006 8:46am
Subject: bk commit into 5.0 tree (dli:1.2245) BUG#19047
List-Archive: http://lists.mysql.com/commits/10332
X-Bug: 19047
Message-Id: <200608140646.k7E6kePm031941@dev3-76.dev.cn.tlan>

Below is the list of changes that have just been committed into a local
5.0 repository of root. When root 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@stripped, 2006-08-14 14:46:33+08:00, dli@stripped +1 -0
  Bug#19047: changed m_event_thread to be judged by NULL, not by 0.

  ndb/src/mgmclient/CommandInterpreter.cpp@stripped, 2006-08-14 14:46:31+08:00, dli@stripped +6 -6
    changed m_event_thread to be judged by NULL, not by 0.

# 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:	dli
# Host:	dev3-76.dev.cn.tlan
# Root:	/home/lisj/mysql/mysql-5.0/bug-19047

--- 1.62/ndb/src/mgmclient/CommandInterpreter.cpp	2006-08-14 14:46:41 +08:00
+++ 1.63/ndb/src/mgmclient/CommandInterpreter.cpp	2006-08-14 14:46:41 +08:00
@@ -55,7 +55,7 @@
    *
    *   @return true until quit/bye/exit has been typed
    */
-    int execute(const char *_line, int _try_reconnect=-1, bool interactive=1, int *error= 0);
+  int execute(const char *_line, int _try_reconnect=-1, bool interactive=1, int *error= 0);
 
 private:
   void printError();
@@ -393,7 +393,7 @@
 {
   m_constr= _host;
   m_connected= false;
-  m_event_thread= 0;
+  m_event_thread= NULL;
   try_reconnect = 0;
 #ifdef HAVE_GLOBAL_REPLICATION
   rep_host = NULL;
@@ -519,7 +519,7 @@
     {
       DBUG_PRINT("info",("2:ndb connected to Management Server ok at: %s:%d",
                          host, port));
-      assert(m_event_thread == 0);
+      assert(m_event_thread == NULL);
       assert(do_event_thread == 0);
       do_event_thread= 0;
       m_event_thread = NdbThread_Create(event_thread_run,
@@ -527,7 +527,7 @@
                                         32768,
                                         "CommandInterpreted_event_thread",
                                         NDB_THREAD_PRIO_LOW);
-      if (m_event_thread != 0)
+      if (m_event_thread)
       {
         DBUG_PRINT("info",("Thread created ok, waiting for started..."));
         int iter= 1000; // try for 30 seconds
@@ -535,7 +535,7 @@
               iter-- > 0)
           NdbSleep_MilliSleep(30);
       }
-      if (m_event_thread == 0 ||
+      if (m_event_thread == NULL ||
          do_event_thread == 0 ||
          do_event_thread == -1)
       {
@@ -588,7 +588,7 @@
     do_event_thread= 0;
     NdbThread_WaitFor(m_event_thread, &res);
     NdbThread_Destroy(&m_event_thread);
-    m_event_thread= 0;
+    m_event_thread= NULL;
     ndb_mgm_destroy_handle(&m_mgmsrv2);
   }
   if (m_connected)