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

BUG#12425924

Browse Source 
Automerging cset into latest mysql-5.5.
This commit is contained in:
Luis Soares 2011-05-06 00:16:20 +01:00
commit 9b5ca1b9f4
2 changed files with 5 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));

3
sql/rpl_handler.h
View File

@ -73,7 +73,10 @@ public:
while (info && info->observer != observer) while (info && info->observer != observer)
info= iter++; info= iter++;
if (info) if (info)
{
iter.remove(); iter.remove();
delete info;
}
else else
ret= TRUE; ret= TRUE;
unlock(); unlock();