Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1

into mysql.com:/windows/Linux_space/MySQL/mysql-5.1

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
9d5fe95e · mskold/marty@linux.site · ddf219d2 · 2b3789dd · 9d5fe95e · 9d5fe95e
Commit 9d5fe95e authored Dec 05, 2006 by mskold/marty@linux.site
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

storage/ndb/src/common/util/File.cpp storage/ndb/src/common/util/File.cpp +1 -1

storage/ndb/tools/ndb_condig.cpp storage/ndb/tools/ndb_condig.cpp +1 -2

No files found.
--- a/storage/ndb/src/common/util/File.cpp
+++ b/storage/ndb/src/common/util/File.cpp
--- a/storage/ndb/tools/ndb_condig.cpp
+++ b/storage/ndb/tools/ndb_condig.cpp
@@ -37,7 +37,6 @@ static int g_verbose = 0;
 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;
@@ -486,7 +485,7 @@ fetch_configuration()
  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),