diff options
| author | unknown <holyfoot@mysql.com> | 2006-01-23 11:59:31 +0400 |
|---|---|---|
| committer | unknown <holyfoot@mysql.com> | 2006-01-23 11:59:31 +0400 |
| commit | 793a8bb7c3b237ae73fbe7edab1672b8d48bfb5d (patch) | |
| tree | 388c5aee815346e2a7a5e27f08fc2539f026e738 /mysql-test/mysql-test-run.sh | |
| parent | 4649ac07467c0912d51480e101f8d63d5859ec2a (diff) | |
| parent | 823ec15c65d9831fdf3a3521b214dbf1a20ca1ec (diff) | |
| download | mariadb-git-793a8bb7c3b237ae73fbe7edab1672b8d48bfb5d.tar.gz | |
Merge bk@192.168.21.1:mysql-5.1-new into mysql.com:/home/hf/work/5.1.emb
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index eb111a99b93..373a46cb915 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -318,6 +318,8 @@ while test $# -gt 0; do USE_EMBEDDED_SERVER=1 USE_MANAGER=0 NO_SLAVE=1 USE_RUNNING_SERVER=0 + USE_NDBCLUSTER="" + USE_NDBCLUSTER_SLAVE="" TEST_MODE="$TEST_MODE embedded" ;; --purify) USE_PURIFY=1 |