diff options
| author | unknown <tomas@poseidon.(none)> | 2004-08-23 15:12:38 +0000 |
|---|---|---|
| committer | unknown <tomas@poseidon.(none)> | 2004-08-23 15:12:38 +0000 |
| commit | 8522f83038f1021374a565e70ab842511d4dae97 (patch) | |
| tree | ac984d5229ccf5b3acaf55ce3b17b3e8628905e8 | |
| parent | 40f282d593b83453344136144b7071d9b6e4c025 (diff) | |
| download | mariadb-git-8522f83038f1021374a565e70ab842511d4dae97.tar.gz | |
reverted default setting of --ndbcluster if --ndb-connectstring is given
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 4 | ||||
| -rw-r--r-- | sql/mysqld.cc | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 4c021cd9aa0..58d7af75284 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -1451,9 +1451,9 @@ then then echo "Starting ndbcluster" ./ndb/ndbcluster --port-base=$NDBCLUSTER_PORT --small --diskless --initial --data-dir=$MYSQL_TEST_DIR/var || exit 1 - USE_NDBCLUSTER="--ndb-connectstring=\"host=localhost:$NDBCLUSTER_PORT\"" + USE_NDBCLUSTER="$USE_NDBCLUSTER --ndb-connectstring=\"host=localhost:$NDBCLUSTER_PORT\"" else - USE_NDBCLUSTER="--ndb-connectstring=\"$USE_RUNNING_NDBCLUSTER\"" + USE_NDBCLUSTER="$USE_NDBCLUSTER --ndb-connectstring=\"$USE_RUNNING_NDBCLUSTER\"" echo "Using ndbcluster at $USE_NDBCLUSTER" fi fi diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 3a1c66a52f3..8dfca2bb684 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -6004,11 +6004,6 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), have_ndbcluster= SHOW_OPTION_DISABLED; #endif break; -#ifdef HAVE_NDBCLUSTER_DB - case OPT_NDB_CONNECTSTRING: - have_ndbcluster= SHOW_OPTION_YES; - break; -#endif case OPT_INNODB: #ifdef HAVE_INNOBASE_DB if (opt_innodb) |