Commit cfad743d authored by unknown's avatar unknown
Browse files

Merge kpettersson@bk-internal:/home/bk/mysql-5.1-runtime 

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


sql/sql_parse.cc:
  SCCS merged
parents d827ae3a 0d6e4979

mysql-test/r/init_file.result

+7 −0
Original line number Diff line number Diff line 
INSERT INTO init_file.startup VALUES ( NOW() );

SELECT * INTO @X FROM init_file.startup limit 0,1;

SELECT * INTO @Y FROM init_file.startup limit 1,1;

SELECT YEAR(@X)-YEAR(@Y);

YEAR(@X)-YEAR(@Y)

0

DROP DATABASE init_file;

ok

end of 4.1 tests

select * from t1;

mysql-test/std_data/init_file.dat

+9 −0
Original line number Diff line number Diff line
@@ -27,3 +27,12 @@ insert into t2 values (11), (13); 
drop procedure p1;

drop function f1;

drop view v1;



#

# Bug#23240 --init-file statements with NOW() reports '1970-01-01 11:00:00'as the date time

#

CREATE DATABASE IF NOT EXISTS init_file;

CREATE TABLE IF NOT EXISTS init_file.startup ( startdate DATETIME );

INSERT INTO init_file.startup VALUES ( NOW() );

mysql-test/t/init_file.test

+9 −0
Original line number Diff line number Diff line
@@ -6,6 +6,15 @@ 
# mysql-test/t/init_file-master.opt for the actual test

#



#

# Bug#23240 --init-file statements with NOW() reports '1970-01-01 11:00:00'as the date time

#

INSERT INTO init_file.startup VALUES ( NOW() );

SELECT * INTO @X FROM init_file.startup limit 0,1;

SELECT * INTO @Y FROM init_file.startup limit 1,1;

SELECT YEAR(@X)-YEAR(@Y);

DROP DATABASE init_file;



--echo ok

--echo end of 4.1 tests

#

sql/ha_ndbcluster.cc

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

sql/ha_ndbcluster_binlog.cc

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