summaryrefslogtreecommitdiff
path: root/mysql-test/r/dyncol.result
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2013-07-11 23:16:33 +0200
committerSergei Golubchik <sergii@pisem.net>2013-07-11 23:16:33 +0200
commit4d57bfdd485f45729031295295d78117fc5b3509 (patch)
tree07e73d6239c236adb274afe23ebb6734d2546c43 /mysql-test/r/dyncol.result
parent82403c0bb1c084b00670a51e0555920286512f2e (diff)
downloadmariadb-git-4d57bfdd485f45729031295295d78117fc5b3509.tar.gz
temporal-related changes. don't apply sql_mode flags on the lower level (str_to_datetime),
do it on the upper level, in items that return temporal values. update tests results to match 5.6 better and to fix old bugs.
Diffstat (limited to 'mysql-test/r/dyncol.result')
-rw-r--r--mysql-test/r/dyncol.result4
1 files changed, 1 insertions, 3 deletions
diff --git a/mysql-test/r/dyncol.result b/mysql-test/r/dyncol.result
index 925fb38a0f8..ed7397c2b4f 100644
--- a/mysql-test/r/dyncol.result
+++ b/mysql-test/r/dyncol.result
@@ -1036,9 +1036,7 @@ Warnings:
Warning 1292 Truncated incorrect time value: '2011-13-01 8:46:06.23434'
select column_get(column_create(1, "2011-02-30 8:46:06.23434" AS CHAR), 1 as time);
column_get(column_create(1, "2011-02-30 8:46:06.23434" AS CHAR), 1 as time)
-NULL
-Warnings:
-Warning 1292 Truncated incorrect time value: '2011-02-30 8:46:06.23434'
+08:46:06
select column_get(column_create(1, "2001-02-03"), 1 as time);
column_get(column_create(1, "2001-02-03"), 1 as time)
00:20:01