diff --git a/mysql-test/suite/storage_engine/misc.result b/mysql-test/suite/storage_engine/misc.result index 8b1d951a73e..3643611aa49 100644 --- a/mysql-test/suite/storage_engine/misc.result +++ b/mysql-test/suite/storage_engine/misc.result @@ -58,7 +58,12 @@ index_stats db_name NULL NULL index_stats index_name NULL NULL index_stats prefix_arity NULL NULL index_stats table_name NULL NULL -ndb_binlog_index epoch NULL NULL +innodb_index_stats database_name NULL NULL +innodb_index_stats index_name NULL NULL +innodb_index_stats stat_name NULL NULL +innodb_index_stats table_name NULL NULL +innodb_table_stats database_name NULL NULL +innodb_table_stats table_name NULL NULL plugin name NULL NULL proc db NULL NULL proc name NULL NULL diff --git a/storage/myisam/mysql-test/storage_engine/misc.rdiff b/storage/myisam/mysql-test/storage_engine/misc.rdiff new file mode 100644 index 00000000000..39d43d07be2 --- /dev/null +++ b/storage/myisam/mysql-test/storage_engine/misc.rdiff @@ -0,0 +1,25 @@ +--- suite/storage_engine/misc.result 2013-11-08 21:49:40.000000000 +0400 ++++ suite/storage_engine/misc.reject 2013-11-08 21:51:58.000000000 +0400 +@@ -28,6 +28,9 @@ + SELECT TABLE_NAME, COLUMN_NAME, REFERENCED_TABLE_NAME, REFERENCED_COLUMN_NAME + FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE ORDER BY TABLE_NAME; + TABLE_NAME COLUMN_NAME REFERENCED_TABLE_NAME REFERENCED_COLUMN_NAME ++Warning 1286 Unknown storage engine 'InnoDB' ++Warning 1286 Unknown storage engine 'InnoDB' ++Warnings: + column_stats column_name NULL NULL + column_stats db_name NULL NULL + column_stats table_name NULL NULL +@@ -58,12 +61,6 @@ + index_stats index_name NULL NULL + index_stats prefix_arity NULL NULL + index_stats table_name NULL NULL +-innodb_index_stats database_name NULL NULL +-innodb_index_stats index_name NULL NULL +-innodb_index_stats stat_name NULL NULL +-innodb_index_stats table_name NULL NULL +-innodb_table_stats database_name NULL NULL +-innodb_table_stats table_name NULL NULL + plugin name NULL NULL + proc db NULL NULL + proc name NULL NULL diff --git a/storage/myisammrg/mysql-test/storage_engine/misc.rdiff b/storage/myisammrg/mysql-test/storage_engine/misc.rdiff new file mode 100644 index 00000000000..2430b055735 --- /dev/null +++ b/storage/myisammrg/mysql-test/storage_engine/misc.rdiff @@ -0,0 +1,25 @@ +--- suite/storage_engine/misc.result 2013-11-08 21:49:40.000000000 +0400 ++++ suite/storage_engine/misc.reject 2013-11-08 21:58:42.000000000 +0400 +@@ -28,6 +28,9 @@ + SELECT TABLE_NAME, COLUMN_NAME, REFERENCED_TABLE_NAME, REFERENCED_COLUMN_NAME + FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE ORDER BY TABLE_NAME; + TABLE_NAME COLUMN_NAME REFERENCED_TABLE_NAME REFERENCED_COLUMN_NAME ++Warning 1286 Unknown storage engine 'InnoDB' ++Warning 1286 Unknown storage engine 'InnoDB' ++Warnings: + column_stats column_name NULL NULL + column_stats db_name NULL NULL + column_stats table_name NULL NULL +@@ -58,12 +61,6 @@ + index_stats index_name NULL NULL + index_stats prefix_arity NULL NULL + index_stats table_name NULL NULL +-innodb_index_stats database_name NULL NULL +-innodb_index_stats index_name NULL NULL +-innodb_index_stats stat_name NULL NULL +-innodb_index_stats table_name NULL NULL +-innodb_table_stats database_name NULL NULL +-innodb_table_stats table_name NULL NULL + plugin name NULL NULL + proc db NULL NULL + proc name NULL NULL