diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2006-04-21 14:00:44 +0200 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2006-04-21 14:00:44 +0200 |
| commit | 98c7825ad81fe237800f7c7a12018bea522d52f6 (patch) | |
| tree | 6bffb2676081a357c02995b23cfc9a4c0c078543 /mysql-test/mysql-test-run.sh | |
| parent | f5c2191c713c6bc3f49a652098a9f6b82c6f800b (diff) | |
| parent | 0a22763fa621e0d376e3e72febe2ad5df008a202 (diff) | |
| download | mariadb-git-98c7825ad81fe237800f7c7a12018bea522d52f6.tar.gz | |
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
storage/ndb/include/util/ndb_opts.h:
Auto merged
mysql-test/mysql-test-run.pl:
manual merge
mysql-test/mysql-test-run.sh:
manual merge
mysql-test/ndb/ndbcluster.sh:
manual merge
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 aad71f89ef2..54c5ce20047 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -1230,7 +1230,7 @@ start_ndbcluster() then NDBCLUSTER_EXTRA_OPTS="--small" fi - OPTS="$NDBCLUSTER_OPTS $NDBCLUSTER_EXTRA_OPTS --verbose=$NDB_VERBOSE --initial --relative-config-data-dir --core" + OPTS="$NDBCLUSTER_OPTS $NDBCLUSTER_EXTRA_OPTS --character-sets-dir=$CHARSETSDIR --verbose=$NDB_VERBOSE --initial --relative-config-data-dir --core" if [ "x$NDB_VERBOSE" != "x0" ] ; then echo "Starting master ndbcluster " $OPTS fi |