Hi Andrei,
Patch is good to push. (One minor comment below, fix if you want.)
/Sven
Andrei Elkin wrote:
> Below is the list of changes that have just been committed into a local
> 5.1 repository of aelkin. When aelkin does a push these changes
> will be propagated to the main repository and, within 24 hours after the
> push, to the public repository.
> For information on how to access the public repository
> see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
>
> ChangeSet@stripped, 2008-01-07 19:25:38+02:00, aelkin@stripped +1 -0
> bug#32003 rpl.rpl_server_id2 can cause extraneous errors recorded in error log
>
> the error printed in the slave error log appeared due to slave's threads
> were killed in the middle of handling START SLAVE.
> The sql command is asynchronous so that START may not be complete by
> the time a test issues STOP.
> Clearly, printing the error is not necessary if the threads are killed.
>
> Fixed with deploying a condition for printing the error that previously
> was introduced by bug#29976.
>
> sql/slave.cc@stripped, 2008-01-07 19:25:35+02:00, aelkin@stripped +3 -2
> adding a condition to print an error only if the thread was not killed.
>
> diff -Nrup a/sql/slave.cc b/sql/slave.cc
> --- a/sql/slave.cc 2007-12-18 08:32:30 +02:00
> +++ b/sql/slave.cc 2008-01-07 19:25:35 +02:00
> @@ -955,7 +955,8 @@ static int get_master_version_and_clock(
> llstr((ulonglong) (mi->heartbeat_period*1000000000UL), llbuf);
> my_sprintf(query, (query, query_format, llbuf));
>
> - if (mysql_real_query(mysql, query, strlen(query)))
> + if (mysql_real_query(mysql, query, strlen(query))
> + && !check_io_slave_killed(mi->io_thd, mi, NULL))
> {
> err_msg.append("The slave I/O thread stops because querying master with '");
> err_msg.append(query);
> @@ -977,7 +978,7 @@ err:
> sql_print_error(err_msg.ptr());
> DBUG_RETURN(1);
> }
> -
> +
Unnecessary blank change.
> DBUG_RETURN(0);
> }
>
>
--
Sven Sandberg, Software Engineer
MySQL AB, www.mysql.com
