From b40e3eaecf48c8faa7a4e717f3362cec1c3e910a Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 19 Feb 2007 16:09:55 +0100 Subject: [PATCH] Bug#23240 --init-file statements with NOW() reports '1970-01-01 11:00:00' as the date time - Merged from 5.0 - Removed redundant call to set_time(); now included in init_for_queries sql/ha_ndbcluster.cc: Removed redundant call to set_time(); now included in init_for_queries sql/ha_ndbcluster_binlog.cc: Removed redundant call to set_time(); now included in init_for_queries --- sql/ha_ndbcluster.cc | 1 - sql/ha_ndbcluster_binlog.cc | 1 - 2 files changed, 2 deletions(-) diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index 21697be83aa..b505bc81c66 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -8419,7 +8419,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 38b640d5f55..08307dcb506 100644 --- a/sql/ha_ndbcluster_binlog.cc +++ b/sql/ha_ndbcluster_binlog.cc @@ -3414,7 +3414,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);