diff options
| author | unknown <monty@donna.mysql.fi> | 2001-04-13 12:39:34 +0300 |
|---|---|---|
| committer | unknown <monty@donna.mysql.fi> | 2001-04-13 12:39:34 +0300 |
| commit | 0948956b802845699f9868b1e2c6b61a74f36b8d (patch) | |
| tree | fa1346a4b858344c1283c7f751d9a97ae77bd9f7 /mysql-test | |
| parent | ab0338a3981143c8aabbaaf99c43f4275df22ad4 (diff) | |
| parent | 3e6215d9d080c8f09499fe2693df085754f97d37 (diff) | |
| download | mariadb-git-0948956b802845699f9868b1e2c6b61a74f36b8d.tar.gz | |
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
Docs/manual.texi:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/include/have_innobase.inc | 2 | ||||
| -rw-r--r-- | mysql-test/include/have_innodb.inc | 2 | ||||
| -rw-r--r-- | mysql-test/install_test_db.sh | 2 | ||||
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 4 | ||||
| -rw-r--r-- | mysql-test/r/have_innodb.require (renamed from mysql-test/r/have_innobase.require) | 2 | ||||
| -rw-r--r-- | mysql-test/r/innodb.result (renamed from mysql-test/r/innobase.result) | 0 | ||||
| -rw-r--r-- | mysql-test/t/innodb.test (renamed from mysql-test/t/innobase.test) | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/mysql-test/include/have_innobase.inc b/mysql-test/include/have_innobase.inc deleted file mode 100644 index ec9f39f320f..00000000000 --- a/mysql-test/include/have_innobase.inc +++ /dev/null @@ -1,2 +0,0 @@ --- require r/have_innobase.require -show variables like "have_innobase"; diff --git a/mysql-test/include/have_innodb.inc b/mysql-test/include/have_innodb.inc new file mode 100644 index 00000000000..7dcaef44878 --- /dev/null +++ b/mysql-test/include/have_innodb.inc @@ -0,0 +1,2 @@ +-- require r/have_innodb.require +show variables like "have_innodb"; diff --git a/mysql-test/install_test_db.sh b/mysql-test/install_test_db.sh index 3e6595f0b40..6fd32d37cd0 100644 --- a/mysql-test/install_test_db.sh +++ b/mysql-test/install_test_db.sh @@ -193,7 +193,7 @@ then fi if $execdir/mysqld --no-defaults --bootstrap --skip-grant-tables \ - --basedir=$basedir --datadir=$ldata --skip-innobase --skip-bdb --skip-gemini << END_OF_DATA + --basedir=$basedir --datadir=$ldata --skip-innodb --skip-bdb --skip-gemini << END_OF_DATA use mysql; $c_d $i_d 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 ] diff --git a/mysql-test/r/have_innobase.require b/mysql-test/r/have_innodb.require index eefc7650e9f..48a764a6c58 100644 --- a/mysql-test/r/have_innobase.require +++ b/mysql-test/r/have_innodb.require @@ -1,2 +1,2 @@ Variable_name Value -have_innobase YES +have_innodb YES diff --git a/mysql-test/r/innobase.result b/mysql-test/r/innodb.result index 12f193bbdd9..12f193bbdd9 100644 --- a/mysql-test/r/innobase.result +++ b/mysql-test/r/innodb.result diff --git a/mysql-test/t/innobase.test b/mysql-test/t/innodb.test index ee1bd7cddca..b18091656b6 100644 --- a/mysql-test/t/innobase.test +++ b/mysql-test/t/innodb.test @@ -1,4 +1,4 @@ --- source include/have_innobase.inc +-- source include/have_innodb.inc # # Small basic test with ignore |