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

Merge 5.3->5.5

Browse Source
This commit is contained in:
Alexander Barkov
2013-10-16 18:17:51 +04:00
parent 5064d03b80 bff85079d3
commit 11005f3413
4 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/slave.cc
View File

@ -3377,6 +3377,7 @@ err_during_init:
DBUG_LEAVE; // Must match DBUG_ENTER()
my_thread_end();
ERR_remove_state(0);
pthread_exit(0);
return 0; // Avoid compiler warnings
}
@ -3782,6 +3783,7 @@ err_during_init:
DBUG_LEAVE; // Must match DBUG_ENTER()
my_thread_end();
ERR_remove_state(0);
pthread_exit(0);
return 0; // Avoid compiler warnings
}