database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.

Browse Source
This commit is contained in:
Davi Arnaut
2010-11-16 07:45:07 -02:00
parent b4b3c996af 80246ac8b8
commit 2495e10c11
12 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/slave.cc
View File

@ -2513,7 +2513,7 @@ static int exec_relay_log_event(THD* thd, Relay_log_info* rli)
if (slave_trans_retries)
{
int temp_err;
int UNINIT_VAR(temp_err);
if (exec_res && (temp_err= has_temporary_error(thd)))
{
const char *errmsg;