diff options
| author | unknown <tulin@build.mysql.com> | 2005-01-19 10:07:13 +0100 |
|---|---|---|
| committer | unknown <tulin@build.mysql.com> | 2005-01-19 10:07:13 +0100 |
| commit | c4a22bb558ccb6978e3cd6824cd8a789709f9674 (patch) | |
| tree | c2920bf48194c5f79f9f08048cf9a6f9fd3d3c45 /mysql-test/ndb | |
| parent | 0038bc4816fc56af8aaa085cf0136f56c2292c9b (diff) | |
| parent | b26208bfab8552b24928f1b5f9186ead203dd2f9 (diff) | |
| download | mariadb-git-c4a22bb558ccb6978e3cd6824cd8a789709f9674.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into build.mysql.com:/users/tulin/mysql-5.0
mysql-test/mysql-test-run.sh:
Auto merged
Diffstat (limited to 'mysql-test/ndb')
| -rw-r--r-- | mysql-test/ndb/ndbcluster.sh | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/mysql-test/ndb/ndbcluster.sh b/mysql-test/ndb/ndbcluster.sh index 2d529f8fe0f..a86e482b2ab 100644 --- a/mysql-test/ndb/ndbcluster.sh +++ b/mysql-test/ndb/ndbcluster.sh @@ -58,6 +58,9 @@ ndb_con_op=105000 ndb_dmem=80M ndb_imem=24M +NDB_MGMD_EXTRA_OPTS= +NDBD_EXTRA_OPTS= + while test $# -gt 0; do case "$1" in --test) @@ -94,6 +97,12 @@ while test $# -gt 0; do --port-base=*) port_base=`echo "$1" | sed -e "s;--port-base=;;"` ;; + --ndb_mgmd-extra-opts=*) + NDB_MGMD_EXTRA_OPTS=`echo "$1" | sed -e "s;--ndb_mgmd-extra-opts=;;"` + ;; + --ndbd-extra-opts=*) + NDBD_EXTRA_OPTS=`echo "$1" | sed -e "s;--ndbd-extra-opts=;;"` + ;; -- ) shift; break ;; --* ) $ECHO "Unrecognized option: $1"; exit 1 ;; * ) break ;; @@ -122,8 +131,8 @@ if [ ! -x "$exec_waiter" ]; then fi exec_mgmtclient="$exec_mgmtclient --no-defaults" -exec_mgmtsrvr="$exec_mgmtsrvr --no-defaults" -exec_ndb="$exec_ndb --no-defaults" +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" ndb_host="localhost" |