mirror of
https://github.com/MariaDB/server.git
synced 2025-09-02 09:41:40 +03:00
Merge kpettersson@bk-internal:/home/bk/mysql-5.1-runtime
into kpdesk.mysql.com:/home/thek/dev/mysql-5.1-runtime
This commit is contained in:
@@ -1210,7 +1210,6 @@ pthread_handler_t handle_one_connection(void *arg)
|
||||
thd->version= refresh_version;
|
||||
thd->proc_info= 0;
|
||||
thd->command= COM_SLEEP;
|
||||
thd->set_time();
|
||||
thd->init_for_queries();
|
||||
|
||||
if (sys_init_connect.value_length && !(sctx->master_access & SUPER_ACL))
|
||||
@@ -1361,6 +1360,7 @@ pthread_handler_t handle_bootstrap(void *arg)
|
||||
mode we have only one thread.
|
||||
*/
|
||||
thd->query_id=next_query_id();
|
||||
thd->set_time();
|
||||
mysql_parse(thd,thd->query,length);
|
||||
close_thread_tables(thd); // Free tables
|
||||
if (thd->is_fatal_error)
|
||||
|
Reference in New Issue
Block a user