From c9ca3a5f800c69ebbfe295492271a50f00ae1082 Mon Sep 17 00:00:00 2001 From: Jaime Crespo Date: Sat, 26 Dec 2015 21:36:52 +0100 Subject: [PATCH 1/2] Replacing reference of SECOND_FRAC (deprecated) for MICROSECOND Bug: 60628 --- sql/item_timefunc.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index 8aecfc7..65ce0c0 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -3176,7 +3176,7 @@ void Item_func_timestamp_diff::print(String *str, enum_query_type query_type) str->append(STRING_WITH_LEN("SECOND")); break; case INTERVAL_MICROSECOND: - str->append(STRING_WITH_LEN("SECOND_FRAC")); + str->append(STRING_WITH_LEN("MICROSECOND")); break; default: break; From 746de4d668bec62ac7315a63396a83a5094882be Mon Sep 17 00:00:00 2001 From: Jaime Crespo Date: Sat, 26 Dec 2015 22:35:46 +0100 Subject: [PATCH 2/2] Adding tests for second_frac deprecation when parsing MICROSECOND Bug: 60628 --- mysql-test/r/second_frac.result | 6 ++++++ mysql-test/t/second_frac.test | 19 +++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 mysql-test/r/second_frac.result create mode 100644 mysql-test/t/second_frac.test diff --git a/mysql-test/r/second_frac.result b/mysql-test/r/second_frac.result new file mode 100644 index 0000000..54fc742 --- /dev/null +++ b/mysql-test/r/second_frac.result @@ -0,0 +1,6 @@ +DROP VIEW IF EXISTS v1; +CREATE VIEW v1 AS SELECT TIMESTAMPDIFF(MICROSECOND, '1970-01-01 00:00:00.000000', '1970-01-01 00:00:00.000001'); +SELECT * FROM v1; +Name_exp_1 +1 +DROP VIEW v1; diff --git a/mysql-test/t/second_frac.test b/mysql-test/t/second_frac.test new file mode 100644 index 0000000..b250784 --- /dev/null +++ b/mysql-test/t/second_frac.test @@ -0,0 +1,19 @@ +# The include statement below is a temp one for tests that are yet to +#be ported to run with InnoDB, +#but needs to be kept for tests that would need MyISAM in future. +--source include/force_myisam_default.inc + +# +# second_frac +# +--disable_warnings +DROP VIEW IF EXISTS v1; +--enable_warnings + +# bug 60628 +CREATE VIEW v1 AS SELECT TIMESTAMPDIFF(MICROSECOND, '1970-01-01 00:00:00.000000', '1970-01-01 00:00:00.000001'); + +SELECT * FROM v1; + +DROP VIEW v1; +# end of bug