List:Commits« Previous MessageNext Message »
From:Luís Soares Date:January 13 2011 12:27pm
Subject:Re: bzr commit into mysql-5.5 branch (luis.soares:3238) Bug#59444
View as plain text  
And here are the changes:
http://lists.mysql.com/commits/128646

Please, approve.

Regards,
Luís Soares

On 01/13/2011 12:22 PM, Luís Soares wrote:
> Hi Sven,
>
> On 01/13/2011 10:12 AM, Sven Sandberg wrote:
>> Hi Luís,
>>
>> Thanks for this fix. Everything is good. I would suggest some additional
> refactorings though:
>> - The test case contains a lot of repetition. It would be better to use
> subroutines (i.e., inc files) for this.
>
> OK.
>
>> - It's unnecessary to insert so many rows in the table, that just makes the
> result file big.
>
> I guess I concur.
>
>> - I don't think the last part after FLUSH LOGS serves any purpose, that just
> repeats previous tests.
>
> The flush logs is needed to assert that SHOW RELAYLOG EVENTS
> works properly wrt to ordering of relay logs in the relay-log
> index file. So, we flush the logs to demonstrate that
> SHOW RELAYLOG EVENTS actually shows the contents of the first
> relay log in the index file and not the most recent relay log.
>
> This is the behavior of SHOW BINLOG EVENTS as well, thence we
> show it also.
>
> So I will not remove it.
>
> Regards,
> Luís Soares
>
>> So I think something like this would be much more succinct:
>>
>>
>> # extra/rpl_tests/rpl_show_log_events.inc
>> --let $log_type= BINLOG
>> if ($is_relay_log) {
>> --let $log_type= RELAYLOG
>> }
>> --let $args=
>> if ($binlog_file != '') {
>> --let $args= IN <FILE>
>> }
>> if ($binlog_limit) {
>> --let $args= $args LIMIT $binlog_limit
>> }
>> --echo ******** [$CURRENT_CONNECTION] SHOW $log_type EVENTS $args ********
>> --source include/show_events.inc
>>
>> # extra/rpl_tests/rpl_show_log_events_with_varying_options.inc
>> --let $binlog_limit=
>> --source extra/rpl_test/rpl_show_binlog_events.inc
>> --let $binlog_limit= 1
>> --source extra/rpl_test/rpl_show_binlog_events.inc
>> --let $binlog_limit= 1,3
>> --source extra/rpl_test/rpl_show_binlog_events.inc
>> --let $binlog_limit=
>> --let $binlog_file=
>> --source extra/rpl_test/rpl_show_binlog_events.inc
>>
>> # extra/rpl_tests/rpl_show_relaylog_events.inc
>> -- connection master
>> CREATE TABLE t1 (a INT);
>> INSERT INTO t1 VALUES (1);
>> INSERT INTO t1 VALUES (2);
>> INSERT INTO t1 VALUES (3);
>>
>> --let $is_relay_log= 0
>> --let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1)
>> --source include/rpl_show_log_events_with_varying_options.inc
>>
>> --sync_slave_with_master
>> --let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1)
>> --source include/rpl_show_log_events_with_varying_options.inc
>>
>> --let $is_relay_log= 1
>> --let $binlog_file= query_get_value(SHOW SLAVE STATUS, Relay_Log_File, 1)
>> --source include/rpl_show_log_events_with_varying_options.inc
>>
>>
>>
>> On 01/12/2011 07:35 PM, Luis Soares wrote:
>>> #At file:///home/lsoares/Workspace/bzr/work/bugfixing/59444/mysql-5.5/ based
> on
>>> revid:martin.hansson@stripped
>>>
>>> 3238 Luis Soares 2011-01-12
>>> BUG#59444: rpl_row_show_relaylog_events fails on daily-5.5 test runs
>>>
>>> The test started failing on the same day patch for BUG 49978 was
>>> pushed. BUG 49978 changed part of the replication testing
>>> infrastructure in mysql-test-run. This caused the test to fail
>>> sporadically with result differences on relay log file
>>> names. When the test fails the relay-log filenames are shifted by
>>> one, eg:
>>>
>>> -show relaylog events in 'slave-relay-bin.000002' from<binlog_start>;
>>> +show relaylog events in 'slave-relay-bin.000003' from<binlog_start>;
>>>
>>> The problem was caused by a bad cleanup when using the include
>>> files:
>>>
>>> - include/setup_fake_relay_log.inc
>>> - include/cleanup_fake_relay_log.inc
>>>
>>> Which would leave a spurious relay-log file around (not listed in
>>> slave-relay-bin.index), causing the server to shift the name of
>>> the relay logs by one, even if cleaning up with RESET SLAVE.
>>>
>>> We fix this by removing the relay-log file when it is not needed
>>> anymore, ie at setup time and after recreating the fake relay-log
>>> index.
>>>
>>> Additionally, to make the affected test more resilient, we
>>> deployed a call to rpl_reset.inc (which resets both master and
>>> slave, including log files) before actually running the test
>>> case.
>>>
>>> Finally, appart from the reported bug, we also fix: (a) an
>>> unrelated issue with the failing test itself - in some cases, the
>>> test was not setting the log file name to use when it should;
>>> (b) one typo.
>>> @ mysql-test/extra/rpl_tests/rpl_show_relaylog_events.inc
>>> Added call to rpl_reset.inc.
>>> Deployed missing instructions to get the binlog file name
>>> before including show_relaylog/binlog_events.inc
>>>
>>> modified:
>>> mysql-test/extra/rpl_tests/rpl_show_relaylog_events.inc
>>> mysql-test/include/setup_fake_relay_log.inc
>>> mysql-test/suite/rpl/r/rpl_row_show_relaylog_events.result
>>> mysql-test/suite/rpl/r/rpl_stm_mix_show_relaylog_events.result
>>> === modified file 'mysql-test/extra/rpl_tests/rpl_show_relaylog_events.inc'
>>> --- a/mysql-test/extra/rpl_tests/rpl_show_relaylog_events.inc 2010-05-26
> 14:34:25 +0000
>>> +++ b/mysql-test/extra/rpl_tests/rpl_show_relaylog_events.inc 2011-01-12
> 18:35:06 +0000
>>> @@ -1,4 +1,7 @@
>>> -- connection master
>>> +-- source include/rpl_reset.inc
>>> +
>>> +-- connection master
>>>
>>> CREATE TABLE t1 (a INT);
>>> INSERT INTO t1 VALUES (1);
>>> @@ -8,18 +11,19 @@ INSERT INTO t1 VALUES (4);
>>> INSERT INTO t1 VALUES (5);
>>> INSERT INTO t1 VALUES (6);
>>>
>>> --- echo [MASTER] ********* SOW BINLOG EVENTS IN ... *********
>>> +-- echo [MASTER] ********* SHOW BINLOG EVENTS IN ... *********
>>> +let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1);
>>> -- source include/show_binlog_events.inc
>>>
>>> --- echo [MASTER] ********* SOW BINLOG EVENTS *********
>>> +-- echo [MASTER] ********* SHOW BINLOG EVENTS *********
>>> let $binlog_file= ;
>>> -- source include/show_binlog_events.inc
>>>
>>> --- echo [MASTER] ********* SOW BINLOG EVENTS ... LIMIT rows *********
>>> +-- echo [MASTER] ********* SHOW BINLOG EVENTS ... LIMIT rows *********
>>> let $binlog_limit= 3;
>>> -- source include/show_binlog_events.inc
>>>
>>> --- echo [MASTER] ********* SOW BINLOG EVENTS ... LIMIT offset,rows
> *********
>>> +-- echo [MASTER] ********* SHOW BINLOG EVENTS ... LIMIT offset,rows
> *********
>>> let $binlog_limit= 1,4;
>>> -- source include/show_binlog_events.inc
>>>
>>> @@ -28,38 +32,39 @@ let $binlog_limit= ;
>>>
>>> -- sync_slave_with_master
>>>
>>> --- echo [SLAVE] ********* SOW BINLOG EVENTS IN ... *********
>>> +-- echo [SLAVE] ********* SHOW BINLOG EVENTS IN ... *********
>>> +let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1);
>>> -- source include/show_binlog_events.inc
>>>
>>> --- echo [SLAVE] ********* SOW BINLOG EVENTS *********
>>> +-- echo [SLAVE] ********* SHOW BINLOG EVENTS *********
>>> let $binlog_file= ;
>>> -- source include/show_binlog_events.inc
>>>
>>> --- echo [SLAVE] ********* SOW BINLOG EVENTS ... LIMIT rows *********
>>> +-- echo [SLAVE] ********* SHOW BINLOG EVENTS ... LIMIT rows *********
>>> let $binlog_limit= 3;
>>> -- source include/show_binlog_events.inc
>>>
>>> --- echo [SLAVE] ********* SOW BINLOG EVENTS ... LIMIT offset,rows *********
>>> +-- echo [SLAVE] ********* SHOW BINLOG EVENTS ... LIMIT offset,rows
> *********
>>> let $binlog_limit= 1,4;
>>> -- source include/show_binlog_events.inc
>>>
>>> # clear show_binlog_event/show_relaylog_events parameters
>>> let $binlog_limit= ;
>>>
>>> --- echo [SLAVE] ********* SOW RELAYLOG EVENTS IN ... *********
>>> +-- echo [SLAVE] ********* SHOW RELAYLOG EVENTS IN ... *********
>>> let $binlog_file= query_get_value(SHOW SLAVE STATUS, Relay_Log_File, 1);
>>> -- source include/show_relaylog_events.inc
>>>
>>> --- echo [SLAVE] ********* SOW RELAYLOG EVENTS *********
>>> +-- echo [SLAVE] ********* SHOW RELAYLOG EVENTS *********
>>> let $binlog_file= ;
>>> -- source include/show_relaylog_events.inc
>>>
>>> --- echo [MASTER] ********* SOW RELAYLOG EVENTS ... LIMIT rows *********
>>> +-- echo [MASTER] ********* SHOW RELAYLOG EVENTS ... LIMIT rows *********
>>> let $binlog_file= query_get_value(SHOW SLAVE STATUS, Relay_Log_File, 1);
>>> let $binlog_limit= 3;
>>> -- source include/show_relaylog_events.inc
>>>
>>> --- echo [MASTER] ********* SOW RELAYLOG EVENTS ... LIMIT offset,rows
> *********
>>> +-- echo [MASTER] ********* SHOW RELAYLOG EVENTS ... LIMIT offset,rows
> *********
>>> let $binlog_limit= 1,3;
>>> -- source include/show_relaylog_events.inc
>>>
>>> @@ -74,28 +79,29 @@ DROP TABLE t1;
>>> let $binlog_file= ;
>>> let $binlog_limit= ;
>>>
>>> --- echo [MASTER] ********* SOW BINLOG EVENTS IN ... *********
>>> +-- echo [MASTER] ********* SHOW BINLOG EVENTS IN ... *********
>>> let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1);
>>> -- source include/show_binlog_events.inc
>>>
>>> --- echo [MASTER] ********* SOW BINLOG EVENTS *********
>>> +-- echo [MASTER] ********* SHOW BINLOG EVENTS *********
>>> let $binlog_file= ;
>>> -- source include/show_binlog_events.inc
>>>
>>> -- sync_slave_with_master
>>>
>>> --- echo [SLAVE] ********* SOW BINLOG EVENTS IN ... *********
>>> +-- echo [SLAVE] ********* SHOW BINLOG EVENTS IN ... *********
>>> let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1);
>>> -- source include/show_binlog_events.inc
>>>
>>> --- echo [SLAVE] ********* SOW BINLOG EVENTS *********
>>> +-- echo [SLAVE] ********* SHOW BINLOG EVENTS *********
>>> let $binlog_file= ;
>>> -- source include/show_binlog_events.inc
>>>
>>> --- echo [SLAVE] ********* SOW RELAYLOG EVENTS IN ... *********
>>> +-- echo [SLAVE] ********* SHOW RELAYLOG EVENTS IN ... *********
>>> +let $binlog_file= query_get_value(SHOW SLAVE STATUS, Relay_Log_File, 1);
>>> -- source include/show_relaylog_events.inc
>>>
>>> --- echo [SLAVE] ********* SOW RELAYLOG EVENTS *********
>>> +-- echo [SLAVE] ********* SHOW RELAYLOG EVENTS *********
>>> let $binlog_file= ;
>>> -- source include/show_relaylog_events.inc
>>>
>>>
>>> === modified file 'mysql-test/include/setup_fake_relay_log.inc'
>>> --- a/mysql-test/include/setup_fake_relay_log.inc 2010-12-19 17:15:12 +0000
>>> +++ b/mysql-test/include/setup_fake_relay_log.inc 2011-01-12 18:35:06 +0000
>>> @@ -74,6 +74,7 @@ let $_fake_relay_index= $_fake_datadir/$
>>> let $_fake_relay_log_purge= `SELECT @@global.relay_log_purge`;
>>>
>>> RESET SLAVE;
>>> +let $_orphan_relay_file= query_get_value(SHOW SLAVE STATUS, Relay_Log_File,
> 1);
>>>
>>> # Create relay log file.
>>> --copy_file $fake_relay_log $_fake_relay_log
>>> @@ -102,6 +103,8 @@ RESET SLAVE;
>>> # Setup replication from existing relay log.
>>> eval CHANGE MASTER TO MASTER_HOST='dummy.localdomain',
> RELAY_LOG_FILE='$_fake_filename-fake.000001', RELAY_LOG_POS=4;
>>>
>>> +# remove the orphan log file (became spurious)
>>> +-- remove_file $_fake_datadir/$_orphan_relay_file
>>>
>>> --let $include_filename= setup_fake_relay_log.inc
>>> --source include/end_include_file.inc
>>>
>>> === modified file
> 'mysql-test/suite/rpl/r/rpl_row_show_relaylog_events.result'
>>> --- a/mysql-test/suite/rpl/r/rpl_row_show_relaylog_events.result 2010-12-19
> 17:15:12 +0000
>>> +++ b/mysql-test/suite/rpl/r/rpl_row_show_relaylog_events.result 2011-01-12
> 18:35:06 +0000
>>> @@ -1,5 +1,6 @@
>>> include/master-slave.inc
>>> [connection master]
>>> +include/rpl_reset.inc
>>> CREATE TABLE t1 (a INT);
>>> INSERT INTO t1 VALUES (1);
>>> INSERT INTO t1 VALUES (2);
>>> @@ -7,8 +8,8 @@ INSERT INTO t1 VALUES (3);
>>> INSERT INTO t1 VALUES (4);
>>> INSERT INTO t1 VALUES (5);
>>> INSERT INTO t1 VALUES (6);
>>> -[MASTER] ********* SOW BINLOG EVENTS IN ... *********
>>> -show binlog events from<binlog_start>;
>>> +[MASTER] ********* SHOW BINLOG EVENTS IN ... *********
>>> +show binlog events in 'master-bin.000001' from<binlog_start>;
>>> Log_name Pos Event_type Server_id End_log_pos Info
>>> master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT)
>>> master-bin.000001 # Query # # BEGIN
>>> @@ -35,7 +36,7 @@ master-bin.000001 # Query # # BEGIN
>>> master-bin.000001 # Table_map # # table_id: # (test.t1)
>>> master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
>>> master-bin.000001 # Query # # COMMIT
>>> -[MASTER] ********* SOW BINLOG EVENTS *********
>>> +[MASTER] ********* SHOW BINLOG EVENTS *********
>>> show binlog events from<binlog_start>;
>>> Log_name Pos Event_type Server_id End_log_pos Info
>>> master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT)
>>> @@ -63,21 +64,21 @@ master-bin.000001 # Query # # BEGIN
>>> master-bin.000001 # Table_map # # table_id: # (test.t1)
>>> master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
>>> master-bin.000001 # Query # # COMMIT
>>> -[MASTER] ********* SOW BINLOG EVENTS ... LIMIT rows *********
>>> +[MASTER] ********* SHOW BINLOG EVENTS ... LIMIT rows *********
>>> show binlog events from<binlog_start> limit 3;
>>> Log_name Pos Event_type Server_id End_log_pos Info
>>> master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT)
>>> master-bin.000001 # Query # # BEGIN
>>> master-bin.000001 # Table_map # # table_id: # (test.t1)
>>> -[MASTER] ********* SOW BINLOG EVENTS ... LIMIT offset,rows *********
>>> +[MASTER] ********* SHOW BINLOG EVENTS ... LIMIT offset,rows *********
>>> show binlog events from<binlog_start> limit 1,4;
>>> Log_name Pos Event_type Server_id End_log_pos Info
>>> master-bin.000001 # Query # # BEGIN
>>> master-bin.000001 # Table_map # # table_id: # (test.t1)
>>> master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
>>> master-bin.000001 # Query # # COMMIT
>>> -[SLAVE] ********* SOW BINLOG EVENTS IN ... *********
>>> -show binlog events from<binlog_start>;
>>> +[SLAVE] ********* SHOW BINLOG EVENTS IN ... *********
>>> +show binlog events in 'slave-bin.000001' from<binlog_start>;
>>> Log_name Pos Event_type Server_id End_log_pos Info
>>> slave-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT)
>>> slave-bin.000001 # Query # # BEGIN
>>> @@ -104,7 +105,7 @@ slave-bin.000001 # Query # # BEGIN
>>> slave-bin.000001 # Table_map # # table_id: # (test.t1)
>>> slave-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
>>> slave-bin.000001 # Query # # COMMIT
>>> -[SLAVE] ********* SOW BINLOG EVENTS *********
>>> +[SLAVE] ********* SHOW BINLOG EVENTS *********
>>> show binlog events from<binlog_start>;
>>> Log_name Pos Event_type Server_id End_log_pos Info
>>> slave-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT)
>>> @@ -132,73 +133,73 @@ slave-bin.000001 # Query # # BEGIN
>>> slave-bin.000001 # Table_map # # table_id: # (test.t1)
>>> slave-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
>>> slave-bin.000001 # Query # # COMMIT
>>> -[SLAVE] ********* SOW BINLOG EVENTS ... LIMIT rows *********
>>> +[SLAVE] ********* SHOW BINLOG EVENTS ... LIMIT rows *********
>>> show binlog events from<binlog_start> limit 3;
>>> Log_name Pos Event_type Server_id End_log_pos Info
>>> slave-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT)
>>> slave-bin.000001 # Query # # BEGIN
>>> slave-bin.000001 # Table_map # # table_id: # (test.t1)
>>> -[SLAVE] ********* SOW BINLOG EVENTS ... LIMIT offset,rows *********
>>> +[SLAVE] ********* SHOW BINLOG EVENTS ... LIMIT offset,rows *********
>>> show binlog events from<binlog_start> limit 1,4;
>>> Log_name Pos Event_type Server_id End_log_pos Info
>>> slave-bin.000001 # Query # # BEGIN
>>> slave-bin.000001 # Table_map # # table_id: # (test.t1)
>>> slave-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
>>> slave-bin.000001 # Query # # COMMIT
>>> -[SLAVE] ********* SOW RELAYLOG EVENTS IN ... *********
>>> -show relaylog events in 'slave-relay-bin.000002' from<binlog_start>;
>>> +[SLAVE] ********* SHOW RELAYLOG EVENTS IN ... *********
>>> +show relaylog events in 'slave-relay-bin.000003' from<binlog_start>;
>>> Log_name Pos Event_type Server_id End_log_pos Info
>>> -slave-relay-bin.000002 # Rotate # # master-bin.000001;pos=4
>>> -slave-relay-bin.000002 # Format_desc # # SERVER_VERSION, BINLOG_VERSION
>>> -slave-relay-bin.000002 # Query # # use `test`; CREATE TABLE t1 (a INT)
>>> -slave-relay-bin.000002 # Query # # BEGIN
>>> -slave-relay-bin.000002 # Table_map # # table_id: # (test.t1)
>>> -slave-relay-bin.000002 # Write_rows # # table_id: # flags: STMT_END_F
>>> -slave-relay-bin.000002 # Query # # COMMIT
>>> -slave-relay-bin.000002 # Query # # BEGIN
>>> -slave-relay-bin.000002 # Table_map # # table_id: # (test.t1)
>>> -slave-relay-bin.000002 # Write_rows # # table_id: # flags: STMT_END_F
>>> -slave-relay-bin.000002 # Query # # COMMIT
>>> -slave-relay-bin.000002 # Query # # BEGIN
>>> -slave-relay-bin.000002 # Table_map # # table_id: # (test.t1)
>>> -slave-relay-bin.000002 # Write_rows # # table_id: # flags: STMT_END_F
>>> -slave-relay-bin.000002 # Query # # COMMIT
>>> -slave-relay-bin.000002 # Query # # BEGIN
>>> -slave-relay-bin.000002 # Table_map # # table_id: # (test.t1)
>>> -slave-relay-bin.000002 # Write_rows # # table_id: # flags: STMT_END_F
>>> -slave-relay-bin.000002 # Query # # COMMIT
>>> -slave-relay-bin.000002 # Query # # BEGIN
>>> -slave-relay-bin.000002 # Table_map # # table_id: # (test.t1)
>>> -slave-relay-bin.000002 # Write_rows # # table_id: # flags: STMT_END_F
>>> -slave-relay-bin.000002 # Query # # COMMIT
>>> -slave-relay-bin.000002 # Query # # BEGIN
>>> -slave-relay-bin.000002 # Table_map # # table_id: # (test.t1)
>>> -slave-relay-bin.000002 # Write_rows # # table_id: # flags: STMT_END_F
>>> -slave-relay-bin.000002 # Query # # COMMIT
>>> -[SLAVE] ********* SOW RELAYLOG EVENTS *********
>>> +slave-relay-bin.000003 # Rotate # # master-bin.000001;pos=4
>>> +slave-relay-bin.000003 # Format_desc # # SERVER_VERSION, BINLOG_VERSION
>>> +slave-relay-bin.000003 # Query # # use `test`; CREATE TABLE t1 (a INT)
>>> +slave-relay-bin.000003 # Query # # BEGIN
>>> +slave-relay-bin.000003 # Table_map # # table_id: # (test.t1)
>>> +slave-relay-bin.000003 # Write_rows # # table_id: # flags: STMT_END_F
>>> +slave-relay-bin.000003 # Query # # COMMIT
>>> +slave-relay-bin.000003 # Query # # BEGIN
>>> +slave-relay-bin.000003 # Table_map # # table_id: # (test.t1)
>>> +slave-relay-bin.000003 # Write_rows # # table_id: # flags: STMT_END_F
>>> +slave-relay-bin.000003 # Query # # COMMIT
>>> +slave-relay-bin.000003 # Query # # BEGIN
>>> +slave-relay-bin.000003 # Table_map # # table_id: # (test.t1)
>>> +slave-relay-bin.000003 # Write_rows # # table_id: # flags: STMT_END_F
>>> +slave-relay-bin.000003 # Query # # COMMIT
>>> +slave-relay-bin.000003 # Query # # BEGIN
>>> +slave-relay-bin.000003 # Table_map # # table_id: # (test.t1)
>>> +slave-relay-bin.000003 # Write_rows # # table_id: # flags: STMT_END_F
>>> +slave-relay-bin.000003 # Query # # COMMIT
>>> +slave-relay-bin.000003 # Query # # BEGIN
>>> +slave-relay-bin.000003 # Table_map # # table_id: # (test.t1)
>>> +slave-relay-bin.000003 # Write_rows # # table_id: # flags: STMT_END_F
>>> +slave-relay-bin.000003 # Query # # COMMIT
>>> +slave-relay-bin.000003 # Query # # BEGIN
>>> +slave-relay-bin.000003 # Table_map # # table_id: # (test.t1)
>>> +slave-relay-bin.000003 # Write_rows # # table_id: # flags: STMT_END_F
>>> +slave-relay-bin.000003 # Query # # COMMIT
>>> +[SLAVE] ********* SHOW RELAYLOG EVENTS *********
>>> show relaylog events from<binlog_start>;
>>> Log_name Pos Event_type Server_id End_log_pos Info
>>> -slave-relay-bin.000001 # Rotate # # slave-relay-bin.000002;pos=4
>>> -[MASTER] ********* SOW RELAYLOG EVENTS ... LIMIT rows *********
>>> -show relaylog events in 'slave-relay-bin.000002' from<binlog_start>
> limit 3;
>>> -Log_name Pos Event_type Server_id End_log_pos Info
>>> -slave-relay-bin.000002 # Rotate # # master-bin.000001;pos=4
>>> -slave-relay-bin.000002 # Format_desc # # SERVER_VERSION, BINLOG_VERSION
>>> -slave-relay-bin.000002 # Query # # use `test`; CREATE TABLE t1 (a INT)
>>> -[MASTER] ********* SOW RELAYLOG EVENTS ... LIMIT offset,rows *********
>>> -show relaylog events in 'slave-relay-bin.000002' from<binlog_start>
> limit 1,3;
>>> -Log_name Pos Event_type Server_id End_log_pos Info
>>> -slave-relay-bin.000002 # Format_desc # # SERVER_VERSION, BINLOG_VERSION
>>> -slave-relay-bin.000002 # Query # # use `test`; CREATE TABLE t1 (a INT)
>>> -slave-relay-bin.000002 # Query # # BEGIN
>>> +slave-relay-bin.000002 # Rotate # # slave-relay-bin.000003;pos=4
>>> +[MASTER] ********* SHOW RELAYLOG EVENTS ... LIMIT rows *********
>>> +show relaylog events in 'slave-relay-bin.000003' from<binlog_start>
> limit 3;
>>> +Log_name Pos Event_type Server_id End_log_pos Info
>>> +slave-relay-bin.000003 # Rotate # # master-bin.000001;pos=4
>>> +slave-relay-bin.000003 # Format_desc # # SERVER_VERSION, BINLOG_VERSION
>>> +slave-relay-bin.000003 # Query # # use `test`; CREATE TABLE t1 (a INT)
>>> +[MASTER] ********* SHOW RELAYLOG EVENTS ... LIMIT offset,rows *********
>>> +show relaylog events in 'slave-relay-bin.000003' from<binlog_start>
> limit 1,3;
>>> +Log_name Pos Event_type Server_id End_log_pos Info
>>> +slave-relay-bin.000003 # Format_desc # # SERVER_VERSION, BINLOG_VERSION
>>> +slave-relay-bin.000003 # Query # # use `test`; CREATE TABLE t1 (a INT)
>>> +slave-relay-bin.000003 # Query # # BEGIN
>>> FLUSH LOGS;
>>> FLUSH LOGS;
>>> DROP TABLE t1;
>>> -[MASTER] ********* SOW BINLOG EVENTS IN ... *********
>>> +[MASTER] ********* SHOW BINLOG EVENTS IN ... *********
>>> show binlog events in 'master-bin.000002' from<binlog_start>;
>>> Log_name Pos Event_type Server_id End_log_pos Info
>>> master-bin.000002 # Query # # use `test`; DROP TABLE `t1` /* generated by
> server */
>>> -[MASTER] ********* SOW BINLOG EVENTS *********
>>> +[MASTER] ********* SHOW BINLOG EVENTS *********
>>> show binlog events from<binlog_start>;
>>> Log_name Pos Event_type Server_id End_log_pos Info
>>> master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT)
>>> @@ -227,11 +228,11 @@ master-bin.000001 # Table_map # # table_
>>> master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
>>> master-bin.000001 # Query # # COMMIT
>>> master-bin.000001 # Rotate # # master-bin.000002;pos=4
>>> -[SLAVE] ********* SOW BINLOG EVENTS IN ... *********
>>> +[SLAVE] ********* SHOW BINLOG EVENTS IN ... *********
>>> show binlog events in 'slave-bin.000002' from<binlog_start>;
>>> Log_name Pos Event_type Server_id End_log_pos Info
>>> slave-bin.000002 # Query # # use `test`; DROP TABLE `t1` /* generated by
> server */
>>> -[SLAVE] ********* SOW BINLOG EVENTS *********
>>> +[SLAVE] ********* SHOW BINLOG EVENTS *********
>>> show binlog events from<binlog_start>;
>>> Log_name Pos Event_type Server_id End_log_pos Info
>>> slave-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT)
>>> @@ -260,14 +261,15 @@ slave-bin.000001 # Table_map # # table_i
>>> slave-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
>>> slave-bin.000001 # Query # # COMMIT
>>> slave-bin.000001 # Rotate # # slave-bin.000002;pos=4
>>> -[SLAVE] ********* SOW RELAYLOG EVENTS IN ... *********
>>> -show relaylog events from<binlog_start>;
>>> +[SLAVE] ********* SHOW RELAYLOG EVENTS IN ... *********
>>> +show relaylog events in 'slave-relay-bin.000006' from<binlog_start>;
>>> Log_name Pos Event_type Server_id End_log_pos Info
>>> -slave-relay-bin.000004 # Rotate # # master-bin.000002;pos=4
>>> -slave-relay-bin.000004 # Rotate # # slave-relay-bin.000005;pos=4
>>> -[SLAVE] ********* SOW RELAYLOG EVENTS *********
>>> +slave-relay-bin.000006 # Rotate # # master-bin.000002;pos=4
>>> +slave-relay-bin.000006 # Format_desc # # SERVER_VERSION, BINLOG_VERSION
>>> +slave-relay-bin.000006 # Query # # use `test`; DROP TABLE `t1` /* generated
> by server */
>>> +[SLAVE] ********* SHOW RELAYLOG EVENTS *********
>>> show relaylog events from<binlog_start>;
>>> Log_name Pos Event_type Server_id End_log_pos Info
>>> -slave-relay-bin.000004 # Rotate # # master-bin.000002;pos=4
>>> -slave-relay-bin.000004 # Rotate # # slave-relay-bin.000005;pos=4
>>> +slave-relay-bin.000005 # Rotate # # master-bin.000002;pos=4
>>> +slave-relay-bin.000005 # Rotate # # slave-relay-bin.000006;pos=4
>>> include/rpl_end.inc
>>>
>>> === modified file
> 'mysql-test/suite/rpl/r/rpl_stm_mix_show_relaylog_events.result'
>>> --- a/mysql-test/suite/rpl/r/rpl_stm_mix_show_relaylog_events.result
> 2010-12-19 17:15:12 +0000
>>> +++ b/mysql-test/suite/rpl/r/rpl_stm_mix_show_relaylog_events.result
> 2011-01-12 18:35:06 +0000
>>> @@ -1,5 +1,6 @@
>>> include/master-slave.inc
>>> [connection master]
>>> +include/rpl_reset.inc
>>> CREATE TABLE t1 (a INT);
>>> INSERT INTO t1 VALUES (1);
>>> INSERT INTO t1 VALUES (2);
>>> @@ -7,8 +8,8 @@ INSERT INTO t1 VALUES (3);
>>> INSERT INTO t1 VALUES (4);
>>> INSERT INTO t1 VALUES (5);
>>> INSERT INTO t1 VALUES (6);
>>> -[MASTER] ********* SOW BINLOG EVENTS IN ... *********
>>> -show binlog events from<binlog_start>;
>>> +[MASTER] ********* SHOW BINLOG EVENTS IN ... *********
>>> +show binlog events in 'master-bin.000001' from<binlog_start>;
>>> Log_name Pos Event_type Server_id End_log_pos Info
>>> master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT)
>>> master-bin.000001 # Query # # BEGIN
>>> @@ -29,7 +30,7 @@ master-bin.000001 # Query # # COMMIT
>>> master-bin.000001 # Query # # BEGIN
>>> master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (6)
>>> master-bin.000001 # Query # # COMMIT
>>> -[MASTER] ********* SOW BINLOG EVENTS *********
>>> +[MASTER] ********* SHOW BINLOG EVENTS *********
>>> show binlog events from<binlog_start>;
>>> Log_name Pos Event_type Server_id End_log_pos Info
>>> master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT)
>>> @@ -51,21 +52,21 @@ master-bin.000001 # Query # # COMMIT
>>> master-bin.000001 # Query # # BEGIN
>>> master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (6)
>>> master-bin.000001 # Query # # COMMIT
>>> -[MASTER] ********* SOW BINLOG EVENTS ... LIMIT rows *********
>>> +[MASTER] ********* SHOW BINLOG EVENTS ... LIMIT rows *********
>>> show binlog events from<binlog_start> limit 3;
>>> Log_name Pos Event_type Server_id End_log_pos Info
>>> master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT)
>>> master-bin.000001 # Query # # BEGIN
>>> master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (1)
>>> -[MASTER] ********* SOW BINLOG EVENTS ... LIMIT offset,rows *********
>>> +[MASTER] ********* SHOW BINLOG EVENTS ... LIMIT offset,rows *********
>>> show binlog events from<binlog_start> limit 1,4;
>>> Log_name Pos Event_type Server_id End_log_pos Info
>>> master-bin.000001 # Query # # BEGIN
>>> master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (1)
>>> master-bin.000001 # Query # # COMMIT
>>> master-bin.000001 # Query # # BEGIN
>>> -[SLAVE] ********* SOW BINLOG EVENTS IN ... *********
>>> -show binlog events from<binlog_start>;
>>> +[SLAVE] ********* SHOW BINLOG EVENTS IN ... *********
>>> +show binlog events in 'slave-bin.000001' from<binlog_start>;
>>> Log_name Pos Event_type Server_id End_log_pos Info
>>> slave-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT)
>>> slave-bin.000001 # Query # # BEGIN
>>> @@ -86,7 +87,7 @@ slave-bin.000001 # Query # # COMMIT
>>> slave-bin.000001 # Query # # BEGIN
>>> slave-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (6)
>>> slave-bin.000001 # Query # # COMMIT
>>> -[SLAVE] ********* SOW BINLOG EVENTS *********
>>> +[SLAVE] ********* SHOW BINLOG EVENTS *********
>>> show binlog events from<binlog_start>;
>>> Log_name Pos Event_type Server_id End_log_pos Info
>>> slave-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT)
>>> @@ -108,67 +109,67 @@ slave-bin.000001 # Query # # COMMIT
>>> slave-bin.000001 # Query # # BEGIN
>>> slave-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (6)
>>> slave-bin.000001 # Query # # COMMIT
>>> -[SLAVE] ********* SOW BINLOG EVENTS ... LIMIT rows *********
>>> +[SLAVE] ********* SHOW BINLOG EVENTS ... LIMIT rows *********
>>> show binlog events from<binlog_start> limit 3;
>>> Log_name Pos Event_type Server_id End_log_pos Info
>>> slave-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT)
>>> slave-bin.000001 # Query # # BEGIN
>>> slave-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (1)
>>> -[SLAVE] ********* SOW BINLOG EVENTS ... LIMIT offset,rows *********
>>> +[SLAVE] ********* SHOW BINLOG EVENTS ... LIMIT offset,rows *********
>>> show binlog events from<binlog_start> limit 1,4;
>>> Log_name Pos Event_type Server_id End_log_pos Info
>>> slave-bin.000001 # Query # # BEGIN
>>> slave-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (1)
>>> slave-bin.000001 # Query # # COMMIT
>>> slave-bin.000001 # Query # # BEGIN
>>> -[SLAVE] ********* SOW RELAYLOG EVENTS IN ... *********
>>> -show relaylog events in 'slave-relay-bin.000002' from<binlog_start>;
>>> +[SLAVE] ********* SHOW RELAYLOG EVENTS IN ... *********
>>> +show relaylog events in 'slave-relay-bin.000003' from<binlog_start>;
>>> Log_name Pos Event_type Server_id End_log_pos Info
>>> -slave-relay-bin.000002 # Rotate # # master-bin.000001;pos=4
>>> -slave-relay-bin.000002 # Format_desc # # SERVER_VERSION, BINLOG_VERSION
>>> -slave-relay-bin.000002 # Query # # use `test`; CREATE TABLE t1 (a INT)
>>> -slave-relay-bin.000002 # Query # # BEGIN
>>> -slave-relay-bin.000002 # Query # # use `test`; INSERT INTO t1 VALUES (1)
>>> -slave-relay-bin.000002 # Query # # COMMIT
>>> -slave-relay-bin.000002 # Query # # BEGIN
>>> -slave-relay-bin.000002 # Query # # use `test`; INSERT INTO t1 VALUES (2)
>>> -slave-relay-bin.000002 # Query # # COMMIT
>>> -slave-relay-bin.000002 # Query # # BEGIN
>>> -slave-relay-bin.000002 # Query # # use `test`; INSERT INTO t1 VALUES (3)
>>> -slave-relay-bin.000002 # Query # # COMMIT
>>> -slave-relay-bin.000002 # Query # # BEGIN
>>> -slave-relay-bin.000002 # Query # # use `test`; INSERT INTO t1 VALUES (4)
>>> -slave-relay-bin.000002 # Query # # COMMIT
>>> -slave-relay-bin.000002 # Query # # BEGIN
>>> -slave-relay-bin.000002 # Query # # use `test`; INSERT INTO t1 VALUES (5)
>>> -slave-relay-bin.000002 # Query # # COMMIT
>>> -slave-relay-bin.000002 # Query # # BEGIN
>>> -slave-relay-bin.000002 # Query # # use `test`; INSERT INTO t1 VALUES (6)
>>> -slave-relay-bin.000002 # Query # # COMMIT
>>> -[SLAVE] ********* SOW RELAYLOG EVENTS *********
>>> +slave-relay-bin.000003 # Rotate # # master-bin.000001;pos=4
>>> +slave-relay-bin.000003 # Format_desc # # SERVER_VERSION, BINLOG_VERSION
>>> +slave-relay-bin.000003 # Query # # use `test`; CREATE TABLE t1 (a INT)
>>> +slave-relay-bin.000003 # Query # # BEGIN
>>> +slave-relay-bin.000003 # Query # # use `test`; INSERT INTO t1 VALUES (1)
>>> +slave-relay-bin.000003 # Query # # COMMIT
>>> +slave-relay-bin.000003 # Query # # BEGIN
>>> +slave-relay-bin.000003 # Query # # use `test`; INSERT INTO t1 VALUES (2)
>>> +slave-relay-bin.000003 # Query # # COMMIT
>>> +slave-relay-bin.000003 # Query # # BEGIN
>>> +slave-relay-bin.000003 # Query # # use `test`; INSERT INTO t1 VALUES (3)
>>> +slave-relay-bin.000003 # Query # # COMMIT
>>> +slave-relay-bin.000003 # Query # # BEGIN
>>> +slave-relay-bin.000003 # Query # # use `test`; INSERT INTO t1 VALUES (4)
>>> +slave-relay-bin.000003 # Query # # COMMIT
>>> +slave-relay-bin.000003 # Query # # BEGIN
>>> +slave-relay-bin.000003 # Query # # use `test`; INSERT INTO t1 VALUES (5)
>>> +slave-relay-bin.000003 # Query # # COMMIT
>>> +slave-relay-bin.000003 # Query # # BEGIN
>>> +slave-relay-bin.000003 # Query # # use `test`; INSERT INTO t1 VALUES (6)
>>> +slave-relay-bin.000003 # Query # # COMMIT
>>> +[SLAVE] ********* SHOW RELAYLOG EVENTS *********
>>> show relaylog events from<binlog_start>;
>>> Log_name Pos Event_type Server_id End_log_pos Info
>>> -slave-relay-bin.000001 # Rotate # # slave-relay-bin.000002;pos=4
>>> -[MASTER] ********* SOW RELAYLOG EVENTS ... LIMIT rows *********
>>> -show relaylog events in 'slave-relay-bin.000002' from<binlog_start>
> limit 3;
>>> -Log_name Pos Event_type Server_id End_log_pos Info
>>> -slave-relay-bin.000002 # Rotate # # master-bin.000001;pos=4
>>> -slave-relay-bin.000002 # Format_desc # # SERVER_VERSION, BINLOG_VERSION
>>> -slave-relay-bin.000002 # Query # # use `test`; CREATE TABLE t1 (a INT)
>>> -[MASTER] ********* SOW RELAYLOG EVENTS ... LIMIT offset,rows *********
>>> -show relaylog events in 'slave-relay-bin.000002' from<binlog_start>
> limit 1,3;
>>> -Log_name Pos Event_type Server_id End_log_pos Info
>>> -slave-relay-bin.000002 # Format_desc # # SERVER_VERSION, BINLOG_VERSION
>>> -slave-relay-bin.000002 # Query # # use `test`; CREATE TABLE t1 (a INT)
>>> -slave-relay-bin.000002 # Query # # BEGIN
>>> +slave-relay-bin.000002 # Rotate # # slave-relay-bin.000003;pos=4
>>> +[MASTER] ********* SHOW RELAYLOG EVENTS ... LIMIT rows *********
>>> +show relaylog events in 'slave-relay-bin.000003' from<binlog_start>
> limit 3;
>>> +Log_name Pos Event_type Server_id End_log_pos Info
>>> +slave-relay-bin.000003 # Rotate # # master-bin.000001;pos=4
>>> +slave-relay-bin.000003 # Format_desc # # SERVER_VERSION, BINLOG_VERSION
>>> +slave-relay-bin.000003 # Query # # use `test`; CREATE TABLE t1 (a INT)
>>> +[MASTER] ********* SHOW RELAYLOG EVENTS ... LIMIT offset,rows *********
>>> +show relaylog events in 'slave-relay-bin.000003' from<binlog_start>
> limit 1,3;
>>> +Log_name Pos Event_type Server_id End_log_pos Info
>>> +slave-relay-bin.000003 # Format_desc # # SERVER_VERSION, BINLOG_VERSION
>>> +slave-relay-bin.000003 # Query # # use `test`; CREATE TABLE t1 (a INT)
>>> +slave-relay-bin.000003 # Query # # BEGIN
>>> FLUSH LOGS;
>>> FLUSH LOGS;
>>> DROP TABLE t1;
>>> -[MASTER] ********* SOW BINLOG EVENTS IN ... *********
>>> +[MASTER] ********* SHOW BINLOG EVENTS IN ... *********
>>> show binlog events in 'master-bin.000002' from<binlog_start>;
>>> Log_name Pos Event_type Server_id End_log_pos Info
>>> master-bin.000002 # Query # # use `test`; DROP TABLE `t1` /* generated by
> server */
>>> -[MASTER] ********* SOW BINLOG EVENTS *********
>>> +[MASTER] ********* SHOW BINLOG EVENTS *********
>>> show binlog events from<binlog_start>;
>>> Log_name Pos Event_type Server_id End_log_pos Info
>>> master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT)
>>> @@ -191,11 +192,11 @@ master-bin.000001 # Query # # BEGIN
>>> master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (6)
>>> master-bin.000001 # Query # # COMMIT
>>> master-bin.000001 # Rotate # # master-bin.000002;pos=4
>>> -[SLAVE] ********* SOW BINLOG EVENTS IN ... *********
>>> +[SLAVE] ********* SHOW BINLOG EVENTS IN ... *********
>>> show binlog events in 'slave-bin.000002' from<binlog_start>;
>>> Log_name Pos Event_type Server_id End_log_pos Info
>>> slave-bin.000002 # Query # # use `test`; DROP TABLE `t1` /* generated by
> server */
>>> -[SLAVE] ********* SOW BINLOG EVENTS *********
>>> +[SLAVE] ********* SHOW BINLOG EVENTS *********
>>> show binlog events from<binlog_start>;
>>> Log_name Pos Event_type Server_id End_log_pos Info
>>> slave-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT)
>>> @@ -218,14 +219,15 @@ slave-bin.000001 # Query # # BEGIN
>>> slave-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (6)
>>> slave-bin.000001 # Query # # COMMIT
>>> slave-bin.000001 # Rotate # # slave-bin.000002;pos=4
>>> -[SLAVE] ********* SOW RELAYLOG EVENTS IN ... *********
>>> -show relaylog events from<binlog_start>;
>>> +[SLAVE] ********* SHOW RELAYLOG EVENTS IN ... *********
>>> +show relaylog events in 'slave-relay-bin.000006' from<binlog_start>;
>>> Log_name Pos Event_type Server_id End_log_pos Info
>>> -slave-relay-bin.000004 # Rotate # # master-bin.000002;pos=4
>>> -slave-relay-bin.000004 # Rotate # # slave-relay-bin.000005;pos=4
>>> -[SLAVE] ********* SOW RELAYLOG EVENTS *********
>>> +slave-relay-bin.000006 # Rotate # # master-bin.000002;pos=4
>>> +slave-relay-bin.000006 # Format_desc # # SERVER_VERSION, BINLOG_VERSION
>>> +slave-relay-bin.000006 # Query # # use `test`; DROP TABLE `t1` /* generated
> by server */
>>> +[SLAVE] ********* SHOW RELAYLOG EVENTS *********
>>> show relaylog events from<binlog_start>;
>>> Log_name Pos Event_type Server_id End_log_pos Info
>>> -slave-relay-bin.000004 # Rotate # # master-bin.000002;pos=4
>>> -slave-relay-bin.000004 # Rotate # # slave-relay-bin.000005;pos=4
>>> +slave-relay-bin.000005 # Rotate # # master-bin.000002;pos=4
>>> +slave-relay-bin.000005 # Rotate # # slave-relay-bin.000006;pos=4
>>> include/rpl_end.inc
>>>
>>>
>>>
>>>
>>>
>>
>>
>

Thread
bzr commit into mysql-5.5 branch (luis.soares:3238) Bug#59444Luis Soares12 Jan
  • Re: bzr commit into mysql-5.5 branch (luis.soares:3238) Bug#59444Sven Sandberg13 Jan
    • Re: bzr commit into mysql-5.5 branch (luis.soares:3238) Bug#59444Luís Soares13 Jan
      • Re: bzr commit into mysql-5.5 branch (luis.soares:3238) Bug#59444Luís Soares13 Jan
        • Re: bzr commit into mysql-5.5 branch (luis.soares:3238) Bug#59444Sven Sandberg13 Jan
          • Re: bzr commit into mysql-5.5 branch (luis.soares:3238) Bug#59444Luís Soares13 Jan