Commit 84b96eb5 authored by thek@kpdesk.mysql.com's avatar thek@kpdesk.mysql.com

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
parent 58975264
...@@ -8419,7 +8419,6 @@ pthread_handler_t ndb_util_thread_func(void *arg __attribute__((unused))) ...@@ -8419,7 +8419,6 @@ pthread_handler_t ndb_util_thread_func(void *arg __attribute__((unused)))
goto ndb_util_thread_fail; goto ndb_util_thread_fail;
thd->init_for_queries(); thd->init_for_queries();
thd->version=refresh_version; thd->version=refresh_version;
thd->set_time();
thd->main_security_ctx.host_or_ip= ""; thd->main_security_ctx.host_or_ip= "";
thd->client_capabilities = 0; thd->client_capabilities = 0;
my_net_init(&thd->net, 0); my_net_init(&thd->net, 0);
......
...@@ -3414,7 +3414,6 @@ pthread_handler_t ndb_binlog_thread_func(void *arg) ...@@ -3414,7 +3414,6 @@ pthread_handler_t ndb_binlog_thread_func(void *arg)
thd->command= COM_DAEMON; thd->command= COM_DAEMON;
thd->system_thread= SYSTEM_THREAD_NDBCLUSTER_BINLOG; thd->system_thread= SYSTEM_THREAD_NDBCLUSTER_BINLOG;
thd->version= refresh_version; thd->version= refresh_version;
thd->set_time();
thd->main_security_ctx.host_or_ip= ""; thd->main_security_ctx.host_or_ip= "";
thd->client_capabilities= 0; thd->client_capabilities= 0;
my_net_init(&thd->net, 0); my_net_init(&thd->net, 0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment