1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Automerged (cherrypicked) cset from 5.6:

Browse Source 
zhenxing.he@sun.com-20101202073812-iel8lvhmulyagtsv

This takes care of valgrind warnings in 5.5 that exhibit
the same trace as in BUG#11763880 (BUG#56650).
This commit is contained in:
Luis Soares 2011-05-04 14:07:59 +01:00
parent 0e647bc72d
commit 47ef8f3452
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugin/semisync/semisync_slave_plugin.cc
View File

@ -53,7 +53,6 @@ int repl_semi_slave_request_dump(Binlog_relay_IO_param *param,
if (mysql_real_query(mysql, query, strlen(query)) || if (mysql_real_query(mysql, query, strlen(query)) ||
!(res= mysql_store_result(mysql))) !(res= mysql_store_result(mysql)))
{ {
mysql_free_result(mysql_store_result(mysql));
sql_print_error("Execution failed on master: %s", query); sql_print_error("Execution failed on master: %s", query);
return 1; return 1;
} }
@ -65,8 +64,10 @@ int repl_semi_slave_request_dump(Binlog_relay_IO_param *param,
sql_print_warning("Master server does not support semi-sync, " sql_print_warning("Master server does not support semi-sync, "
"fallback to asynchronous replication"); "fallback to asynchronous replication");
rpl_semi_sync_slave_status= 0; rpl_semi_sync_slave_status= 0;
mysql_free_result(res);
return 0; return 0;
} }
mysql_free_result(res);
/* /*
Tell master dump thread that we want to do semi-sync Tell master dump thread that we want to do semi-sync
@ -76,7 +77,6 @@ int repl_semi_slave_request_dump(Binlog_relay_IO_param *param,
if (mysql_real_query(mysql, query, strlen(query))) if (mysql_real_query(mysql, query, strlen(query)))
{ {
sql_print_error("Set 'rpl_semi_sync_slave=1' on master failed"); sql_print_error("Set 'rpl_semi_sync_slave=1' on master failed");
mysql_free_result(mysql_store_result(mysql));
return 1; return 1;
} }
mysql_free_result(mysql_store_result(mysql)); mysql_free_result(mysql_store_result(mysql));