Commit b40e3eae authored by unknown's avatar unknown
Browse files

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
parent 360947ec

sql/ha_ndbcluster.cc

+0 −1
Original line number Diff line number Diff line
@@ -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);

sql/ha_ndbcluster_binlog.cc

+0 −1
Original line number Diff line number Diff line
@@ -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);