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

into  kpdesk.mysql.com:/home/thek/dev/mysql-5.1-runtime


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

4 files changed, 2 insertions, 4 deletions

diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index a65ca1c6736..5ad830cf299 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -8534,7 +8534,6 @@ pthread_handler_t ndb_util_thread_func(void *arg __attribute__((unused)))
     goto ndb_util_thread_fail;
   thd->init_for_queries();
   thd->version=refresh_version;
-  thd->set_time();
   thd->main_security_ctx.host_or_ip= "";
   thd->client_capabilities = 0;
   my_net_init(&thd->net, 0);
diff --git a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc
index ea5a2deaeb3..b4b1cfd7da7 100644
--- a/sql/ha_ndbcluster_binlog.cc
+++ b/sql/ha_ndbcluster_binlog.cc
@@ -3496,7 +3496,6 @@ pthread_handler_t ndb_binlog_thread_func(void *arg)
   thd->command= COM_DAEMON;
   thd->system_thread= SYSTEM_THREAD_NDBCLUSTER_BINLOG;
   thd->version= refresh_version;
-  thd->set_time();
   thd->main_security_ctx.host_or_ip= "";
   thd->client_capabilities= 0;
   my_net_init(&thd->net, 0);
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index d5f81168be3..8dbf9375634 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -357,6 +357,7 @@ void THD::init(void)
 
 void THD::init_for_queries()
 {
+  set_time(); 
   ha_enable_transaction(this,TRUE);
 
   reset_root_defaults(mem_root, variables.query_alloc_block_size,
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 6cd8db421ea..739c9d419c4 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -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))
@@ -1226,7 +1225,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();
     }
 
@@ -1364,6 +1362,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)