summaryrefslogtreecommitdiff
path: root/mysql-test/std_data
diff options
context:
space:
mode:
authorunknown <thek@kpdesk.mysql.com>2007-02-19 14:58:59 +0100
committerunknown <thek@kpdesk.mysql.com>2007-02-19 14:58:59 +0100
commit360947ec8dd04df7a0d357f0ea683e85acf72981 (patch)
tree64c5cfb60fa1e6c851d04df7bd0b4b4ed01916dd /mysql-test/std_data
parentae6cc963a7a177fd54c8c55b6b1189d32dd0c324 (diff)
parenta48276798b77fe4846ba5a7f74281cc1c9814357 (diff)
downloadmariadb-git-360947ec8dd04df7a0d357f0ea683e85acf72981.tar.gz
Merge kpdesk.mysql.com:/home/thek/dev/bug23240/my50-bug23240
into kpdesk.mysql.com:/home/thek/dev/bug23240/my51-bug23240 sql/sql_class.cc: Auto merged sql/sql_parse.cc: Auto merged
Diffstat (limited to 'mysql-test/std_data')
-rw-r--r--mysql-test/std_data/init_file.dat9
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() );
+
+