diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-03-25 14:42:15 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-03-25 14:42:15 -0400 |
| commit | 3088d52c20eca10e5b8689648edef8f7fd49830a (patch) | |
| tree | fc75c000b47e753c04cb2c74e48d8b74d22a509f /sql/sql_connect.cc | |
| parent | 3c0b3babd9fdaa6d6697289368022cc152c77593 (diff) | |
| download | mariadb-git-3088d52c20eca10e5b8689648edef8f7fd49830a.tar.gz | |
bzr merge -r3933..3945 codership/5.5 (Non-InnoDB changes only).
Diffstat (limited to 'sql/sql_connect.cc')
| -rw-r--r-- | sql/sql_connect.cc | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/sql/sql_connect.cc b/sql/sql_connect.cc index 03d9a804372..843a3a812dc 100644 --- a/sql/sql_connect.cc +++ b/sql/sql_connect.cc @@ -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 +#endif end_thread: -#ifdef WITH_WSREP - close_connection(thd, 0, 1); -#else close_connection(thd); -#endif if (thd->userstat_running) update_global_user_stats(thd, create_user, time(NULL)); |