diff options
| author | unknown <hf@eagle.intranet.mysql.r18.ru> | 2006-01-21 18:50:06 +0400 |
|---|---|---|
| committer | unknown <hf@eagle.intranet.mysql.r18.ru> | 2006-01-21 18:50:06 +0400 |
| commit | 56d6fdbd83a0e3568d75bea54570c413e81b626f (patch) | |
| tree | ba57b634fbff540434a56e3ce0639c85ec0f82ea /mysql-test/ndb | |
| parent | aea96efead241405554cae2e8ff7e8f231f3b957 (diff) | |
| parent | 3f4eaf5fd907b0d596f9effc99aed827fc4e3e8b (diff) | |
| download | mariadb-git-56d6fdbd83a0e3568d75bea54570c413e81b626f.tar.gz | |
Merging
mysql-test/ndb/ndbcluster.sh:
Auto merged
mysql-test/r/func_gconcat.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/func_math.test:
Auto merged
mysql-test/t/type_float.test:
Auto merged
sql/spatial.h:
Auto merged
mysql-test/r/type_float.result:
merging
sql/item_func.cc:
merging
Diffstat (limited to 'mysql-test/ndb')
| -rw-r--r-- | mysql-test/ndb/ndbcluster.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/ndb/ndbcluster.sh b/mysql-test/ndb/ndbcluster.sh index bc9aaf8caac..c09c013552e 100644 --- a/mysql-test/ndb/ndbcluster.sh +++ b/mysql-test/ndb/ndbcluster.sh @@ -134,7 +134,7 @@ if [ ! -x "$exec_waiter" ]; then fi exec_mgmtclient="$exec_mgmtclient --no-defaults $NDB_MGM_EXTRA_OPTS" -exec_mgmtsrvr="$exec_mgmtsrvr $NDB_MGMD_EXTRA_OPTS" +exec_mgmtsrvr="$exec_mgmtsrvr --no-defaults $NDB_MGMD_EXTRA_OPTS" exec_ndb="$exec_ndb --no-defaults $NDBD_EXTRA_OPTS" exec_waiter="$exec_waiter --no-defaults" |