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

into  kpdesk.mysql.com:/home/thek/dev/bug23240/my50-bug23240

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
 #