diff options
| author | unknown <thek@kpdesk.mysql.com> | 2007-02-19 15:24:01 +0100 |
|---|---|---|
| committer | unknown <thek@kpdesk.mysql.com> | 2007-02-19 15:24:01 +0100 |
| commit | a3be5294e63fbd3fbec5bfd6bf81e2249c0f2365 (patch) | |
| tree | b2043a0ee954618356bf59e856ea423598c15d4b /sql/sql_parse.cc | |
| parent | 4386278e611c70d09cafbaf24e53be58c7ad6654 (diff) | |
| parent | a48276798b77fe4846ba5a7f74281cc1c9814357 (diff) | |
| download | mariadb-git-a3be5294e63fbd3fbec5bfd6bf81e2249c0f2365.tar.gz | |
Merge kpdesk.mysql.com:/home/thek/dev/bug23240/my50-bug23240
into kpdesk.mysql.com:/home/thek/dev/mysql-5.0-runtime
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index affa6e130dc..993995e7e8b 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1163,7 +1163,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)) @@ -1179,7 +1178,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(); } @@ -1313,6 +1311,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) |