diff options
Diffstat (limited to 'mysql-test/suite/innodb/t')
| -rw-r--r-- | mysql-test/suite/innodb/t/alter_copy.test | 2 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/t/innodb-analyze.test | 32 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/t/innodb-stats-sample.test | 32 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/t/innodb-wl5522.test | 5 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/t/innodb_bug12400341-master.opt | 2 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/t/innodb_bug12400341.test | 5 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/t/innodb_bug53674-master.opt | 2 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1.test | 16 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/t/log_file_name.test | 1 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/t/monitor.test | 91 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/t/recovery_shutdown.test | 3 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/t/undo_truncate.test | 3 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/t/undo_truncate_recover.test | 1 |
13 files changed, 100 insertions, 95 deletions
diff --git a/mysql-test/suite/innodb/t/alter_copy.test b/mysql-test/suite/innodb/t/alter_copy.test index b7ab05a061a..e85b94d467f 100644 --- a/mysql-test/suite/innodb/t/alter_copy.test +++ b/mysql-test/suite/innodb/t/alter_copy.test @@ -2,6 +2,8 @@ --source include/have_debug.inc --source include/have_debug_sync.inc --source include/not_embedded.inc +# Valgrind gives leaks from the first shutdown which confuses mtr +#--source include/not_valgrind.inc --echo # --echo # MDEV-11415 AVOID INTERMEDIATE COMMIT WHILE DOING diff --git a/mysql-test/suite/innodb/t/innodb-analyze.test b/mysql-test/suite/innodb/t/innodb-analyze.test index 0fec9968c1f..db699ad41a0 100644 --- a/mysql-test/suite/innodb/t/innodb-analyze.test +++ b/mysql-test/suite/innodb/t/innodb-analyze.test @@ -1,21 +1,17 @@ --source include/have_innodb.inc # # Test that mysqld does not crash when running ANALYZE TABLE with -# different values of the parameter innodb_stats_sample_pages. +# different values of the parameter innodb_stats_transient_sample_pages. # # we care only that the following SQL commands do not produce errors # and do not crash the server -- disable_query_log --- disable_result_log -- enable_warnings -let $sample_pages=`select @@innodb_stats_sample_pages`; -SET GLOBAL innodb_stats_sample_pages=0; - -# check that the value has been adjusted to 1 --- enable_result_log -SHOW VARIABLES LIKE 'innodb_stats_sample_pages'; +SET @save_sample_pages = @@GLOBAL.innodb_stats_transient_sample_pages; +SET GLOBAL innodb_stats_transient_sample_pages=0; +SHOW VARIABLES LIKE 'innodb_stats_transient_sample_pages'; -- disable_result_log CREATE TABLE innodb_analyze ( @@ -29,36 +25,36 @@ CREATE TABLE innodb_analyze ( ANALYZE TABLE innodb_analyze; -SET GLOBAL innodb_stats_sample_pages=2; +SET GLOBAL innodb_stats_transient_sample_pages=2; ANALYZE TABLE innodb_analyze; -SET GLOBAL innodb_stats_sample_pages=4; +SET GLOBAL innodb_stats_transient_sample_pages=4; ANALYZE TABLE innodb_analyze; -SET GLOBAL innodb_stats_sample_pages=8; +SET GLOBAL innodb_stats_transient_sample_pages=8; ANALYZE TABLE innodb_analyze; -SET GLOBAL innodb_stats_sample_pages=16; +SET GLOBAL innodb_stats_transient_sample_pages=16; ANALYZE TABLE innodb_analyze; INSERT INTO innodb_analyze VALUES (1,1), (1,1), (1,2), (1,3), (1,4), (1,5), (8,1), (8,8), (8,2), (7,1), (1,4), (3,5); -SET GLOBAL innodb_stats_sample_pages=1; +SET GLOBAL innodb_stats_transient_sample_pages=1; ANALYZE TABLE innodb_analyze; -SET GLOBAL innodb_stats_sample_pages=2; +SET GLOBAL innodb_stats_transient_sample_pages=2; ANALYZE TABLE innodb_analyze; -SET GLOBAL innodb_stats_sample_pages=4; +SET GLOBAL innodb_stats_transient_sample_pages=4; ANALYZE TABLE innodb_analyze; -SET GLOBAL innodb_stats_sample_pages=8; +SET GLOBAL innodb_stats_transient_sample_pages=8; ANALYZE TABLE innodb_analyze; -SET GLOBAL innodb_stats_sample_pages=16; +SET GLOBAL innodb_stats_transient_sample_pages=16; ANALYZE TABLE innodb_analyze; DROP TABLE innodb_analyze; -EVAL SET GLOBAL innodb_stats_sample_pages=$sample_pages; +SET GLOBAL innodb_stats_transient_sample_pages = @save_sample_pages; diff --git a/mysql-test/suite/innodb/t/innodb-stats-sample.test b/mysql-test/suite/innodb/t/innodb-stats-sample.test index 35d35bfa382..600688ab98d 100644 --- a/mysql-test/suite/innodb/t/innodb-stats-sample.test +++ b/mysql-test/suite/innodb/t/innodb-stats-sample.test @@ -1,24 +1,20 @@ --source include/have_innodb.inc # # Test that mysqld does not crash when running ANALYZE TABLE with -# different values of the parameter innodb_stats_sample_pages. +# different values of the parameter innodb_stats_transient_sample_pages. # # we care only that the following SQL commands do not produce errors # and do not crash the server -- disable_query_log --- disable_result_log -- enable_warnings -let $sample_pages=`select @@innodb_stats_sample_pages`; -let $traditional=`select @@innodb_stats_traditional`; -SET GLOBAL innodb_stats_sample_pages=0; +SET @save_sample_pages = @@GLOBAL.innodb_stats_transient_sample_pages; +SET @save_traditional = @@GLOBAL.innodb_stats_traditional; +SET GLOBAL innodb_stats_transient_sample_pages=0; #use new method to calculate statistics SET GLOBAL innodb_stats_traditional=0; - -# check that the value has been adjusted to 1 --- enable_result_log -SHOW VARIABLES LIKE 'innodb_stats_sample_pages'; +SHOW VARIABLES LIKE 'innodb_stats_transient_sample_pages'; SHOW VARIABLES LIKE 'innodb_stats_traditional'; -- disable_result_log @@ -33,13 +29,13 @@ CREATE TABLE innodb_analyze ( # test with empty table ANALYZE TABLE innodb_analyze; -SET GLOBAL innodb_stats_sample_pages=2; +SET GLOBAL innodb_stats_transient_sample_pages=2; ANALYZE TABLE innodb_analyze; -SET GLOBAL innodb_stats_sample_pages=1; +SET GLOBAL innodb_stats_transient_sample_pages=1; ANALYZE TABLE innodb_analyze; -SET GLOBAL innodb_stats_sample_pages=8000; +SET GLOBAL innodb_stats_transient_sample_pages=8000; ANALYZE TABLE innodb_analyze; delimiter //; @@ -60,19 +56,19 @@ call innodb_insert_proc(7000); commit; set autocommit=1; -SET GLOBAL innodb_stats_sample_pages=1; +SET GLOBAL innodb_stats_transient_sample_pages=1; ANALYZE TABLE innodb_analyze; -SET GLOBAL innodb_stats_sample_pages=8; +SET GLOBAL innodb_stats_transient_sample_pages=8; ANALYZE TABLE innodb_analyze; -SET GLOBAL innodb_stats_sample_pages=16; +SET GLOBAL innodb_stats_transient_sample_pages=16; ANALYZE TABLE innodb_analyze; -SET GLOBAL innodb_stats_sample_pages=8000; +SET GLOBAL innodb_stats_transient_sample_pages=8000; ANALYZE TABLE innodb_analyze; DROP PROCEDURE innodb_insert_proc; DROP TABLE innodb_analyze; -EVAL SET GLOBAL innodb_stats_sample_pages=$sample_pages; -EVAL SET GLOBAL innodb_stats_traditional=$traditional;
\ No newline at end of file +SET GLOBAL innodb_stats_transient_sample_pages = @save_sample_pages; +SET GLOBAL innodb_stats_traditional = @save_traditional; diff --git a/mysql-test/suite/innodb/t/innodb-wl5522.test b/mysql-test/suite/innodb/t/innodb-wl5522.test index 744768a1d6c..e17ccf24fa6 100644 --- a/mysql-test/suite/innodb/t/innodb-wl5522.test +++ b/mysql-test/suite/innodb/t/innodb-wl5522.test @@ -312,8 +312,11 @@ EOF # This is really a name mismatch error, need better error codes. -- error ER_TABLE_SCHEMA_MISMATCH ALTER TABLE t1 IMPORT TABLESPACE; - +--error ER_TABLESPACE_DISCARDED +select count(*) from t1; ALTER TABLE t1 DROP INDEX x; +--error ER_CANT_DROP_FIELD_OR_KEY +ALTER TABLE t1 DROP INDEX x, ALGORITHM=copy; ALTER TABLE t1 ADD INDEX idx(c2); perl; diff --git a/mysql-test/suite/innodb/t/innodb_bug12400341-master.opt b/mysql-test/suite/innodb/t/innodb_bug12400341-master.opt index 13f480704f5..9f65e8b12e4 100644 --- a/mysql-test/suite/innodb/t/innodb_bug12400341-master.opt +++ b/mysql-test/suite/innodb/t/innodb_bug12400341-master.opt @@ -1 +1 @@ ---max_connections=64 --innodb_thread_concurrency=0 --innodb_file_per_table --innodb_rollback_segments=2 +--max_connections=64 --innodb_thread_concurrency=0 diff --git a/mysql-test/suite/innodb/t/innodb_bug12400341.test b/mysql-test/suite/innodb/t/innodb_bug12400341.test index 5fb0d63ebe7..3b5fd18a456 100644 --- a/mysql-test/suite/innodb/t/innodb_bug12400341.test +++ b/mysql-test/suite/innodb/t/innodb_bug12400341.test @@ -18,9 +18,6 @@ set @old_innodb_trx_rseg_n_slots_debug = @@innodb_trx_rseg_n_slots_debug; set global innodb_trx_rseg_n_slots_debug = 32; --enable_query_log -set @old_innodb_undo_logs = @@innodb_undo_logs; -set global innodb_undo_logs=1; - show variables like "max_connections"; show variables like "innodb_thread_concurrency"; show variables like "innodb_file_per_table"; @@ -105,8 +102,6 @@ while ($c) # drop database mysqltest; -set global innodb_undo_logs = @old_innodb_undo_logs; - --disable_query_log set global innodb_trx_rseg_n_slots_debug = @old_innodb_trx_rseg_n_slots_debug; --enable_query_log diff --git a/mysql-test/suite/innodb/t/innodb_bug53674-master.opt b/mysql-test/suite/innodb/t/innodb_bug53674-master.opt index 1fe48c3a33a..01cf3e0520f 100644 --- a/mysql-test/suite/innodb/t/innodb_bug53674-master.opt +++ b/mysql-test/suite/innodb/t/innodb_bug53674-master.opt @@ -1 +1 @@ ---loose-innodb-locks-unsafe-for-binlog --binlog-format=mixed +--binlog-format=mixed diff --git a/mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1.test b/mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1.test index 23e8b40b010..ea31d4a14c5 100644 --- a/mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1.test +++ b/mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1.test @@ -49,9 +49,6 @@ DROP TABLE t2, t1; --echo # Bug#46539 Various crashes on INSERT IGNORE SELECT + SELECT --echo # FOR UPDATE --echo # ---disable_warnings -drop table if exists t1; ---enable_warnings create table t1 (a int primary key auto_increment, b int, index(b)) engine=innodb; insert into t1 (b) values (1), (2), (3), (4), (5), (6), (7), (8), (9), (10); @@ -107,21 +104,12 @@ drop table t1, t2; --echo # --echo # Bug#41756 Strange error messages about locks from InnoDB --echo # ---disable_warnings -drop table if exists t1; ---enable_warnings ---echo # In the default transaction isolation mode, and/or with ---echo # innodb_locks_unsafe_for_binlog=OFF, handler::unlock_row() ---echo # in InnoDB does nothing. +--echo # In the default transaction isolation mode, +--echo # handler::unlock_row() in InnoDB does nothing. --echo # Thus in order to reproduce the condition that led to the --echo # warning, one needs to relax isolation by either --echo # setting a weaker tx_isolation value, or by turning on --echo # the unsafe replication switch. ---echo # For testing purposes, choose to tweak the isolation level, ---echo # since it's settable at runtime, unlike ---echo # innodb_locks_unsafe_for_binlog, which is ---echo # only a command-line switch. ---echo # set @@session.tx_isolation="read-committed"; --echo # Prepare data. We need a table with a unique index, diff --git a/mysql-test/suite/innodb/t/log_file_name.test b/mysql-test/suite/innodb/t/log_file_name.test index 9df1c6eed5a..3e1099ac8df 100644 --- a/mysql-test/suite/innodb/t/log_file_name.test +++ b/mysql-test/suite/innodb/t/log_file_name.test @@ -2,6 +2,7 @@ # Test the detection of duplicate tablespaces. --source include/have_innodb.inc +--source include/not_valgrind.inc # Embedded server does not support crashing --source include/not_embedded.inc diff --git a/mysql-test/suite/innodb/t/monitor.test b/mysql-test/suite/innodb/t/monitor.test index 3535c9c85ad..10a0219767d 100644 --- a/mysql-test/suite/innodb/t/monitor.test +++ b/mysql-test/suite/innodb/t/monitor.test @@ -8,13 +8,14 @@ set global innodb_monitor_disable = All; # Test turn on/off the monitor counter with "all" option # By default, they will be off. -select name, status from information_schema.innodb_metrics; +select name, if(enabled,'enabled','disabled') status +from information_schema.innodb_metrics; # Turn on all monitor counters set global innodb_monitor_enable = all; # status should all change to "enabled" -select name from information_schema.innodb_metrics where status!='enabled'; +select name from information_schema.innodb_metrics where not enabled; # Test wrong argument to the global configure option --error ER_WRONG_VALUE_FOR_VAR @@ -32,7 +33,7 @@ set global innodb_monitor_enable = aaa; set global innodb_monitor_disable = All; # status should all change to "disabled" -select name from information_schema.innodb_metrics where status!='disabled'; +select name from information_schema.innodb_metrics where enabled; # Reset all counter values set global innodb_monitor_reset_all = all; @@ -45,13 +46,14 @@ set global innodb_monitor_enable = "%lock%"; # All lock related counter should be enabled select name from information_schema.innodb_metrics -where status != IF(name like "%lock%", 'enabled', 'disabled'); +where enabled != (name like "%lock%"); # Disable them set global innodb_monitor_disable = "%lock%"; # All lock related counter should be disabled -select name, status from information_schema.innodb_metrics +select name, if(enabled,'enabled','disabled') status +from information_schema.innodb_metrics where name like "%lock%"; # No match for "%lock*" @@ -61,29 +63,29 @@ set global innodb_monitor_enable = "%lock*"; # All counters will be turned on with wildcard match string with all "%" set global innodb_monitor_enable="%%%%%%%%%%%%%%%%%%%%%%%%%%%"; -select name from information_schema.innodb_metrics where status!='enabled'; +select name from information_schema.innodb_metrics where not enabled; # Turn off all counters set global innodb_monitor_disable="%%%%%"; -select name from information_schema.innodb_metrics where status!='disabled'; +select name from information_schema.innodb_metrics where enabled; # One more round testing. All counters will be turned on with # single wildcard character "%" set global innodb_monitor_enable="%"; -select name from information_schema.innodb_metrics where status!='enabled'; +select name from information_schema.innodb_metrics where not enabled; # Turn off all the counters with "%_%" set global innodb_monitor_disable="%_%"; -select name from information_schema.innodb_metrics where status!='disabled'; +select name from information_schema.innodb_metrics where enabled; # Turn on all counters start with "log" set global innodb_monitor_enable="log%%%%"; select name from information_schema.innodb_metrics -where status != IF(name like "log%", 'enabled', 'disabled'); +where enabled != (name like "log%"); # Turn on counters "os_data_fsync" with wildcard match "os_%a_fs_ncs", "_" # is single character wildcard match word @@ -93,7 +95,8 @@ set global innodb_monitor_enable="os_%a_fs_ncs"; # wildcard match "os%pending%" set global innodb_monitor_enable="os%pending%"; -select name, status from information_schema.innodb_metrics +select name, if(enabled,'enabled','disabled') status +from information_schema.innodb_metrics where name like "os%"; # Empty string is an invalid option @@ -117,7 +120,8 @@ select * from monitor_test; # "metadata_table_handles_opened" should increment by 1 select name, max_count, min_count, count, - max_count_reset, min_count_reset, count_reset, status + max_count_reset, min_count_reset, count_reset, + if(enabled,'enabled','disabled') status from information_schema.innodb_metrics where name = "metadata_table_handles_opened"; @@ -127,7 +131,8 @@ where name = "metadata_table_handles_opened"; set global innodb_monitor_reset = metadata_table_handles_opened; select name, max_count, min_count, count, - max_count_reset, min_count_reset, count_reset, status + max_count_reset, min_count_reset, count_reset, + if(enabled,'enabled','disabled') status from information_schema.innodb_metrics where name = "metadata_table_handles_opened"; @@ -141,7 +146,8 @@ select * from monitor_test; # "metadata_table_handles_opened" should increment select name, max_count, min_count, count, - max_count_reset, min_count_reset, count_reset, status + max_count_reset, min_count_reset, count_reset, + if(enabled,'enabled','disabled') status from information_schema.innodb_metrics where name = "metadata_table_handles_opened"; @@ -149,7 +155,8 @@ where name = "metadata_table_handles_opened"; set global innodb_monitor_reset_all = metadata_table_handles_opened; select name, max_count, min_count, count, - max_count_reset, min_count_reset, count_reset, status + max_count_reset, min_count_reset, count_reset, + if(enabled,'enabled','disabled') status from information_schema.innodb_metrics where name = "metadata_table_handles_opened"; @@ -160,7 +167,8 @@ set global innodb_monitor_disable = metadata_table_handles_opened; set global innodb_monitor_reset = metadata_table_handles_opened; select name, max_count, min_count, count, - max_count_reset, min_count_reset, count_reset, status + max_count_reset, min_count_reset, count_reset, + if(enabled,'enabled','disabled') status from information_schema.innodb_metrics where name = "metadata_table_handles_opened"; @@ -175,7 +183,8 @@ create table monitor_test(col int) engine = innodb; select * from monitor_test; select name, max_count, min_count, count, - max_count_reset, min_count_reset, count_reset, status + max_count_reset, min_count_reset, count_reset, + if(enabled,'enabled','disabled') status from information_schema.innodb_metrics where name = "metadata_table_handles_opened"; @@ -183,7 +192,8 @@ where name = "metadata_table_handles_opened"; set global innodb_monitor_reset_all = metadata_table_handles_opened; select name, max_count, min_count, count, - max_count_reset, min_count_reset, count_reset, status + max_count_reset, min_count_reset, count_reset, + if(enabled,'enabled','disabled') status from information_schema.innodb_metrics where name = "metadata_table_handles_opened"; @@ -201,7 +211,8 @@ select * from monitor_test; # "metadata_table_handles_opened" should increment select name, max_count, min_count, count, - max_count_reset, min_count_reset, count_reset, status + max_count_reset, min_count_reset, count_reset, + if(enabled,'enabled','disabled') status from information_schema.innodb_metrics where name = "metadata_table_handles_opened"; @@ -212,12 +223,14 @@ set global innodb_monitor_enable = metadata_table_handles_closed; create index idx on monitor_test(col); select name, max_count, min_count, count, - max_count_reset, min_count_reset, count_reset, status + max_count_reset, min_count_reset, count_reset, + if(enabled,'enabled','disabled') status from information_schema.innodb_metrics where name = "metadata_table_handles_closed"; select name, max_count, min_count, count, - max_count_reset, min_count_reset, count_reset, status + max_count_reset, min_count_reset, count_reset, + if(enabled,'enabled','disabled') status from information_schema.innodb_metrics where name like "metadata%"; @@ -227,14 +240,16 @@ set global innodb_monitor_disable = module_metadata; set global innodb_monitor_reset = module_metadata; select name, max_count, min_count, count, - max_count_reset, min_count_reset, count_reset, status + max_count_reset, min_count_reset, count_reset, + if(enabled,'enabled','disabled') status from information_schema.innodb_metrics where name like "metadata%"; set global innodb_monitor_reset_all = module_metadata; select name, max_count, min_count, count, - max_count_reset, min_count_reset, count_reset, status + max_count_reset, min_count_reset, count_reset, + if(enabled,'enabled','disabled') status from information_schema.innodb_metrics where name like "metadata%"; @@ -250,7 +265,8 @@ insert into monitor_test values(9); rollback; select name, max_count, min_count, count, - max_count_reset, min_count_reset, count_reset, status + max_count_reset, min_count_reset, count_reset, + if(enabled,'enabled','disabled') status from information_schema.innodb_metrics where name like "trx_rollbacks" or name like "trx_active_transactions"; @@ -264,14 +280,16 @@ insert into monitor_test values(9); update monitor_test set col = 10 where col = 9; select name, max_count, min_count, count, - max_count_reset, min_count_reset, count_reset, status + max_count_reset, min_count_reset, count_reset, + if(enabled,'enabled','disabled') status from information_schema.innodb_metrics where name like "dml%"; delete from monitor_test; select name, max_count, min_count, count, - max_count_reset, min_count_reset, count_reset, status + max_count_reset, min_count_reset, count_reset, + if(enabled,'enabled','disabled') status from information_schema.innodb_metrics where name like "dml%"; @@ -279,7 +297,8 @@ select name, max_count, min_count, count, set global innodb_monitor_reset = module_dml; select name, max_count, min_count, count, - max_count_reset, min_count_reset, count_reset, status + max_count_reset, min_count_reset, count_reset, + if(enabled,'enabled','disabled') status from information_schema.innodb_metrics where name like "dml%"; @@ -290,7 +309,8 @@ insert into monitor_test values(1); delete from monitor_test; select name, max_count, min_count, count, - max_count_reset, min_count_reset, count_reset, status + max_count_reset, min_count_reset, count_reset, + if(enabled,'enabled','disabled') status from information_schema.innodb_metrics where name like "dml%"; @@ -299,7 +319,8 @@ where name like "dml%"; set global innodb_monitor_reset_all = module_dml; select name, max_count, min_count, count, - max_count_reset, min_count_reset, count_reset, status + max_count_reset, min_count_reset, count_reset, + if(enabled,'enabled','disabled') status from information_schema.innodb_metrics where name like "dml%"; @@ -307,7 +328,8 @@ where name like "dml%"; set global innodb_monitor_disable = module_dml; select name, max_count, min_count, count, - max_count_reset, min_count_reset, count_reset, status + max_count_reset, min_count_reset, count_reset, + if(enabled,'enabled','disabled') status from information_schema.innodb_metrics where name like "dml%"; @@ -315,7 +337,8 @@ where name like "dml%"; set global innodb_monitor_reset_all = module_dml; select name, max_count, min_count, count, - max_count_reset, min_count_reset, count_reset, status + max_count_reset, min_count_reset, count_reset, + if(enabled,'enabled','disabled') status from information_schema.innodb_metrics where name like "dml%"; @@ -329,7 +352,8 @@ delete from monitor_test; # Only counter "dml_inserts" should be updated select name, max_count, min_count, count, - max_count_reset, min_count_reset, count_reset, status + max_count_reset, min_count_reset, count_reset, + if(enabled,'enabled','disabled') status from information_schema.innodb_metrics where name like "dml%"; @@ -342,7 +366,8 @@ set global innodb_monitor_enable = file_num_open_files; # Counters are unpredictable when innodb-file-per-table is on --replace_column 2 # 3 # 4 # 5 # 6 # 7 # select name, max_count, min_count, count, - max_count_reset, min_count_reset, count_reset, status + max_count_reset, min_count_reset, count_reset, + if(enabled,'enabled','disabled') status from information_schema.innodb_metrics where name like "file_num_open_files"; diff --git a/mysql-test/suite/innodb/t/recovery_shutdown.test b/mysql-test/suite/innodb/t/recovery_shutdown.test index d72e785f21d..d9079f2e42c 100644 --- a/mysql-test/suite/innodb/t/recovery_shutdown.test +++ b/mysql-test/suite/innodb/t/recovery_shutdown.test @@ -1,5 +1,8 @@ --source include/have_innodb.inc --source include/not_embedded.inc +# Valgrind has to be disabled as killing the server hard gives a lot of +# leak warnings +--source include/not_valgrind.inc # Flush any open myisam tables from previous tests FLUSH TABLES; diff --git a/mysql-test/suite/innodb/t/undo_truncate.test b/mysql-test/suite/innodb/t/undo_truncate.test index af6ed2b4372..b4c8e46150b 100644 --- a/mysql-test/suite/innodb/t/undo_truncate.test +++ b/mysql-test/suite/innodb/t/undo_truncate.test @@ -2,11 +2,9 @@ --source include/innodb_page_size.inc --source include/have_undo_tablespaces.inc -SET @save_undo_logs = @@GLOBAL.innodb_undo_logs; SET @save_frequency = @@GLOBAL.innodb_purge_rseg_truncate_frequency; SET @save_truncate = @@GLOBAL.innodb_undo_log_truncate; SET GLOBAL innodb_undo_log_truncate = 0; -SET GLOBAL innodb_undo_logs = 4; SET GLOBAL innodb_purge_rseg_truncate_frequency = 1; SET @trunc_start= @@ -117,6 +115,5 @@ if ($size1 == $size2) } } -SET GLOBAL innodb_undo_logs = @save_undo_logs; SET GLOBAL innodb_purge_rseg_truncate_frequency = @save_frequency; SET GLOBAL innodb_undo_log_truncate = @save_truncate; diff --git a/mysql-test/suite/innodb/t/undo_truncate_recover.test b/mysql-test/suite/innodb/t/undo_truncate_recover.test index 64b1f6f23a1..e6a873085e0 100644 --- a/mysql-test/suite/innodb/t/undo_truncate_recover.test +++ b/mysql-test/suite/innodb/t/undo_truncate_recover.test @@ -11,7 +11,6 @@ # Tests with embedded server do not support restarting --source include/not_embedded.inc -SET GLOBAL innodb_undo_logs = 4; SET GLOBAL innodb_undo_log_truncate = 1; SET GLOBAL innodb_purge_rseg_truncate_frequency = 1; |