Re: BUG#12691 - a complementary patch

[Sven Sandberg]

Hej Mats!

Patch is good to push, but please see the comments on the test file below.

/Sven


Mats Kindahl wrote:
[...]
> diff -Nru a/mysql-test/t/rpl_slave_skip.test b/mysql-test/t/rpl_slave_skip.test
> --- a/mysql-test/t/rpl_slave_skip.test	2007-12-20 16:08:11 +01:00
> +++ b/mysql-test/t/rpl_slave_skip.test	2007-12-20 16:08:11 +01:00
> @@ -195,9 +197,170 @@
[...]
> +
> +--echo ==== Try with a big file so that we get an append_block event as well

Please end the line with ====

[...]
> +
> +# Test to generate a Delete_file log event, and see that it works as well.

Please turn this comment into an echo:

--echo ==== Test to generate a Delete_file log event, and see that it
works as well ====

[...]
> +
> +sync_with_master;
> +SELECT * FROM t5;
> +
> +connection slave;

The above line can be removed.

> +
>  --echo ==== Cleanup ==== 
>  
>  --echo **** On Master ****
>  connection master;
> -DROP TABLE t1, t2;
> +DROP TABLE t1, t2, t3, t4, t5;
>  sync_slave_with_master;
> diff -Nru a/sql/slave.cc b/sql/slave.cc
> --- a/sql/slave.cc	2007-12-20 16:08:11 +01:00
> +++ b/sql/slave.cc	2007-12-20 16:08:11 +01:00
> @@ -3348,7 +3348,10 @@
>        if (rli->slave_skip_counter &&
>            !((type_code == INTVAR_EVENT ||
>               type_code == RAND_EVENT ||
> -             type_code == USER_VAR_EVENT) &&
> +             type_code == USER_VAR_EVENT ||
> +             type_code == BEGIN_LOAD_QUERY_EVENT ||
> +             type_code == APPEND_BLOCK_EVENT ||
> +             type_code == CREATE_FILE_EVENT) &&
>              rli->slave_skip_counter == 1) &&
>  #if MYSQL_VERSION_ID < 50100
>            /*

-- 
Sven Sandberg, Software Engineer
MySQL AB, www.mysql.com