Commit 92a3b673 authored by Patrick Crews's avatar Patrick Crews
Browse files

Bug#37312 Make tests binlog_row_innodb_stat and binlog_stm_innodb_stat more robust 

Trimmed some error-prone and variable portions of the test and added 'flush status' to ensure deterministic test
parent ba93a357

mysql-test/extra/binlog_tests/innodb_stat.test

+1 −10
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
# Actually this test has nothing to do with innodb per se, it just requires

# transactional table. 

#

flush status;

show status like "binlog_cache_use";

show status like "binlog_cache_disk_use";

--disable_warnings
@@ -38,13 +39,3 @@ commit; 
show status like "binlog_cache_use";

show status like "binlog_cache_disk_use";

drop table t1;
 


# Test for testable InnoDB status variables. This test

# uses previous ones(pages_created, rows_deleted, ...).

-- replace_regex /51[12]/51_/

show status like "Innodb_buffer_pool_pages_total";

show status like "Innodb_page_size";

show status like "Innodb_rows_deleted";

show status like "Innodb_rows_inserted";

show status like "Innodb_rows_updated";

mysql-test/suite/binlog/r/binlog_mix_innodb_stat.result

+1 −15
Original line number Diff line number Diff line 
flush status;

show status like "binlog_cache_use";

Variable_name	Value

Binlog_cache_use	0
@@ -22,18 +23,3 @@ show status like "binlog_cache_disk_use"; 
Variable_name	Value

Binlog_cache_disk_use	1

drop table t1;
 
show status like "Innodb_buffer_pool_pages_total";

Variable_name	Value

Innodb_buffer_pool_pages_total	51_

show status like "Innodb_page_size";

Variable_name	Value

Innodb_page_size	16384

show status like "Innodb_rows_deleted";

Variable_name	Value

Innodb_rows_deleted	2000

show status like "Innodb_rows_inserted";

Variable_name	Value

Innodb_rows_inserted	2000

show status like "Innodb_rows_updated";

Variable_name	Value

Innodb_rows_updated	0

mysql-test/suite/binlog/r/binlog_row_innodb_stat.result

+1 −15
Original line number Diff line number Diff line 
flush status;

show status like "binlog_cache_use";

Variable_name	Value

Binlog_cache_use	0
@@ -22,18 +23,3 @@ show status like "binlog_cache_disk_use"; 
Variable_name	Value

Binlog_cache_disk_use	1

drop table t1;
 
show status like "Innodb_buffer_pool_pages_total";

Variable_name	Value

Innodb_buffer_pool_pages_total	51_

show status like "Innodb_page_size";

Variable_name	Value

Innodb_page_size	16384

show status like "Innodb_rows_deleted";

Variable_name	Value

Innodb_rows_deleted	2000

show status like "Innodb_rows_inserted";

Variable_name	Value

Innodb_rows_inserted	2000

show status like "Innodb_rows_updated";

Variable_name	Value

Innodb_rows_updated	0

mysql-test/suite/binlog/r/binlog_stm_innodb_stat.result

+1 −15
Original line number Diff line number Diff line 
flush status;

show status like "binlog_cache_use";

Variable_name	Value

Binlog_cache_use	0
@@ -22,18 +23,3 @@ show status like "binlog_cache_disk_use"; 
Variable_name	Value

Binlog_cache_disk_use	1

drop table t1;
 
show status like "Innodb_buffer_pool_pages_total";

Variable_name	Value

Innodb_buffer_pool_pages_total	51_

show status like "Innodb_page_size";

Variable_name	Value

Innodb_page_size	16384

show status like "Innodb_rows_deleted";

Variable_name	Value

Innodb_rows_deleted	2000

show status like "Innodb_rows_inserted";

Variable_name	Value

Innodb_rows_inserted	2000

show status like "Innodb_rows_updated";

Variable_name	Value

Innodb_rows_updated	0