database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-12 10:22:39 +03:00
Code Activity

bzr merge -r3933..3945 codership/5.5 (Non-InnoDB changes only).

Browse Source
This commit is contained in:
Nirbhay Choubey
2014-03-25 14:42:15 -04:00
parent 3c0b3babd9
commit 3088d52c20
13 changed files with 93 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sql/sql_connect.cc
View File

@@ -1102,11 +1102,7 @@ bool setup_connection_thread_globals(THD *thd)
{
if (thd->store_globals())
{
#ifdef WITH_WSREP
close_connection(thd, ER_OUT_OF_RESOURCES, 1);
#else
close_connection(thd, ER_OUT_OF_RESOURCES);
#endif
statistic_increment(aborted_connects,&LOCK_status);
MYSQL_CALLBACK(thd->scheduler, end_thread, (thd, 0));
return 1; // Error
@@ -1351,11 +1347,7 @@ void do_handle_one_connection(THD *thd_arg)
if (MYSQL_CALLBACK_ELSE(thd->scheduler, init_new_connection_thread, (), 0))
{
#ifdef WITH_WSREP
close_connection(thd, ER_OUT_OF_RESOURCES, 1);
#else
close_connection(thd, ER_OUT_OF_RESOURCES);
#endif
statistic_increment(aborted_connects,&LOCK_status);
MYSQL_CALLBACK(thd->scheduler, end_thread, (thd, 0));
return;
@@ -1413,13 +1405,9 @@ void do_handle_one_connection(THD *thd_arg)
thd->wsrep_query_state= QUERY_EXITING;
mysql_mutex_unlock(&thd->LOCK_wsrep_thd);
}
#endif
end_thread:
#ifdef WITH_WSREP
close_connection(thd, 0, 1);
#else
close_connection(thd);
#endif
end_thread:
close_connection(thd);
if (thd->userstat_running)
update_global_user_stats(thd, create_user, time(NULL));