MDEV-12121: Revert test adjustments for -DWITH_INNODB_AHI=OFF

Because the default build configuration of the server will remain
at -DWITH_INNODB_AHI=ON, we want to test the instrumentation.

We make and revert the test adjustments in separate commits on purpose,
so that this commit can be easily reverted later if the default
build configuration is changed to -DWITH_INNODB_AHI=OFF.

3 files changed, 14 insertions, 13 deletions

diff --git a/mysql-test/suite/innodb/t/innodb_information_schema.test b/mysql-test/suite/innodb/t/innodb_information_schema.test
index 375348efdd0..da7ee016f29 100644
--- a/mysql-test/suite/innodb/t/innodb_information_schema.test
+++ b/mysql-test/suite/innodb/t/innodb_information_schema.test
@@ -17,6 +17,10 @@
 
 SET storage_engine=InnoDB;
 
+-- disable_warnings
+DROP TABLE IF EXISTS t_min, t_max;
+-- enable_warnings
+
 let $table_def =
 (
 	c01 TINYINT,
@@ -178,13 +182,13 @@ DROP TABLE t_min, t_max, ```t'\"_str`;
 # INFORMATION_SCHEMA.INNODB_TRX
 #
 
-CREATE TABLE t1 LIKE INFORMATION_SCHEMA.INNODB_TRX;
--- error 0,ER_CANT_DROP_FIELD_OR_KEY
-ALTER TABLE t1 DROP COLUMN trx_adaptive_hash_latched;
 -- enable_result_log
-DESCRIBE t1;
+DESCRIBE INFORMATION_SCHEMA.INNODB_TRX;
 -- disable_result_log
-DROP TABLE t1;
+
+-- disable_warnings
+DROP TABLE IF EXISTS t1;
+-- enable_warnings
 
 CREATE TABLE t1 (
 	c01 INT,
diff --git a/mysql-test/suite/innodb/t/innodb_skip_innodb_is_tables.test b/mysql-test/suite/innodb/t/innodb_skip_innodb_is_tables.test
index 812dcc60477..01ced047302 100644
--- a/mysql-test/suite/innodb/t/innodb_skip_innodb_is_tables.test
+++ b/mysql-test/suite/innodb/t/innodb_skip_innodb_is_tables.test
@@ -1,6 +1,6 @@
 --source include/not_embedded.inc
 
-select count(*) from information_schema.innodb_trx;
+select * from information_schema.innodb_trx;
 select * from information_schema.innodb_locks;
 select * from information_schema.innodb_lock_waits;
 select * from information_schema.innodb_cmp;
@@ -9,16 +9,15 @@ select * from information_schema.innodb_cmp_per_index;
 select * from information_schema.innodb_cmp_per_index_reset;
 select * from information_schema.innodb_cmpmem;
 select * from information_schema.innodb_cmpmem_reset;
-select * from information_schema.innodb_metrics
-WHERE name NOT LIKE 'adaptive_hash_%';
+select * from information_schema.innodb_metrics;
 select * from information_schema.innodb_ft_default_stopword;
 select * from information_schema.innodb_ft_deleted;
 select * from information_schema.innodb_ft_being_deleted;
 select * from information_schema.innodb_ft_index_cache;
 select * from information_schema.innodb_ft_index_table;
 select * from information_schema.innodb_ft_config;
-select count(*) from information_schema.innodb_buffer_page;
-select count(*) from information_schema.innodb_buffer_page_lru;
+select * from information_schema.innodb_buffer_page;
+select * from information_schema.innodb_buffer_page_lru;
 --error 0,1109
 select * from information_schema.innodb_buffer_stats;
 select * from information_schema.innodb_sys_tables;
diff --git a/mysql-test/suite/innodb/t/monitor.test b/mysql-test/suite/innodb/t/monitor.test
index da33a720839..98aa4505e34 100644
--- a/mysql-test/suite/innodb/t/monitor.test
+++ b/mysql-test/suite/innodb/t/monitor.test
@@ -8,9 +8,7 @@
 set global innodb_monitor_disable = All;
 # Test turn on/off the monitor counter  with "all" option
 # By default, they will be off.
-# Skip the adaptive_hash fields, because they depend on WITH_INNODB_AHI.
-select name, status from information_schema.innodb_metrics
-where name NOT LIKE 'adaptive_hash_%';
+select name, status from information_schema.innodb_metrics;
 
 # Turn on all monitor counters
 set global innodb_monitor_enable = all;