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

Merge kpdesk.mysql.com:/home/thek/dev/bug23240/my50-bug23240

Browse Source 
into  kpdesk.mysql.com:/home/thek/dev/bug23240/my51-bug23240
This commit is contained in:
thek@kpdesk.mysql.com
2007-02-19 14:58:59 +01:00
parent 59e3a169a5 19dfc42eb6
commit 58975264a9
5 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_parse.cc
View File

@@ -1205,7 +1205,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))
@@ -1221,7 +1220,6 @@ pthread_handler_t handle_one_connection(void *arg)
sql_print_warning("%s", net->last_error);
}
thd->proc_info=0;
thd->set_time();
thd->init_for_queries();
}
@@ -1355,6 +1353,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)