Commit 60cca234 authored by Chad MILLER's avatar Chad MILLER
Browse files

Bug#37312: Make test binlog_{row,stm}_innodb_stat more robust 

The size of the Innodb_buffer_pool_pages differs by one byte on row versus statement
log, so neuter the last position of the stringified decimal representation.  Innobase
says the size isn't very important in any case.

Also, split out the "mixed" format to its own file, as mtr seems to dislike having only 
stm and row but not mix.
parent 1ac6fb4b

mysql-test/extra/binlog_tests/innodb_stat.test

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 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";

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

0 → 100644
+39 −0
Original line number Diff line number Diff line 
show status like "binlog_cache_use";

Variable_name	Value

Binlog_cache_use	0

show status like "binlog_cache_disk_use";

Variable_name	Value

Binlog_cache_disk_use	0

drop table if exists t1;

create table t1 (a int) engine=innodb;

show status like "binlog_cache_use";

Variable_name	Value

Binlog_cache_use	1

show status like "binlog_cache_disk_use";

Variable_name	Value

Binlog_cache_disk_use	1

begin;

delete from t1;

commit;

show status like "binlog_cache_use";

Variable_name	Value

Binlog_cache_use	2

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 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ Binlog_cache_disk_use 1 
drop table t1;

show status like "Innodb_buffer_pool_pages_total";

Variable_name	Value

Innodb_buffer_pool_pages_total	512

Innodb_buffer_pool_pages_total	51_

show status like "Innodb_page_size";

Variable_name	Value

Innodb_page_size	16384

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

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ Binlog_cache_disk_use 1 
drop table t1;

show status like "Innodb_buffer_pool_pages_total";

Variable_name	Value

Innodb_buffer_pool_pages_total	512

Innodb_buffer_pool_pages_total	51_

show status like "Innodb_page_size";

Variable_name	Value

Innodb_page_size	16384

mysql-test/suite/binlog/t/binlog_mix_innodb_stat.test

0 → 100644
+5 −0
Original line number Diff line number Diff line 
# This is a wrapper for binlog.test so that the same test case can be used 

# For both statement and row based bin logs 9/19/2005 [jbm]



-- source include/have_binlog_format_mixed.inc

-- source extra/binlog_tests/innodb_stat.test