summaryrefslogtreecommitdiff
path: root/mysql-test/suite/funcs_1/r/myisam_func_view.result
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mnogosearch.org>2014-04-18 13:41:15 +0400
committerAlexander Barkov <bar@mnogosearch.org>2014-04-18 13:41:15 +0400
commit1c6d508a2b9dd1dfaeb68b3443212b57190950d8 (patch)
tree55284120225d0e51fbcc82abf411062b3e7bdfd9 /mysql-test/suite/funcs_1/r/myisam_func_view.result
parentf7a47e137b18277db676c1e241d06664594208d1 (diff)
parent8db600f951005b0b23b23dcd0ddd848303aa13ac (diff)
downloadmariadb-git-1c6d508a2b9dd1dfaeb68b3443212b57190950d8.tar.gz
Merge from 5.3
Diffstat (limited to 'mysql-test/suite/funcs_1/r/myisam_func_view.result')
-rw-r--r--mysql-test/suite/funcs_1/r/myisam_func_view.result12
1 files changed, 8 insertions, 4 deletions
diff --git a/mysql-test/suite/funcs_1/r/myisam_func_view.result b/mysql-test/suite/funcs_1/r/myisam_func_view.result
index 9fa90797497..43703aa7ead 100644
--- a/mysql-test/suite/funcs_1/r/myisam_func_view.result
+++ b/mysql-test/suite/funcs_1/r/myisam_func_view.result
@@ -4303,10 +4303,12 @@ my_time, id FROM t1_values
WHERE select_id = 35 OR select_id IS NULL order by id;
CAST(my_time AS DATE) my_time id
NULL NULL 1
-0000-00-00 -838:59:59 2
-0000-00-00 838:59:59 3
+NULL -838:59:59 2
+0000-01-03 838:59:59 3
0000-00-00 13:00:00 4
0000-00-00 10:00:00 5
+Warnings:
+Warning 1292 Truncated incorrect date value: '-838:59:59'
SHOW CREATE VIEW v1;
View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as date) AS `CAST(my_time AS DATE)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci
@@ -4315,10 +4317,12 @@ WHERE v1.id IN (SELECT id FROM t1_values
WHERE select_id = 35 OR select_id IS NULL) order by id;
CAST(my_time AS DATE) my_time id
NULL NULL 1
-0000-00-00 -838:59:59 2
-0000-00-00 838:59:59 3
+NULL -838:59:59 2
+0000-01-03 838:59:59 3
0000-00-00 13:00:00 4
0000-00-00 10:00:00 5
+Warnings:
+Warning 1292 Truncated incorrect date value: '-838:59:59'
DROP VIEW v1;