diff options
| author | magnus@neptunus.(none) <> | 2004-04-15 17:30:50 +0200 |
|---|---|---|
| committer | magnus@neptunus.(none) <> | 2004-04-15 17:30:50 +0200 |
| commit | af263160f2cb284914fd43f9b9e191ec22b456c8 (patch) | |
| tree | 9581be502cea810ad38cb08e25e5fd617e99b45f /sql/mysqld.cc | |
| parent | 855fcf1411679119196a8876035999608c90128f (diff) | |
| download | mariadb-git-af263160f2cb284914fd43f9b9e191ec22b456c8.tar.gz | |
Fix mysql-test-run to work better with NDB
Fix broken string constant in mysqld.cc
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index c7fafae35c1..bd540e4ebc4 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -4162,13 +4162,10 @@ Disable with --skip-innodb (will save memory).", Disable with --skip-isam.", (gptr*) &opt_isam, (gptr*) &opt_isam, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0}, -#ifdef HAVE_NDBCLUSTER_DB - {"ndbcluster", OPT_NDBCLUSTER, "Enable NDB Cluster (if this version of MySQL -supports it). \ + {"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, 0, 0, 0}, -#endif {"skip-locking", OPT_SKIP_LOCK, "Deprecated option, use --skip-external-locking instead.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, |