Commit 8522f830 authored by unknown's avatar unknown
Browse files

reverted default setting of --ndbcluster if --ndb-connectstring is given

parent 40f282d5

mysql-test/mysql-test-run.sh

+2 −2
Original line number Diff line number Diff line
@@ -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

sql/mysqld.cc

+0 −5
Original line number Diff line number Diff line
@@ -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)