Commit df5df8a1 authored by bell@sanja.is.com.ua's avatar bell@sanja.is.com.ua

allow --skip-ndbcluster if server is not compiled

fixed syntax errro
parent 855fcf14
...@@ -77,7 +77,7 @@ EXTRA_ARG="--language=../sql/share/english/ --character-sets-dir=../sql/share/ch ...@@ -77,7 +77,7 @@ EXTRA_ARG="--language=../sql/share/english/ --character-sets-dir=../sql/share/ch
fi fi
mysqld_boot=" $execdir/mysqld --no-defaults --bootstrap --skip-grant-tables \ mysqld_boot=" $execdir/mysqld --no-defaults --bootstrap --skip-grant-tables \
--basedir=$basedir --datadir=$ldata --skip-innodb --skip-ndb --skip-bdb \ --basedir=$basedir --datadir=$ldata --skip-innodb --skip-ndbcluster --skip-bdb \
$EXTRA_ARG" $EXTRA_ARG"
echo "running $mysqld_boot" echo "running $mysqld_boot"
......
...@@ -4162,13 +4162,9 @@ Disable with --skip-innodb (will save memory).", ...@@ -4162,13 +4162,9 @@ Disable with --skip-innodb (will save memory).",
Disable with --skip-isam.", Disable with --skip-isam.",
(gptr*) &opt_isam, (gptr*) &opt_isam, 0, GET_BOOL, NO_ARG, 1, 0, 0, (gptr*) &opt_isam, (gptr*) &opt_isam, 0, GET_BOOL, NO_ARG, 1, 0, 0,
0, 0, 0}, 0, 0, 0},
#ifdef HAVE_NDBCLUSTER_DB {"ndbcluster", OPT_NDBCLUSTER, "Enable NDB Cluster (if this version of MySQL supports it). Disable with --skip-ndbcluster (will save memory).",
{"ndbcluster", OPT_NDBCLUSTER, "Enable NDB Cluster (if this version of MySQL
supports it). \
Disable with --skip-ndbcluster (will save memory).",
(gptr*) &opt_ndbcluster, (gptr*) &opt_ndbcluster, 0, GET_BOOL, NO_ARG, 1, 0, 0, (gptr*) &opt_ndbcluster, (gptr*) &opt_ndbcluster, 0, GET_BOOL, NO_ARG, 1, 0, 0,
0, 0, 0}, 0, 0, 0},
#endif
{"skip-locking", OPT_SKIP_LOCK, {"skip-locking", OPT_SKIP_LOCK,
"Deprecated option, use --skip-external-locking instead.", "Deprecated option, use --skip-external-locking instead.",
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment