diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-02-28 13:16:17 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-02-28 13:16:17 +0100 |
| commit | ec89275da79a07e8906a6635c97c8925f9610bef (patch) | |
| tree | caa489ac345c382cb2c2d1d7c4ca5ec4989090f1 /sql/sql_connect.cc | |
| parent | f0c682858f26efcebabb558068aa567eed44632e (diff) | |
| parent | b64a2fef59bf7269a51884e74197d78c5ff203ff (diff) | |
| download | mariadb-git-ec89275da79a07e8906a6635c97c8925f9610bef.tar.gz | |
merge threadpool
Diffstat (limited to 'sql/sql_connect.cc')
| -rw-r--r-- | sql/sql_connect.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_connect.cc b/sql/sql_connect.cc index 3e3f622288e..4784d44ede7 100644 --- a/sql/sql_connect.cc +++ b/sql/sql_connect.cc @@ -891,6 +891,7 @@ static int check_connection(THD *thd) DBUG_PRINT("info", ("New connection received on %s", vio_description(net->vio))); + #ifdef SIGNAL_WITH_VIO_CLOSE thd->set_active_vio(net->vio); #endif @@ -1202,7 +1203,7 @@ void do_handle_one_connection(THD *thd_arg) /* We need to set this because of time_out_user_resource_limits */ thd->start_utime= thd->thr_create_utime; - if (MYSQL_CALLBACK_ELSE(thread_scheduler, init_new_connection_thread, (), 0)) + if (MYSQL_CALLBACK_ELSE(thd->scheduler, init_new_connection_thread, (), 0)) { close_connection(thd, ER_OUT_OF_RESOURCES); statistic_increment(aborted_connects,&LOCK_status); |