summaryrefslogtreecommitdiff
path: root/mysql-test/mysql-test-run.sh
diff options
context:
space:
mode:
authormonty@donna.mysql.fi <>2001-04-13 12:39:34 +0300
committermonty@donna.mysql.fi <>2001-04-13 12:39:34 +0300
commit46839ed2f225193b0aaa6386312fca90b1453bb5 (patch)
treefa1346a4b858344c1283c7f751d9a97ae77bd9f7 /mysql-test/mysql-test-run.sh
parent69be96cf2af8eb52a43d3bfbd9b644818e76e119 (diff)
parent8700c02daee78ef2550436e03f566f2fede1e781 (diff)
downloadmariadb-git-46839ed2f225193b0aaa6386312fca90b1453bb5.tar.gz
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
-rw-r--r--mysql-test/mysql-test-run.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index 9342e30f1a1..c9a4d56b75a 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -429,7 +429,7 @@ start_master()
--core \
--tmpdir=$MYSQL_TMP_DIR \
--language=english \
- --innobase_data_file_path=ibdata1:50M \
+ --innodb_data_file_path=ibdata1:50M \
$SMALL_SERVER \
$EXTRA_MASTER_OPT $EXTRA_MASTER_MYSQLD_OPT"
if [ x$DO_DDD = x1 ]
@@ -484,7 +484,7 @@ start_slave()
--core \
--tmpdir=$MYSQL_TMP_DIR \
--language=english \
- --skip-innobase \
+ --skip-innodb \
$SMALL_SERVER \
$EXTRA_SLAVE_OPT $EXTRA_SLAVE_MYSQLD_OPT"
if [ x$DO_DDD = x1 ]