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

Merging revisions 3934..3944 from codership-mysql/5.5.

Browse Source
This commit is contained in:
Nirbhay Choubey
2014-02-03 22:55:46 -05:00
parent 30b6b39d0b
commit 7ca53d9479
9 changed files with 105 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_parse.cc
View File

@ -622,11 +622,7 @@ void do_handle_bootstrap(THD *thd)
if (my_thread_init() || thd->store_globals())
{
#ifndef EMBEDDED_LIBRARY
#ifdef WITH_WSREP
close_connection(thd, ER_OUT_OF_RESOURCES, 1);
#else
close_connection(thd, ER_OUT_OF_RESOURCES);
#endif /* WITH_WSREP */
#endif
thd->fatal_error();
goto end;