diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2006-04-21 14:02:21 +0200 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2006-04-21 14:02:21 +0200 |
| commit | b5cde201d22ba0f708c3c921696de147df2e2d41 (patch) | |
| tree | 38a8db9681978f5c13af8458b2c76117a2e5c171 /mysql-test/mysql-test-run.sh | |
| parent | 18b2515817535a9bfdbb00d4087395e790a74a43 (diff) | |
| parent | 0a22763fa621e0d376e3e72febe2ad5df008a202 (diff) | |
| download | mariadb-git-b5cde201d22ba0f708c3c921696de147df2e2d41.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
mysql-test/mysql-test-run.sh:
Auto merged
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index e3a3e3334e4..c41344548f5 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -1243,7 +1243,7 @@ start_ndbcluster() else NDBCLUSTER_EXTRA_OPTS="--small" fi - ./ndb/ndbcluster $NDBCLUSTER_OPTS $NDBCLUSTER_EXTRA_OPTS --initial || NDB_STATUS_OK=0 + ./ndb/ndbcluster $NDBCLUSTER_OPTS --character-sets-dir=$CHARSETSDIR $NDBCLUSTER_EXTRA_OPTS --initial || NDB_STATUS_OK=0 if [ x$NDB_STATUS_OK != x1 ] ; then if [ x$FORCE != x1 ] ; then exit 1 |