MDEV-8683: Bunch of tests fail in buildbot on new InnoDB variables

MariaDB · Aug 26, 2015 · c0b7bf2 · c0b7bf2
1 parent 3ed384b
commit c0b7bf2
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 0 deletions.
diff --git a/mysql-test/suite/innodb/r/innodb_monitor.result b/mysql-test/suite/innodb/r/innodb_monitor.result
@@ -215,6 +215,8 @@ innodb_log_flush_usec	disabled
 innodb_mem_validate_usec	disabled
 innodb_master_purge_usec	disabled
 innodb_dict_lru_usec	disabled
+innodb_dict_lru_count_active	disabled
+innodb_dict_lru_count_idle	disabled
 innodb_checkpoint_usec	disabled
 innodb_dblwr_writes	disabled
 innodb_dblwr_pages_written	disabled

diff --git a/mysql-test/suite/innodb/r/innodb_skip_innodb_is_tables.result b/mysql-test/suite/innodb/r/innodb_skip_innodb_is_tables.result
@@ -250,6 +250,8 @@ innodb_log_flush_usec	server	0	NULL	NULL	NULL	0	NULL	NULL	NULL	NULL	NULL	NULL	NU
 innodb_mem_validate_usec	server	0	NULL	NULL	NULL	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	disabled	counter	Time (in microseconds) spent to do memory validation
 innodb_master_purge_usec	server	0	NULL	NULL	NULL	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	disabled	counter	Time (in microseconds) spent by master thread to purge records
 innodb_dict_lru_usec	server	0	NULL	NULL	NULL	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	disabled	counter	Time (in microseconds) spent to process DICT LRU list
+innodb_dict_lru_count_active	server	0	NULL	NULL	NULL	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	disabled	counter	Number of tables evicted from DICT LRU list in the active loop
+innodb_dict_lru_count_idle	server	0	NULL	NULL	NULL	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	disabled	counter	Number of tables evicted from DICT LRU list in the idle loop
 innodb_checkpoint_usec	server	0	NULL	NULL	NULL	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	disabled	counter	Time (in microseconds) spent by master thread to do checkpoint
 innodb_dblwr_writes	server	0	NULL	NULL	NULL	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	disabled	status_counter	Number of doublewrite operations that have been performed (innodb_dblwr_writes)
 innodb_dblwr_pages_written	server	0	NULL	NULL	NULL	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	disabled	status_counter	Number of pages that have been written for doublewrite operations (innodb_dblwr_pages_written)

diff --git a/mysql-test/suite/sys_vars/r/innodb_monitor_disable_basic.result b/mysql-test/suite/sys_vars/r/innodb_monitor_disable_basic.result
@@ -215,6 +215,8 @@ innodb_log_flush_usec	disabled
 innodb_mem_validate_usec	disabled
 innodb_master_purge_usec	disabled
 innodb_dict_lru_usec	disabled
+innodb_dict_lru_count_active	disabled
+innodb_dict_lru_count_idle	disabled
 innodb_checkpoint_usec	disabled
 innodb_dblwr_writes	disabled
 innodb_dblwr_pages_written	disabled

diff --git a/mysql-test/suite/sys_vars/r/innodb_monitor_enable_basic.result b/mysql-test/suite/sys_vars/r/innodb_monitor_enable_basic.result
@@ -215,6 +215,8 @@ innodb_log_flush_usec	disabled
 innodb_mem_validate_usec	disabled
 innodb_master_purge_usec	disabled
 innodb_dict_lru_usec	disabled
+innodb_dict_lru_count_active	disabled
+innodb_dict_lru_count_idle	disabled
 innodb_checkpoint_usec	disabled
 innodb_dblwr_writes	disabled
 innodb_dblwr_pages_written	disabled

diff --git a/mysql-test/suite/sys_vars/r/innodb_monitor_reset_all_basic.result b/mysql-test/suite/sys_vars/r/innodb_monitor_reset_all_basic.result
@@ -215,6 +215,8 @@ innodb_log_flush_usec	disabled
 innodb_mem_validate_usec	disabled
 innodb_master_purge_usec	disabled
 innodb_dict_lru_usec	disabled
+innodb_dict_lru_count_active	disabled
+innodb_dict_lru_count_idle	disabled
 innodb_checkpoint_usec	disabled
 innodb_dblwr_writes	disabled
 innodb_dblwr_pages_written	disabled

diff --git a/mysql-test/suite/sys_vars/r/innodb_monitor_reset_basic.result b/mysql-test/suite/sys_vars/r/innodb_monitor_reset_basic.result
@@ -215,6 +215,8 @@ innodb_log_flush_usec	disabled
 innodb_mem_validate_usec	disabled
 innodb_master_purge_usec	disabled
 innodb_dict_lru_usec	disabled
+innodb_dict_lru_count_active	disabled
+innodb_dict_lru_count_idle	disabled
 innodb_checkpoint_usec	disabled
 innodb_dblwr_writes	disabled
 innodb_dblwr_pages_written	disabled