summaryrefslogtreecommitdiff
path: root/mysql-test/ndb
diff options
context:
space:
mode:
authorunknown <konstantin@mysql.com>2006-01-19 15:23:01 +0300
committerunknown <konstantin@mysql.com>2006-01-19 15:23:01 +0300
commit5f37520a093ad6b8dce17fba6aa95a322f385376 (patch)
tree7d86345f3333cebfca1732dceb0f9b1d7fe3e929 /mysql-test/ndb
parentc87bfd13ac7fbf4f3312e0e51a520f71b52d74b2 (diff)
parent52921923abc1dfc0c5d98fc4673f45e93d00c1c7 (diff)
downloadmariadb-git-5f37520a093ad6b8dce17fba6aa95a322f385376.tar.gz
Merge mysql.com:/opt/local/work/mysql-4.1-root
into mysql.com:/opt/local/work/mysql-5.0-root mysql-test/ndb/ndbcluster.sh: Auto merged
Diffstat (limited to 'mysql-test/ndb')
-rw-r--r--mysql-test/ndb/ndbcluster.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/ndb/ndbcluster.sh b/mysql-test/ndb/ndbcluster.sh
index c09c013552e..bc9aaf8caac 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 --no-defaults $NDB_MGMD_EXTRA_OPTS"
+exec_mgmtsrvr="$exec_mgmtsrvr $NDB_MGMD_EXTRA_OPTS"
exec_ndb="$exec_ndb --no-defaults $NDBD_EXTRA_OPTS"
exec_waiter="$exec_waiter --no-defaults"