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

Manual merge from mysql-trunk-merge.

Browse Source
This commit is contained in:
Alexander Nozdrin
2009-10-14 12:25:39 +04:00
parent 946dc457fa 32e51de7f5
commit ca08f10ccd
170 changed files with 7269 additions and 526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/repl_failsafe.cc
View File

@ -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