diff options
| author | unknown <thek@kpdesk.mysql.com> | 2007-02-19 15:24:01 +0100 |
|---|---|---|
| committer | unknown <thek@kpdesk.mysql.com> | 2007-02-19 15:24:01 +0100 |
| commit | a3be5294e63fbd3fbec5bfd6bf81e2249c0f2365 (patch) | |
| tree | b2043a0ee954618356bf59e856ea423598c15d4b /mysql-test | |
| parent | 4386278e611c70d09cafbaf24e53be58c7ad6654 (diff) | |
| parent | a48276798b77fe4846ba5a7f74281cc1c9814357 (diff) | |
| download | mariadb-git-a3be5294e63fbd3fbec5bfd6bf81e2249c0f2365.tar.gz | |
Merge kpdesk.mysql.com:/home/thek/dev/bug23240/my50-bug23240
into kpdesk.mysql.com:/home/thek/dev/mysql-5.0-runtime
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/init_file.result | 7 | ||||
| -rw-r--r-- | mysql-test/std_data/init_file.dat | 9 | ||||
| -rw-r--r-- | mysql-test/t/init_file.test | 9 |
3 files changed, 25 insertions, 0 deletions
diff --git a/mysql-test/r/init_file.result b/mysql-test/r/init_file.result index 1569f2c3d68..6394014f3e5 100644 --- a/mysql-test/r/init_file.result +++ b/mysql-test/r/init_file.result @@ -1,3 +1,10 @@ +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; diff --git a/mysql-test/std_data/init_file.dat b/mysql-test/std_data/init_file.dat index 814e968eb31..cb8e0778438 100644 --- a/mysql-test/std_data/init_file.dat +++ b/mysql-test/std_data/init_file.dat @@ -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() ); + + diff --git a/mysql-test/t/init_file.test b/mysql-test/t/init_file.test index 31a6ef5a541..7c580afadda 100644 --- a/mysql-test/t/init_file.test +++ b/mysql-test/t/init_file.test @@ -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 # |