diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-10-23 15:22:21 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-10-23 15:22:21 +0400 |
| commit | 2dc132b209ef375d7d36a41a2429be001d8e5f45 (patch) | |
| tree | 9a94748e3f29d58645ae7979faaf09464080033d /sql/repl_failsafe.cc | |
| parent | f3d58bae2011dc043d75268a98e65731da622603 (diff) | |
| parent | 75116feb4b8976df3078f288f31fec7f46462461 (diff) | |
| download | mariadb-git-2dc132b209ef375d7d36a41a2429be001d8e5f45.tar.gz | |
Merge from mysql-next-mr.
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 62e05ea25b7..c6c7f185080 100644 --- a/sql/repl_failsafe.cc +++ b/sql/repl_failsafe.cc @@ -639,9 +639,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 |