Commit 6e8be538 authored by unknown's avatar unknown
Browse files

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

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


sql/sql_parse.cc:
  Auto merged
parents e3495f5f 114e5b8d

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

mysql-test/std_data/init_file.dat

+8 −0
Original line number Diff line number Diff line 
select * from mysql.user as t1, mysql.user as t2, mysql.user as t3;



#

# 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,5 +6,14 @@ 
# 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/sql_parse.cc

+1 −0
Original line number Diff line number Diff line
@@ -1175,6 +1175,7 @@ extern "C" pthread_handler_decl(handle_bootstrap,arg) 
      free_root(thd->mem_root,MYF(MY_KEEP_PREALLOC));

      break;

    }

    thd->set_time();

    mysql_parse(thd,thd->query,length);

    close_thread_tables(thd);			// Free tables

    if (thd->is_fatal_error)