database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge from 5.3

Browse Source
This commit is contained in:
Alexander Barkov
2014-04-18 13:41:15 +04:00
parent f7a47e137b 8db600f951
commit 1c6d508a2b
11 changed files with 235 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mysql-test/suite/funcs_1/r/innodb_func_view.result
View File

@ -4302,10 +4302,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
@ -4314,10 +4316,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;

12
mysql-test/suite/funcs_1/r/memory_func_view.result
View File

@ -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;

12
mysql-test/suite/funcs_1/r/myisam_func_view.result
View File

@ -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;