diff options
| -rw-r--r-- | mysql-test/include/have_xtradb.combinations | 13 | ||||
| -rw-r--r-- | mysql-test/include/have_xtradb.inc | 7 | ||||
| -rw-r--r-- | mysql-test/include/have_xtradb.opt | 2 | ||||
| -rw-r--r-- | mysql-test/r/information_schema_all_engines.result | 116 | ||||
| -rw-r--r-- | mysql-test/r/merge_debug.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite.pm | 4 | ||||
| -rw-r--r-- | mysql-test/suite/funcs_1/r/is_columns_is.result | 6 | ||||
| -rw-r--r-- | mysql-test/suite/funcs_1/t/is_columns_is.test | 2 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_drop_temp.test | 2 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_stop_slave.test | 2 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_variables_stm.test | 2 | ||||
| -rw-r--r-- | mysql-test/suite/vcol/t/vcol_partition_innodb.test | 9 | ||||
| -rw-r--r-- | mysql-test/t/information_schema_all_engines.test | 1 | ||||
| -rw-r--r-- | mysql-test/t/merge_debug.test | 4 |
14 files changed, 34 insertions, 138 deletions
diff --git a/mysql-test/include/have_xtradb.combinations b/mysql-test/include/have_xtradb.combinations new file mode 100644 index 00000000000..b82edc53aee --- /dev/null +++ b/mysql-test/include/have_xtradb.combinations @@ -0,0 +1,13 @@ +[xtradb_plugin] +ignore-builtin-innodb +plugin-load=$HA_XTRADB_SO +innodb +innodb-cmpmem +innodb-trx +xtradb-admin-command + +[xtradb] +innodb +innodb-cmpmem +innodb-trx +xtradb-admin-command diff --git a/mysql-test/include/have_xtradb.inc b/mysql-test/include/have_xtradb.inc index cf92b0317df..478b9926e21 100644 --- a/mysql-test/include/have_xtradb.inc +++ b/mysql-test/include/have_xtradb.inc @@ -1,4 +1,9 @@ ---source include/have_innodb.inc +# +# suite.pm will make sure that all tests including this file +# will be skipped unless xtradb is enabled +# +# The test below is redundant + if (!`SELECT count(*) FROM information_schema.plugins WHERE plugin_name = 'innodb' AND plugin_status = 'active' AND plugin_description LIKE '%xtradb%'`){ diff --git a/mysql-test/include/have_xtradb.opt b/mysql-test/include/have_xtradb.opt deleted file mode 100644 index 4fb96229a7b..00000000000 --- a/mysql-test/include/have_xtradb.opt +++ /dev/null @@ -1,2 +0,0 @@ ---loose-innodb ---plugin-load=$HA_XTRADB_SO diff --git a/mysql-test/r/information_schema_all_engines.result b/mysql-test/r/information_schema_all_engines.result index 021fe003b22..be2b2360094 100644 --- a/mysql-test/r/information_schema_all_engines.result +++ b/mysql-test/r/information_schema_all_engines.result @@ -13,32 +13,13 @@ FILES GLOBAL_STATUS GLOBAL_VARIABLES INDEX_STATISTICS -INNODB_BUFFER_POOL_PAGES -INNODB_BUFFER_POOL_PAGES_BLOB -INNODB_BUFFER_POOL_PAGES_INDEX -INNODB_CMP INNODB_CMPMEM -INNODB_CMPMEM_RESET -INNODB_CMP_RESET -INNODB_INDEX_STATS INNODB_LOCKS -INNODB_LOCK_WAITS -INNODB_RSEG -INNODB_SYS_COLUMNS -INNODB_SYS_FIELDS -INNODB_SYS_FOREIGN -INNODB_SYS_FOREIGN_COLS -INNODB_SYS_INDEXES -INNODB_SYS_STATS -INNODB_SYS_TABLES -INNODB_SYS_TABLESTATS -INNODB_TABLE_STATS INNODB_TRX KEY_CACHES KEY_COLUMN_USAGE PARAMETERS PARTITIONS -PBXT_STATISTICS PLUGINS PROCESSLIST PROFILING @@ -86,32 +67,13 @@ FILES TABLE_SCHEMA GLOBAL_STATUS VARIABLE_NAME GLOBAL_VARIABLES VARIABLE_NAME INDEX_STATISTICS TABLE_SCHEMA -INNODB_BUFFER_POOL_PAGES page_type -INNODB_BUFFER_POOL_PAGES_BLOB space_id -INNODB_BUFFER_POOL_PAGES_INDEX index_id -INNODB_CMP page_size INNODB_CMPMEM page_size -INNODB_CMPMEM_RESET page_size -INNODB_CMP_RESET page_size -INNODB_INDEX_STATS table_schema INNODB_LOCKS lock_id -INNODB_LOCK_WAITS requesting_trx_id -INNODB_RSEG rseg_id -INNODB_SYS_COLUMNS TABLE_ID -INNODB_SYS_FIELDS INDEX_ID -INNODB_SYS_FOREIGN ID -INNODB_SYS_FOREIGN_COLS ID -INNODB_SYS_INDEXES INDEX_ID -INNODB_SYS_STATS INDEX_ID -INNODB_SYS_TABLES SCHEMA -INNODB_SYS_TABLESTATS SCHEMA -INNODB_TABLE_STATS table_schema INNODB_TRX trx_id KEY_CACHES KEY_CACHE_NAME KEY_COLUMN_USAGE CONSTRAINT_SCHEMA PARAMETERS SPECIFIC_SCHEMA PARTITIONS TABLE_SCHEMA -PBXT_STATISTICS ID PLUGINS PLUGIN_NAME PROCESSLIST ID PROFILING QUERY_ID @@ -159,32 +121,13 @@ FILES TABLE_SCHEMA GLOBAL_STATUS VARIABLE_NAME GLOBAL_VARIABLES VARIABLE_NAME INDEX_STATISTICS TABLE_SCHEMA -INNODB_BUFFER_POOL_PAGES page_type -INNODB_BUFFER_POOL_PAGES_BLOB space_id -INNODB_BUFFER_POOL_PAGES_INDEX index_id -INNODB_CMP page_size INNODB_CMPMEM page_size -INNODB_CMPMEM_RESET page_size -INNODB_CMP_RESET page_size -INNODB_INDEX_STATS table_schema INNODB_LOCKS lock_id -INNODB_LOCK_WAITS requesting_trx_id -INNODB_RSEG rseg_id -INNODB_SYS_COLUMNS TABLE_ID -INNODB_SYS_FIELDS INDEX_ID -INNODB_SYS_FOREIGN ID -INNODB_SYS_FOREIGN_COLS ID -INNODB_SYS_INDEXES INDEX_ID -INNODB_SYS_STATS INDEX_ID -INNODB_SYS_TABLES SCHEMA -INNODB_SYS_TABLESTATS SCHEMA -INNODB_TABLE_STATS table_schema INNODB_TRX trx_id KEY_CACHES KEY_CACHE_NAME KEY_COLUMN_USAGE CONSTRAINT_SCHEMA PARAMETERS SPECIFIC_SCHEMA PARTITIONS TABLE_SCHEMA -PBXT_STATISTICS ID PLUGINS PLUGIN_NAME PROCESSLIST ID PROFILING QUERY_ID @@ -238,32 +181,13 @@ FILES information_schema.FILES 1 GLOBAL_STATUS information_schema.GLOBAL_STATUS 1 GLOBAL_VARIABLES information_schema.GLOBAL_VARIABLES 1 INDEX_STATISTICS information_schema.INDEX_STATISTICS 1 -INNODB_BUFFER_POOL_PAGES information_schema.INNODB_BUFFER_POOL_PAGES 1 -INNODB_BUFFER_POOL_PAGES_BLOB information_schema.INNODB_BUFFER_POOL_PAGES_BLOB 1 -INNODB_BUFFER_POOL_PAGES_INDEX information_schema.INNODB_BUFFER_POOL_PAGES_INDEX 1 -INNODB_CMP information_schema.INNODB_CMP 1 INNODB_CMPMEM information_schema.INNODB_CMPMEM 1 -INNODB_CMPMEM_RESET information_schema.INNODB_CMPMEM_RESET 1 -INNODB_CMP_RESET information_schema.INNODB_CMP_RESET 1 -INNODB_INDEX_STATS information_schema.INNODB_INDEX_STATS 1 INNODB_LOCKS information_schema.INNODB_LOCKS 1 -INNODB_LOCK_WAITS information_schema.INNODB_LOCK_WAITS 1 -INNODB_RSEG information_schema.INNODB_RSEG 1 -INNODB_SYS_COLUMNS information_schema.INNODB_SYS_COLUMNS 1 -INNODB_SYS_FIELDS information_schema.INNODB_SYS_FIELDS 1 -INNODB_SYS_FOREIGN information_schema.INNODB_SYS_FOREIGN 1 -INNODB_SYS_FOREIGN_COLS information_schema.INNODB_SYS_FOREIGN_COLS 1 -INNODB_SYS_INDEXES information_schema.INNODB_SYS_INDEXES 1 -INNODB_SYS_STATS information_schema.INNODB_SYS_STATS 1 -INNODB_SYS_TABLES information_schema.INNODB_SYS_TABLES 1 -INNODB_SYS_TABLESTATS information_schema.INNODB_SYS_TABLESTATS 1 -INNODB_TABLE_STATS information_schema.INNODB_TABLE_STATS 1 INNODB_TRX information_schema.INNODB_TRX 1 KEY_CACHES information_schema.KEY_CACHES 1 KEY_COLUMN_USAGE information_schema.KEY_COLUMN_USAGE 1 PARAMETERS information_schema.PARAMETERS 1 PARTITIONS information_schema.PARTITIONS 1 -PBXT_STATISTICS information_schema.PBXT_STATISTICS 1 PLUGINS information_schema.PLUGINS 1 PROCESSLIST information_schema.PROCESSLIST 1 PROFILING information_schema.PROFILING 1 @@ -300,32 +224,13 @@ Database: information_schema | GLOBAL_STATUS | | GLOBAL_VARIABLES | | INDEX_STATISTICS | -| INNODB_BUFFER_POOL_PAGES | -| INNODB_BUFFER_POOL_PAGES_BLOB | -| INNODB_BUFFER_POOL_PAGES_INDEX | -| INNODB_CMP | | INNODB_CMPMEM | -| INNODB_CMPMEM_RESET | -| INNODB_CMP_RESET | -| INNODB_INDEX_STATS | | INNODB_LOCKS | -| INNODB_LOCK_WAITS | -| INNODB_RSEG | -| INNODB_SYS_COLUMNS | -| INNODB_SYS_FIELDS | -| INNODB_SYS_FOREIGN | -| INNODB_SYS_FOREIGN_COLS | -| INNODB_SYS_INDEXES | -| INNODB_SYS_STATS | -| INNODB_SYS_TABLES | -| INNODB_SYS_TABLESTATS | -| INNODB_TABLE_STATS | | INNODB_TRX | | KEY_CACHES | | KEY_COLUMN_USAGE | | PARAMETERS | | PARTITIONS | -| PBXT_STATISTICS | | PLUGINS | | PROCESSLIST | | PROFILING | @@ -363,32 +268,13 @@ Database: INFORMATION_SCHEMA | GLOBAL_STATUS | | GLOBAL_VARIABLES | | INDEX_STATISTICS | -| INNODB_BUFFER_POOL_PAGES | -| INNODB_BUFFER_POOL_PAGES_BLOB | -| INNODB_BUFFER_POOL_PAGES_INDEX | -| INNODB_CMP | | INNODB_CMPMEM | -| INNODB_CMPMEM_RESET | -| INNODB_CMP_RESET | -| INNODB_INDEX_STATS | | INNODB_LOCKS | -| INNODB_LOCK_WAITS | -| INNODB_RSEG | -| INNODB_SYS_COLUMNS | -| INNODB_SYS_FIELDS | -| INNODB_SYS_FOREIGN | -| INNODB_SYS_FOREIGN_COLS | -| INNODB_SYS_INDEXES | -| INNODB_SYS_STATS | -| INNODB_SYS_TABLES | -| INNODB_SYS_TABLESTATS | -| INNODB_TABLE_STATS | | INNODB_TRX | | KEY_CACHES | | KEY_COLUMN_USAGE | | PARAMETERS | | PARTITIONS | -| PBXT_STATISTICS | | PLUGINS | | PROCESSLIST | | PROFILING | @@ -417,5 +303,5 @@ Wildcard: inf_rmation_schema | information_schema | SELECT table_schema, count(*) FROM information_schema.TABLES WHERE table_schema IN ('mysql', 'INFORMATION_SCHEMA', 'test', 'mysqltest') AND table_name<>'ndb_binlog_index' AND table_name<>'ndb_apply_status' GROUP BY TABLE_SCHEMA; table_schema count(*) -information_schema 58 +information_schema 39 mysql 23 diff --git a/mysql-test/r/merge_debug.result b/mysql-test/r/merge_debug.result index ff7222ac0f3..d6ca17f0659 100644 --- a/mysql-test/r/merge_debug.result +++ b/mysql-test/r/merge_debug.result @@ -1,3 +1,4 @@ +set @default_storage_engine= @@global.storage_engine; set global storage_engine=myisam; set session storage_engine=myisam; drop table if exists crashed,t2,t3,t4; @@ -22,3 +23,4 @@ INSERT INTO t3 VALUES (31); UNLOCK TABLES; DROP TRIGGER t1_ai; DROP TABLE t4,crashed,t2,t3; +set global storage_engine=@default_storage_engine; diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm index fc9d724a6e0..9db2c96a7c5 100644 --- a/mysql-test/suite.pm +++ b/mysql-test/suite.pm @@ -10,7 +10,8 @@ sub skip_combinations { push @combinations, 'xtradb_plugin' unless $ENV{HA_XTRADB_SO}; push @combinations, 'xtradb' unless $::mysqld_variables{'innodb'} eq "ON"; - my %skip = ( 'include/have_innodb.combinations' => [ @combinations ]); + my %skip = ( 'include/have_innodb.combinations' => [ @combinations ], + 'include/have_xtradb.combinations' => [ @combinations ]); # as a special case, disable certain include files as a whole $skip{'include/not_embedded.inc'} = 'Not run for embedded server' @@ -30,6 +31,5 @@ sub skip_combinations { %skip; } - bless { }; diff --git a/mysql-test/suite/funcs_1/r/is_columns_is.result b/mysql-test/suite/funcs_1/r/is_columns_is.result index 89834c7ba3e..4da7eeb2ada 100644 --- a/mysql-test/suite/funcs_1/r/is_columns_is.result +++ b/mysql-test/suite/funcs_1/r/is_columns_is.result @@ -206,9 +206,6 @@ def information_schema PARTITIONS TABLE_NAME 3 NO varchar 64 192 NULL NULL NULL def information_schema PARTITIONS TABLE_ROWS 13 0 NO bigint NULL NULL 20 0 NULL NULL NULL bigint(21) unsigned select def information_schema PARTITIONS TABLE_SCHEMA 2 NO varchar 64 192 NULL NULL NULL utf8 utf8_general_ci varchar(64) select def information_schema PARTITIONS UPDATE_TIME 20 NULL YES datetime NULL NULL NULL NULL 0 NULL NULL datetime select -def information_schema PBXT_STATISTICS ID 1 0 NO int NULL NULL 10 0 NULL NULL NULL int(4) select -def information_schema PBXT_STATISTICS Name 2 NO varchar 40 120 NULL NULL NULL utf8 utf8_general_ci varchar(40) select -def information_schema PBXT_STATISTICS Value 3 0 NO bigint NULL NULL 19 0 NULL NULL NULL bigint(8) select def information_schema PLUGINS LOAD_OPTION 11 NO varchar 64 192 NULL NULL NULL utf8 utf8_general_ci varchar(64) select def information_schema PLUGINS PLUGIN_AUTHOR 8 NULL YES varchar 64 192 NULL NULL NULL utf8 utf8_general_ci varchar(64) select def information_schema PLUGINS PLUGIN_AUTH_VERSION 13 NULL YES varchar 80 240 NULL NULL NULL utf8 utf8_general_ci varchar(80) select @@ -677,9 +674,6 @@ NULL information_schema PARTITIONS CHECKSUM bigint NULL NULL NULL NULL bigint(21 3.0000 information_schema PARTITIONS PARTITION_COMMENT varchar 80 240 utf8 utf8_general_ci varchar(80) 3.0000 information_schema PARTITIONS NODEGROUP varchar 12 36 utf8 utf8_general_ci varchar(12) 3.0000 information_schema PARTITIONS TABLESPACE_NAME varchar 64 192 utf8 utf8_general_ci varchar(64) -NULL information_schema PBXT_STATISTICS ID int NULL NULL NULL NULL int(4) -3.0000 information_schema PBXT_STATISTICS Name varchar 40 120 utf8 utf8_general_ci varchar(40) -NULL information_schema PBXT_STATISTICS Value bigint NULL NULL NULL NULL bigint(8) 3.0000 information_schema PLUGINS PLUGIN_NAME varchar 64 192 utf8 utf8_general_ci varchar(64) 3.0000 information_schema PLUGINS PLUGIN_VERSION varchar 20 60 utf8 utf8_general_ci varchar(20) 3.0000 information_schema PLUGINS PLUGIN_STATUS varchar 10 30 utf8 utf8_general_ci varchar(10) diff --git a/mysql-test/suite/funcs_1/t/is_columns_is.test b/mysql-test/suite/funcs_1/t/is_columns_is.test index 94b4d20cc7e..54527e6e080 100644 --- a/mysql-test/suite/funcs_1/t/is_columns_is.test +++ b/mysql-test/suite/funcs_1/t/is_columns_is.test @@ -17,8 +17,6 @@ --source include/not_embedded.inc # This test depends on having the PBXT information_schema stuff. ---source include/have_pbxt.inc ---source include/have_innodb.inc --source include/have_xtradb.inc let $my_where = WHERE table_schema = 'information_schema' diff --git a/mysql-test/suite/rpl/t/rpl_drop_temp.test b/mysql-test/suite/rpl/t/rpl_drop_temp.test index 641813070ca..08227c18fea 100644 --- a/mysql-test/suite/rpl/t/rpl_drop_temp.test +++ b/mysql-test/suite/rpl/t/rpl_drop_temp.test @@ -5,8 +5,8 @@ # Purpose: According to TU in 16552 This is how # to work around NDB's issue with temp tables ############################################## -source include/master-slave.inc; source include/have_binlog_format_mixed_or_statement.inc; +source include/master-slave.inc; --disable_warnings create database if not exists mysqltest; diff --git a/mysql-test/suite/rpl/t/rpl_stop_slave.test b/mysql-test/suite/rpl/t/rpl_stop_slave.test index b0eeb29bad5..f292f3b747a 100644 --- a/mysql-test/suite/rpl/t/rpl_stop_slave.test +++ b/mysql-test/suite/rpl/t/rpl_stop_slave.test @@ -1,8 +1,8 @@ -source include/master-slave.inc; source include/have_innodb.inc; source include/have_debug.inc; source include/have_debug_sync.inc; source include/have_binlog_format_mixed_or_statement.inc; +source include/master-slave.inc; --echo --echo # BUG#56118 STOP SLAVE does not wait till trx with CREATE TMP TABLE ends diff --git a/mysql-test/suite/rpl/t/rpl_variables_stm.test b/mysql-test/suite/rpl/t/rpl_variables_stm.test index 8943585bc1d..29362bab2c1 100644 --- a/mysql-test/suite/rpl/t/rpl_variables_stm.test +++ b/mysql-test/suite/rpl/t/rpl_variables_stm.test @@ -52,8 +52,8 @@ # safely in statement mode are replicated correctly in mixed or row # mode. -source include/master-slave.inc; source include/have_binlog_format_mixed_or_statement.inc; +source include/master-slave.inc; call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT"); diff --git a/mysql-test/suite/vcol/t/vcol_partition_innodb.test b/mysql-test/suite/vcol/t/vcol_partition_innodb.test index 47f1581fc96..ab90bbf303a 100644 --- a/mysql-test/suite/vcol/t/vcol_partition_innodb.test +++ b/mysql-test/suite/vcol/t/vcol_partition_innodb.test @@ -13,7 +13,6 @@ # Change Date: # # Change: # ################################################################################ ---source include/have_partition.inc # # NOTE: PLEASE DO NOT ADD NOT MYISAM SPECIFIC TESTCASES HERE ! @@ -23,11 +22,11 @@ #------------------------------------------------------------------------------# # General not engine specific settings and requirements ---source suite/vcol/inc/vcol_init_vars.pre +--source inc/vcol_init_vars.pre #------------------------------------------------------------------------------# # Cleanup ---source suite/vcol/inc/vcol_cleanup.inc +--source inc/vcol_cleanup.inc #------------------------------------------------------------------------------# # Engine specific settings and requirements @@ -42,11 +41,11 @@ eval SET @@session.storage_engine = 'InnoDB'; #------------------------------------------------------------------------------# # Execute the tests to be applied to all storage engines ---source suite/vcol/inc/vcol_partition.inc +--source inc/vcol_partition.inc #------------------------------------------------------------------------------# # Execute storage engine specific tests #------------------------------------------------------------------------------# # Cleanup ---source suite/vcol/inc/vcol_cleanup.inc +--source inc/vcol_cleanup.inc diff --git a/mysql-test/t/information_schema_all_engines.test b/mysql-test/t/information_schema_all_engines.test index 7c2bd44f31f..a5400e8287a 100644 --- a/mysql-test/t/information_schema_all_engines.test +++ b/mysql-test/t/information_schema_all_engines.test @@ -3,7 +3,6 @@ # available (since these engines inject tables into INFORMATION_SCHEMA). --source include/not_embedded.inc ---source include/have_pbxt.inc --source include/have_xtradb.inc --source include/not_staging.inc diff --git a/mysql-test/t/merge_debug.test b/mysql-test/t/merge_debug.test index 78c91ec8f25..e147946b394 100644 --- a/mysql-test/t/merge_debug.test +++ b/mysql-test/t/merge_debug.test @@ -4,7 +4,7 @@ --source include/have_debug.inc -let $default=`select @@global.storage_engine`; +set @default_storage_engine= @@global.storage_engine; set global storage_engine=myisam; set session storage_engine=myisam; @@ -40,3 +40,5 @@ INSERT INTO t3 VALUES (31); UNLOCK TABLES; DROP TRIGGER t1_ai; DROP TABLE t4,crashed,t2,t3; + +set global storage_engine=@default_storage_engine; |