List:Commits« Previous MessageNext Message »
From:Luís Soares Date:November 26 2010 1:19pm
Subject:Re: bzr commit into mysql-5.1-mtr branch (bjorn.munch:2955) Bug#58515
View as plain text  
Hi Bjorn,

   Patch approved.

   I find two more tests in trunk (possibly 5.5):

   - binlog_max_extension.test
   - rpl_heartbeat_basic.test

   Please, change those as well when upmerging.

Thanks,
Luís Soares

On 11/26/2010 01:00 PM, Bjorn Munch wrote:
> #At file:///home/bm136801/my/exececho-51/ based on
> revid:bjorn.munch@stripped
>
>   2955 Bjorn Munch	2010-11-26
>        Bug #58515 Tests: use use exec echo, not write_file to write mysqld.1.expect
>        Fixed as suggested in the .inc file and two tests
>        Could not reproduce problem, but tested tests on Windows
>
>      modified:
>        mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test
>        mysql-test/include/restart_mysqld.inc
>        mysql-test/suite/rpl/t/rpl_trigger.test
> === modified file 'mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test'
> --- a/mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test	2010-10-21
> 13:20:50 +0000
> +++ b/mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test	2010-11-26
> 12:59:39 +0000
> @@ -53,9 +53,7 @@ source include/wait_for_slave_to_start.i
>   connection master;
>   # Write file to make mysql-test-run.pl expect the "crash", but don't start
>   # it until it's told to
> ---write_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
> -wait
> -EOF
> +--exec echo "wait">  $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
>
>   # Send shutdown to the connected server and give
>   # it 10 seconds to die before zapping it
> @@ -85,9 +83,7 @@ source include/wait_for_slave_io_error.i
>   eval set @@global.debug = "-d,$dbug_sync_point";
>
>   # Write file to make mysql-test-run.pl start up the server again
> ---append_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
> -restart
> -EOF
> +--exec echo "restart">  $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
>
>   connection master;
>   # Turn on reconnect
>
> === modified file 'mysql-test/include/restart_mysqld.inc'
> --- a/mysql-test/include/restart_mysqld.inc	2008-12-25 09:53:24 +0000
> +++ b/mysql-test/include/restart_mysqld.inc	2010-11-26 12:59:39 +0000
> @@ -1,18 +1,14 @@
>
>   # Write file to make mysql-test-run.pl expect the "crash", but don't start
>   # it until it's told to
> ---write_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
> -wait
> -EOF
> +--exec echo "wait">  $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
>
>   # Send shutdown to the connected server and give
>   # it 10 seconds to die before zapping it
>   shutdown_server 10;
>
>   # Write file to make mysql-test-run.pl start up the server again
> ---append_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
> -restart
> -EOF
> +--exec echo "restart">  $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
>
>   # Turn on reconnect
>   --enable_reconnect
>
> === modified file 'mysql-test/suite/rpl/t/rpl_trigger.test'
> --- a/mysql-test/suite/rpl/t/rpl_trigger.test	2010-01-13 09:00:03 +0000
> +++ b/mysql-test/suite/rpl/t/rpl_trigger.test	2010-11-26 12:59:39 +0000
> @@ -313,9 +313,7 @@ FLUSH LOGS;
>
>   # Stop master server
>   --echo -->  Stop master server
> ---write_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
> -wait
> -EOF
> +--exec echo "wait">  $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
>   --shutdown_server 10
>   --source include/wait_until_disconnected.inc
>   # Replace binlog
> @@ -323,9 +321,7 @@ remove_file $MYSQLD_DATADIR/master-bin.0
>   copy_file $MYSQL_TEST_DIR/std_data/bug16266.000001
> $MYSQLD_DATADIR/master-bin.000001;
>
>   --echo -->  Start master server
> ---append_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
> -restart
> -EOF
> +--exec echo "restart">  $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
>   --enable_reconnect
>   --source include/wait_until_connected_again.inc
>   let $binlog_version= query_get_value(SHOW BINLOG EVENTS, Info, 1);
>
>
>
>
>

Thread
bzr commit into mysql-5.1-mtr branch (bjorn.munch:2955) Bug#58515Bjorn Munch26 Nov
  • Re: bzr commit into mysql-5.1-mtr branch (bjorn.munch:2955) Bug#58515Luís Soares26 Nov