List:Commits« Previous MessageNext Message »
From:Libing Song Date:July 23 2010 9:59am
Subject:Re: bzr commit into mysql-5.1-bugteam branch (alfranio.correia:3470)
Bug#54238
View as plain text  
Hi Alfranio,
Nice work, patch approved.

On Thu, 2010-07-08 at 12:46 +0000, Alfranio Correia wrote:
> #At
> file:///home/acorreia/workspace.sun/repository.mysql.new/bug-54238/mysql-5.1-bugteam/
> based on revid:li-bing.song@stripped
> 
>  3470 Alfranio Correia	2010-07-08
>       BUG#54238 bad assignment in handle_slave_sql for skip_slave_counter
>       
>       Code cleanup: removed unused variable and bad assignment.
> 
>     modified:
>       sql/slave.cc
>       sql/sql_repl.cc
> === modified file 'sql/slave.cc'
> --- a/sql/slave.cc	2010-07-02 18:30:47 +0000
> +++ b/sql/slave.cc	2010-07-08 12:46:48 +0000
> @@ -3035,11 +3035,8 @@ log '%s' at position %s, relay log '%s' 
>    pthread_mutex_lock(&rli->data_lock);
>    if (rli->slave_skip_counter)
>    {
> -    char *pos;
> -    pos= strmake(saved_log_name, rli->group_relay_log_name, FN_REFLEN - 1);
> -    pos= '\0';
> -    pos= strmake(saved_master_log_name, rli->group_master_log_name, FN_REFLEN -
> 1);
> -    pos= '\0';
> +    strmake(saved_log_name, rli->group_relay_log_name, FN_REFLEN - 1);
> +    strmake(saved_master_log_name, rli->group_master_log_name, FN_REFLEN - 1);
>      saved_log_pos= rli->group_relay_log_pos;
>      saved_master_log_pos= rli->group_master_log_pos;
>      saved_skip= rli->slave_skip_counter;
> 
> === modified file 'sql/sql_repl.cc'
> --- a/sql/sql_repl.cc	2010-07-02 18:30:47 +0000
> +++ b/sql/sql_repl.cc	2010-07-08 12:46:48 +0000
> @@ -1168,12 +1168,9 @@ bool change_master(THD* thd, Master_info
>    /*
>      Before processing the command, save the previous state.
>    */
> -  char *pos;
> -  pos= strmake(saved_host, mi->host, HOSTNAME_LENGTH);
> -  pos= '\0';
> +  strmake(saved_host, mi->host, HOSTNAME_LENGTH);
>    saved_port= mi->port;
> -  pos= strmake(saved_log_name, mi->master_log_name, FN_REFLEN - 1);
> -  pos= '\0';
> +  strmake(saved_log_name, mi->master_log_name, FN_REFLEN - 1);
>    saved_log_pos= mi->master_log_pos;
>  
>    /*
> 
> text/bzr-bundle type attachment
> (bzr/alfranio.correia@stripped)
> # Bazaar merge directive format 2 (Bazaar 0.90)
> # revision_id: alfranio.correia@stripped\
> #   sl1pcraeorq04hqd
> # target_branch: file:///home/acorreia/workspace.sun\
> #   /repository.mysql.new/bug-54238/mysql-5.1-bugteam/
> # testament_sha1: 7310e66d582ebf8e7db1876e8c88e19340b323e2
> # timestamp: 2010-07-08 13:47:01 +0100
> # base_revision_id: li-bing.song@stripped\
> #   d51ifd6d0u4vca0v
> # 
> # Begin bundle
> IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbN52vYAAjZfgEAQWGf//3vH
> ngC////wUAUuvA9BO7lAAAhJRqI9SNNPUeoeCmahkHqADyJmoADmmJgI0wIwjAAAAEwjAShJmkNT
> JD1NNGgAAGgAAAGmpGmkBoBoGgAAANAMmgEkhMgATQaJkxBqeppqeRBoaaPUbUee2OWmdONlt/mU
> TzQmRE0rSCVRkaD4skGajeE8MNiVBwDASQSnjogciWq2iphml5k9qiVulTZZyfgAhfHM56vv/ZY5
> YHCVuOhyYakYMBJVXXUUEeAm2WJnJHrXpDV8+xPWQymVgfdCzVwdoynuXAzqy23AaDQMcDy1TWGi
> 9hisS4ILP6WkhbItLzDbIFoG5F5EgkuRKBMhMQTExgnkDQj+wIpKshJIjEqQ5VxKTSZlMYqxWoex
> UyPln2zoDmx98yrbppQ+DwKDIxppwxjNcfRYhzrtwynLifJHhpxId/icSTDXGd5AfseD1gB7GO6e
> lJbB+kcZTUPVgiDEFMNIFndNIIWGQcuGYqHTAoTkwxmV/wphbqk4UHXRmoHLaexoNJTG6qhgpqmc
> tFc6uYRkSHUIIFBtV29TDcCcDWsKTYZklteq6TOgt9ZnBwou7dZrpGLdPM/08TbLC2goyXGpw9bc
> aQJPHmqdTDLHaPKJ9cwVFrlIsN5xJo2FQxkbkJ1g4eeJA54RMpDE1R4k2VWMcQ0zFBlvPc6Goypr
> AvC1gKSBvlsqujeuO+ub0SpGJqaUMTlYxWQqriaBvXzelrK+pBhYZVk6WQRYqCyWKRQk65wzZ0y4
> FmQ02gwLudxzcADowpZQDdjnSyUJKuynm4k8genEWkkqRqNPkbEWW0hjX36/lmHbUlPHMMlca43u
> 6nUif2K23EEWI1OO5Ri6e88l3Fj+lCD1b4eHpb9D5npgvXI1gPIPej5nmH5FiYs9rt4FW2nrtcIh
> 6aEvx+pIuFSdqMQ3Du+rNbCg2EDKt3WcTXHoBnFBZ7mMe0ZtBQTqcTHIQNMKinMztVAlkyDzkBqJ
> E+tPXgMT4LVv00GrNX67AZTg56LAlUfWx8LlKUd/Bj7BxFuTyk0HWFY32Ol+tdSolkeLOosKkM55
> 42HaTxuT5bmDdyLuHUfM1+kz7hGzHxbT/jiYnZmKUwYAMtFGtwY799BJEyHcsg8B1hqrv6FylWoL
> Z5PVx8TvOhOSOpnBc/A4iOwf0IrMZRFgLuLzE4HX3KyJfSNwFfd3HIq+OkCg1C5Go5DKcedDikbF
> PnUho81xWJsFA0Hei/Qv+7dULRFKJYoyeZbzvIGY8HGSI8zyDuWYQQqXBBPQ7HkLXX9bEG4yTsud
> 4re4SkHGA5SQayiw2mnmbypxoonVI1BG0SacZViqJE5JDTOBl3hxgI5B0JGstRYypYJPerEwi895
> +w0i2JKKK9qiUc0MrAKZ0G+ZeBlCctYakWRerdOthg9TwAnVXEwV9MxPYB2HQwAvSnMj5FWdrhZA
> ORtiIwLBG/KhJyv4wWBNXGBsCtRInUhG/gcCcQUsFBLYZfAI53ri1hE7EOMJgKQ7/N5MeaeerMz4
> HF7izUYjnK1FZ+D3EnwywGPkP0DzmEzbH5QVQdOZRdwsJIoTAz2DZxPgeqvLjd3RpEq76nD3Wk5N
> 6J6qGJMDoqgea0bT4nsbiCNCj3nXA6kNS3CGg/xdyRThQkLN52vY
> 
> 

-- 
Your Sincerely,
Libing Song
==================================
MySQL Replication Team
Software Engineer


Email : Li-Bing.Song@stripped
Skype : libing.song
MSN   : slb_database@stripped
Phone : +86 010-6505-4020 ext. 319
Mobile: +86 138-1144-2038
==================================

Thread
bzr commit into mysql-5.1-bugteam branch (alfranio.correia:3470)Bug#54238Alfranio Correia8 Jul
  • Re: bzr commit into mysql-5.1-bugteam branch (alfranio.correia:3470)Bug#54238Libing Song23 Jul