1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Post-merge patch for extra/rpl_test/rpl_log.test:

Browse Source 
Remove size of binlog file from SHOW BINARY LOGS. 
Changing size of binlog file is an affect of adding or removing events to/from
binlog and it can be checked in next command of test: SHOW BINLOG EVENTS.
For SHOW BINARY LOGS statement enough to show the list of file names.
This commit is contained in:
Serge Kozlov 2009-02-02 14:44:18 +03:00
parent f21af1060e
commit 01e368d1f6
5 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/extra/rpl_tests/rpl_log.test
View File

@ -71,6 +71,7 @@ connection master;
select * from t1 order by 1 asc; select * from t1 order by 1 asc;
sync_slave_with_master; sync_slave_with_master;
#check t1 on slave to ensure whether it's identical with on master #check t1 on slave to ensure whether it's identical with on master
select * from t1 order by 1 asc; select * from t1 order by 1 asc;
flush logs; flush logs;
@ -88,9 +89,11 @@ source include/show_binlog_events.inc;
--replace_column 2 # 5 # --replace_column 2 # 5 #
--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/ --replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/
show binlog events in 'master-bin.000002'; show binlog events in 'master-bin.000002';
--replace_column 2 #
show binary logs; show binary logs;
sync_slave_with_master; sync_slave_with_master;
--source include/wait_for_slave_to_start.inc --source include/wait_for_slave_to_start.inc
--replace_column 2 #
show binary logs; show binary logs;
--replace_result $MASTER_MYPORT MASTER_PORT $VERSION VERSION --replace_result $MASTER_MYPORT MASTER_PORT $VERSION VERSION
--replace_column 2 # 5 # --replace_column 2 # 5 #

8
mysql-test/suite/rpl/r/rpl_row_log.result
View File

@ -214,12 +214,12 @@ master-bin.000002 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000002 # Query 1 # use `test`; COMMIT master-bin.000002 # Query 1 # use `test`; COMMIT
show binary logs; show binary logs;
Log_name File_size Log_name File_size
master-bin.000001 1540 master-bin.000001 #
master-bin.000002 516 master-bin.000002 #
show binary logs; show binary logs;
Log_name File_size Log_name File_size
slave-bin.000001 1638 slave-bin.000001 #
slave-bin.000002 417 slave-bin.000002 #
show binlog events in 'slave-bin.000001' from 4; show binlog events in 'slave-bin.000001' from 4;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
slave-bin.000001 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 slave-bin.000001 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4

8
mysql-test/suite/rpl/r/rpl_row_log_innodb.result
View File

@ -214,12 +214,12 @@ master-bin.000002 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000002 # Xid 1 # COMMIT /* XID */ master-bin.000002 # Xid 1 # COMMIT /* XID */
show binary logs; show binary logs;
Log_name File_size Log_name File_size
master-bin.000001 1456 master-bin.000001 #
master-bin.000002 474 master-bin.000002 #
show binary logs; show binary logs;
Log_name File_size Log_name File_size
slave-bin.000001 1536 slave-bin.000001 #
slave-bin.000002 366 slave-bin.000002 #
show binlog events in 'slave-bin.000001' from 4; show binlog events in 'slave-bin.000001' from 4;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
slave-bin.000001 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 slave-bin.000001 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4

8
mysql-test/suite/rpl/r/rpl_stm_log.result
View File

@ -203,12 +203,12 @@ master-bin.000002 # Query 1 # use `test`; create table t2 (n int)ENGINE=MyISAM
master-bin.000002 # Query 1 # use `test`; insert into t2 values (1) master-bin.000002 # Query 1 # use `test`; insert into t2 values (1)
show binary logs; show binary logs;
Log_name File_size Log_name File_size
master-bin.000001 1347 master-bin.000001 #
master-bin.000002 392 master-bin.000002 #
show binary logs; show binary logs;
Log_name File_size Log_name File_size
slave-bin.000001 1450 slave-bin.000001 #
slave-bin.000002 293 slave-bin.000002 #
show binlog events in 'slave-bin.000001' from 4; show binlog events in 'slave-bin.000001' from 4;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
slave-bin.000001 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 slave-bin.000001 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4

8
mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result
View File

@ -224,12 +224,12 @@ master-bin.000002 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000002 # Query 1 # COMMIT master-bin.000002 # Query 1 # COMMIT
show binary logs; show binary logs;
Log_name File_size Log_name File_size
master-bin.000001 1760 master-bin.000001 #
master-bin.000002 623 master-bin.000002 #
show binary logs; show binary logs;
Log_name File_size Log_name File_size
slave-bin.000001 1855 slave-bin.000001 #
slave-bin.000002 202 slave-bin.000002 #
show binlog events in 'slave-bin.000001' from 4; show binlog events in 'slave-bin.000001' from 4;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
slave-bin.000001 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 slave-bin.000001 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4