diff options
| author | unknown <malff/marcsql@weblab.(none)> | 2007-03-01 14:06:57 -0700 |
|---|---|---|
| committer | unknown <malff/marcsql@weblab.(none)> | 2007-03-01 14:06:57 -0700 |
| commit | 57b6c86411304a4e521eeee22d1a7545ec28f6a0 (patch) | |
| tree | 5a34f3dfd4f42f36968f10971e3d69ddc1b94e94 /mysql-test/std_data | |
| parent | 3616b5e3d574de6863cb9aaa6a642ba67401956b (diff) | |
| parent | d9227f159fccfc5167920f48297d5a7ac24a7a1b (diff) | |
| download | mariadb-git-57b6c86411304a4e521eeee22d1a7545ec28f6a0.tar.gz | |
Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base
into weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/disabled.def:
Auto merged
server-tools/instance-manager/instance_options.cc:
Auto merged
server-tools/instance-manager/mysqlmanager.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_subselect.h:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'mysql-test/std_data')
| -rw-r--r-- | mysql-test/std_data/init_file.dat | 9 |
1 files changed, 9 insertions, 0 deletions
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() ); + + |