database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-31 22:22:30 +03:00
Code Activity

Merge fix.

Browse Source
This commit is contained in:
Jan Lindström
2013-09-09 10:38:58 +03:00
parent 0880db5640
commit 9c85ced30d
13 changed files with 857 additions and 634 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_repl.cc
View File

@@ -2815,6 +2815,15 @@ int start_slave(THD* thd , Master_info* mi, bool net_report)
err:
unlock_slave_threads(mi);
#ifdef WITH_WSREP
if (WSREP(thd))
thd_proc_info(thd, "exit stop_slave()");
else
thd_proc_info(thd, 0);
#else /* WITH_WSREP */
thd_proc_info(thd, 0);
#endif /* WITH_WSREP */
if (slave_errno)
{
if (net_report)