Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql

mysql-test/include/have_innobase.inc

@@ -1,2 +0,0 @@
--- require r/have_innobase.require
-show variables like "have_innobase";

mysql-test/include/have_innodb.inc

@@ -0,0 +1,2 @@
+-- require r/have_innodb.require
+show variables like "have_innodb";

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

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 ]

mysql-test/r/have_innodb.require

@@ -1,2 +1,2 @@
 Variable_name	Value
-have_innobase	YES
+have_innodb	YES

mysql-test/t/innodb.test

@@ -1,4 +1,4 @@
--- source include/have_innobase.inc
+-- source include/have_innodb.inc
 
 #
 # Small basic test with ignore