diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-10-14 12:25:39 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-10-14 12:25:39 +0400 |
| commit | c30d924dd5485f24818264d8e533820bcf1bcba0 (patch) | |
| tree | 1b3260f72106f50b182546dff41127a389144fa1 /sql/repl_failsafe.cc | |
| parent | 829525756e7a769b0c0de716f6207f5f21daa994 (diff) | |
| parent | 310833ff2e6a3c1e3ef397e78605661eee430198 (diff) | |
| download | mariadb-git-c30d924dd5485f24818264d8e533820bcf1bcba0.tar.gz | |
Manual merge from mysql-trunk-merge.
Diffstat (limited to 'sql/repl_failsafe.cc')
| -rw-r--r-- | sql/repl_failsafe.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc index e470317abef..8963532e192 100644 --- a/sql/repl_failsafe.cc +++ b/sql/repl_failsafe.cc @@ -638,9 +638,11 @@ err: if (recovery_captain) mysql_close(recovery_captain); delete thd; + + DBUG_LEAVE; // Must match DBUG_ENTER() my_thread_end(); pthread_exit(0); - DBUG_RETURN(0); + return 0; // Avoid compiler warnings } #endif |