diff options
| author | unknown <mskold/marty@mysql.com/linux.site> | 2006-11-30 16:04:12 +0100 |
|---|---|---|
| committer | unknown <mskold/marty@mysql.com/linux.site> | 2006-11-30 16:04:12 +0100 |
| commit | 7d3cb1a453cb511f1d85ccf469e8fcc1f829768e (patch) | |
| tree | 6ee16833943fcf23eaf62aaf38124f4b125afc0d /ndb/tools | |
| parent | 4ec847218dca3fa31d6b7d61fffdf71c444c1c74 (diff) | |
| parent | d9540e74e2e6d7b646efe5d31f1691eb775ad67e (diff) | |
| download | mariadb-git-7d3cb1a453cb511f1d85ccf469e8fcc1f829768e.tar.gz | |
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
ndb/tools/ndb_config.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
Diffstat (limited to 'ndb/tools')
| -rw-r--r-- | ndb/tools/ndb_config.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ndb/tools/ndb_config.cpp b/ndb/tools/ndb_config.cpp index 049e4599447..c65f7157c15 100644 --- a/ndb/tools/ndb_config.cpp +++ b/ndb/tools/ndb_config.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), |