diff options
| author | Andrei Elkin <aelkin@mysql.com> | 2009-11-06 18:35:04 +0200 |
|---|---|---|
| committer | Andrei Elkin <aelkin@mysql.com> | 2009-11-06 18:35:04 +0200 |
| commit | 3c1e1f6d6c7caa8916a03ac9594ff950e6b380e3 (patch) | |
| tree | 44a02955b1dc18fc2e94cd0b4dc6ef62cd81d936 /sql/repl_failsafe.cc | |
| parent | 39f7da882e2a90e8d5eb3f49c4ba361f2b631ad9 (diff) | |
| parent | 0777ef567df6ac183abc45f4ace867e25d6d59a3 (diff) | |
| download | mariadb-git-3c1e1f6d6c7caa8916a03ac9594ff950e6b380e3.tar.gz | |
merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640
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 3d375f906ec..947c3ee0654 100644 --- a/sql/repl_failsafe.cc +++ b/sql/repl_failsafe.cc @@ -637,9 +637,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 |