From: Date: November 2 2006 10:05pm
Subject: bk commit into 5.0 tree (hartmut:1.2282) BUG#23887
List-Archive: http://lists.mysql.com/commits/14774
X-Bug: 23887
Message-Id: <E1GfjkJ-0007Xa-6m@walhalla.site>

Below is the list of changes that have just been committed into a local
5.0 repository of hartmut. When hartmut 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-11-02 22:05:02+01:00, hartmut@stripped +1 -0
  Fix for Bug #23887 (Introduced by Bugfix #22295)

  ndb/tools/ndb_config.cpp@stripped, 2006-11-02 22:01:17+01:00, hartmut@stripped +1 -2
    use standard option variable with standard option

# 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:	hartmut
# Host:	walhalla.site
# Root:	/home/hartmut/projects/mysql/dev/teamtrees/mysql-5.0-ndb

--- 1.18/ndb/tools/ndb_config.cpp	2006-09-29 11:37:19 +02:00
+++ 1.19/ndb/tools/ndb_config.cpp	2006-11-02 22:01:17 +01:00
@@ -37,7 +37,6 @@
 static int try_reconnect = 3;
 
 static int g_nodes, g_connections, g_section;
-static const char * g_connectstring = 0;
 static const char * g_query = 0;
 
 static int g_nodeid = 0;
@@ -484,7 +483,7 @@
 
   ndb_mgm_set_error_stream(mgm, stderr);
   
-  if (ndb_mgm_set_connectstring(mgm, g_connectstring))
+  if (ndb_mgm_set_connectstring(mgm, opt_connect_str))
   {
     fprintf(stderr, "* %5d: %s\n", 
 	    ndb_mgm_get_latest_error(mgm),