summaryrefslogtreecommitdiff
path: root/mysql-test/std_data
diff options
context:
space:
mode:
authormalff/marcsql@weblab.(none) <>2007-03-01 14:06:57 -0700
committermalff/marcsql@weblab.(none) <>2007-03-01 14:06:57 -0700
commitdf5c5aea23b4e66dc93ec2501fa2c841497e3c46 (patch)
tree5a34f3dfd4f42f36968f10971e3d69ddc1b94e94 /mysql-test/std_data
parent2f5a2b2476a0ca43d0a5bdfb979b427ff806839f (diff)
parent7d98fb7e33de4f1bf62854ee115a5301c2506860 (diff)
downloadmariadb-git-df5c5aea23b4e66dc93ec2501fa2c841497e3c46.tar.gz
Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base
into weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge
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() );
+
+