------------------------------------------------------------
revno: 3293
committer: kevin.lewis@oracle.com
branch nick: mysql-next-mr-innodb
timestamp: Wed 2010-11-03 14:37:21 -0500
message:
  Bug#56628 - Adjust hte results of testcase innodb-create-options for the next-mr branch where storage_engine is being depricated and replaced with 'default_storage_engine'.  Also, the message for warning 1051-ER_BAD_TABLE_ERROR now includes the database name.
diff:
=== modified file 'mysql-test/suite/innodb/r/innodb-create-options.result'
--- mysql-test/suite/innodb/r/innodb-create-options.result	revid:kevin.lewis@oracle.com-20101102233618-1lx5vcpeetq7zf9g
+++ mysql-test/suite/innodb/r/innodb-create-options.result	revid:kevin.lewis@oracle.com-20101103193721-m4g8nptu6eqz1ads
@@ -1,4 +1,4 @@
-SET storage_engine=InnoDB;
+SET default_storage_engine=InnoDB;
 SET GLOBAL innodb_file_format=`Barracuda`;
 SET GLOBAL innodb_file_per_table=ON;
 SET SESSION innodb_strict_mode = ON;
@@ -6,7 +6,7 @@
 #         KEY_BLOCK_SIZE=0 means 'no KEY_BLOCK_SIZE is specified'
 DROP TABLE IF EXISTS t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 #         'FIXED' is sent to InnoDB since it is used by MyISAM.
 #         But it is an invalid mode in InnoDB
 CREATE TABLE t1 ( i INT ) ROW_FORMAT=FIXED;
@@ -261,7 +261,7 @@
 SET GLOBAL innodb_file_format=Antelope;
 DROP TABLE IF EXISTS t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 CREATE TABLE t1 ( i INT ) KEY_BLOCK_SIZE=4;
 ERROR HY000: Can't create table 'test.t1' (errno: 1478)
 SHOW WARNINGS;

=== modified file 'mysql-test/suite/innodb/t/innodb-create-options.test'
--- mysql-test/suite/innodb/t/innodb-create-options.test	revid:kevin.lewis@oracle.com-20101102233618-1lx5vcpeetq7zf9g
+++ mysql-test/suite/innodb/t/innodb-create-options.test	revid:kevin.lewis@oracle.com-20101103193721-m4g8nptu6eqz1ads
@@ -56,7 +56,7 @@
 # See InnoDB documentation page "SQL Compression Syntax Warnings and Errors"
 
 -- source include/have_innodb.inc
-SET storage_engine=InnoDB;
+SET default_storage_engine=InnoDB;
 
 --disable_query_log
 # These values can change during the test