summaryrefslogtreecommitdiff
path: root/mysql-test/r/func_sapdb.result
diff options
context:
space:
mode:
authorunknown <tnurnberg@sin.intern.azundris.com>2007-10-12 11:46:48 +0200
committerunknown <tnurnberg@sin.intern.azundris.com>2007-10-12 11:46:48 +0200
commit91f6d169a667721dabb398cefb56d687fb0e57e2 (patch)
tree82b0ba8c6fa3878dd5d6f9923ac6dce9e838d945 /mysql-test/r/func_sapdb.result
parent5a6b519a2f3b6a2ac3e6375b2111cdfe43a5aff3 (diff)
downloadmariadb-git-91f6d169a667721dabb398cefb56d687fb0e57e2.tar.gz
Bug#30951: makedate returns different results depending on version of mysql
makedate() will fold years below 100 into the 1970-2069 range. CS removes code that also wrongly folded years between 100 and 200 into that range, which should be left unchanged. Backport from 5.1. mysql-test/r/func_sapdb.result: Show that makedate() works correctly for 100 <= year < 200. mysql-test/t/func_sapdb.test: Show that makedate() works correctly for 100 <= year < 200. sql-common/my_time.c: Remove unnecessary date magic. Syncs behaviour with 5.1+ and manual.
Diffstat (limited to 'mysql-test/r/func_sapdb.result')
-rw-r--r--mysql-test/r/func_sapdb.result3
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/r/func_sapdb.result b/mysql-test/r/func_sapdb.result
index dbae7e551e5..ba66ac3bc94 100644
--- a/mysql-test/r/func_sapdb.result
+++ b/mysql-test/r/func_sapdb.result
@@ -93,6 +93,9 @@ makedate(9999,365)
select makedate(9999,366);
makedate(9999,366)
NULL
+select makedate(100,1);
+makedate(100,1)
+0100-01-01
select addtime("1997-12-31 23:59:59.999999", "1 1:1:1.000002");
addtime("1997-12-31 23:59:59.999999", "1 1:1:1.000002")
1998-01-02 01:01:01.000001