mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 10:14:19 +01:00
Merge kaamos.(none):/data/src/opt/bug33834/my50-bug33834
into kaamos.(none):/data/src/opt/bug33834/my51-bug33834 mysql-test/r/func_time.result: Auto merged mysql-test/t/func_time.test: Auto merged sql/sql_yacc.yy: Manual merge.
This commit is contained in:
unknown
commit
c6d141a5c9
3 changed files with 69 additions and 6 deletions
|
|
@ -666,6 +666,8 @@ timestampadd(SQL_TSI_SECOND, 1, date)
|
|||
select timestampadd(SQL_TSI_FRAC_SECOND, 1, date) from t1;
|
||||
timestampadd(SQL_TSI_FRAC_SECOND, 1, date)
|
||||
2003-01-02 00:00:00.000001
|
||||
Warnings:
|
||||
Warning 1287 'FRAC_SECOND' is deprecated; use 'MICROSECOND' instead
|
||||
select timestampdiff(MONTH, '2001-02-01', '2001-05-01') as a;
|
||||
a
|
||||
3
|
||||
|
|
@ -699,6 +701,8 @@ a
|
|||
select timestampdiff(SQL_TSI_FRAC_SECOND, '2001-02-01 12:59:59.120000', '2001-05-01 12:58:58.119999') as a;
|
||||
a
|
||||
7689538999999
|
||||
Warnings:
|
||||
Warning 1287 'FRAC_SECOND' is deprecated; use 'MICROSECOND' instead
|
||||
select timestampdiff(SQL_TSI_DAY, '1986-02-01', '1986-03-01') as a1,
|
||||
timestampdiff(SQL_TSI_DAY, '1900-02-01', '1900-03-01') as a2,
|
||||
timestampdiff(SQL_TSI_DAY, '1996-02-01', '1996-03-01') as a3,
|
||||
|
|
@ -1069,6 +1073,7 @@ timestampdiff(SQL_TSI_FRAC_SECOND, '2001-02-01 12:59:59.120000', '2001-05-01 12:
|
|||
id select_type table type possible_keys key key_len ref rows filtered Extra
|
||||
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL No tables used
|
||||
Warnings:
|
||||
Warning 1287 'FRAC_SECOND' is deprecated; use 'MICROSECOND' instead
|
||||
Note 1003 select timestampdiff(WEEK,_latin1'2001-02-01',_latin1'2001-05-01') AS `a1`,timestampdiff(SECOND_FRAC,_latin1'2001-02-01 12:59:59.120000',_latin1'2001-05-01 12:58:58.119999') AS `a2`
|
||||
select time_format('100:00:00', '%H %k %h %I %l');
|
||||
time_format('100:00:00', '%H %k %h %I %l')
|
||||
|
|
@ -1261,6 +1266,24 @@ DATE_ADD(20071108, INTERVAL 1 DAY)
|
|||
select LAST_DAY('2007-12-06 08:59:19.05') - INTERVAL 1 SECOND;
|
||||
LAST_DAY('2007-12-06 08:59:19.05') - INTERVAL 1 SECOND
|
||||
2007-12-30 23:59:59
|
||||
SELECT TIMESTAMPADD(FRAC_SECOND, 1, '2008-02-18');
|
||||
TIMESTAMPADD(FRAC_SECOND, 1, '2008-02-18')
|
||||
2008-02-18 00:00:00.000001
|
||||
Warnings:
|
||||
Warning 1287 'FRAC_SECOND' is deprecated; use 'MICROSECOND' instead
|
||||
SELECT TIMESTAMPDIFF(FRAC_SECOND, '2008-02-17', '2008-02-18');
|
||||
TIMESTAMPDIFF(FRAC_SECOND, '2008-02-17', '2008-02-18')
|
||||
86400000000
|
||||
Warnings:
|
||||
Warning 1287 'FRAC_SECOND' is deprecated; use 'MICROSECOND' instead
|
||||
SELECT DATE_ADD('2008-02-18', INTERVAL 1 FRAC_SECOND);
|
||||
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'FRAC_SECOND)' at line 1
|
||||
SELECT DATE_SUB('2008-02-18', INTERVAL 1 FRAC_SECOND);
|
||||
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'FRAC_SECOND)' at line 1
|
||||
SELECT '2008-02-18' + INTERVAL 1 FRAC_SECOND;
|
||||
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'FRAC_SECOND' at line 1
|
||||
SELECT '2008-02-18' - INTERVAL 1 FRAC_SECOND;
|
||||
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'FRAC_SECOND' at line 1
|
||||
End of 5.0 tests
|
||||
select date_sub("0050-01-01 00:00:01",INTERVAL 2 SECOND);
|
||||
date_sub("0050-01-01 00:00:01",INTERVAL 2 SECOND)
|
||||
|
|
|
|||
|
|
@ -783,6 +783,25 @@ select DATE_ADD(20071108, INTERVAL 1 DAY);
|
|||
|
||||
select LAST_DAY('2007-12-06 08:59:19.05') - INTERVAL 1 SECOND;
|
||||
|
||||
#
|
||||
# Bug#33834: FRAC_SECOND: Applicability not clear in documentation
|
||||
#
|
||||
# Show that he use of FRAC_SECOND, for anything other than
|
||||
# TIMESTAMPADD / TIMESTAMPDIFF, is a server error.
|
||||
|
||||
SELECT TIMESTAMPADD(FRAC_SECOND, 1, '2008-02-18');
|
||||
SELECT TIMESTAMPDIFF(FRAC_SECOND, '2008-02-17', '2008-02-18');
|
||||
|
||||
--error ER_PARSE_ERROR
|
||||
SELECT DATE_ADD('2008-02-18', INTERVAL 1 FRAC_SECOND);
|
||||
--error ER_PARSE_ERROR
|
||||
SELECT DATE_SUB('2008-02-18', INTERVAL 1 FRAC_SECOND);
|
||||
|
||||
--error ER_PARSE_ERROR
|
||||
SELECT '2008-02-18' + INTERVAL 1 FRAC_SECOND;
|
||||
--error ER_PARSE_ERROR
|
||||
SELECT '2008-02-18' - INTERVAL 1 FRAC_SECOND;
|
||||
|
||||
--echo End of 5.0 tests
|
||||
|
||||
#
|
||||
|
|
|
|||
|
|
@ -508,10 +508,10 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
|
|||
|
||||
%pure_parser /* We have threads */
|
||||
/*
|
||||
Currently there are 177 shift/reduce conflicts.
|
||||
Currently there are 172 shift/reduce conflicts.
|
||||
We should not introduce new conflicts any more.
|
||||
*/
|
||||
%expect 177
|
||||
%expect 172
|
||||
|
||||
/*
|
||||
Comments for TOKENS.
|
||||
|
|
@ -1201,6 +1201,8 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
|
|||
|
||||
%type <interval_time_st> interval_time_st
|
||||
|
||||
%type <interval_time_st> interval_time_stamp
|
||||
|
||||
%type <db_type> storage_engines known_storage_engines
|
||||
|
||||
%type <row_type> row_types
|
||||
|
|
@ -6900,9 +6902,9 @@ function_call_nonkeyword:
|
|||
$$= new (YYTHD->mem_root) Item_func_now_local($3);
|
||||
Lex->safe_to_cache_query=0;
|
||||
}
|
||||
| TIMESTAMP_ADD '(' interval_time_st ',' expr ',' expr ')'
|
||||
| TIMESTAMP_ADD '(' interval_time_stamp ',' expr ',' expr ')'
|
||||
{ $$= new (YYTHD->mem_root) Item_date_add_interval($7,$5,$3,0); }
|
||||
| TIMESTAMP_DIFF '(' interval_time_st ',' expr ',' expr ')'
|
||||
| TIMESTAMP_DIFF '(' interval_time_stamp ',' expr ',' expr ')'
|
||||
{ $$= new (YYTHD->mem_root) Item_func_timestamp_diff($5,$7,$3); }
|
||||
| UTC_DATE_SYM optional_braces
|
||||
{
|
||||
|
|
@ -7874,22 +7876,41 @@ interval:
|
|||
| HOUR_MICROSECOND_SYM { $$=INTERVAL_HOUR_MICROSECOND; }
|
||||
| HOUR_MINUTE_SYM { $$=INTERVAL_HOUR_MINUTE; }
|
||||
| HOUR_SECOND_SYM { $$=INTERVAL_HOUR_SECOND; }
|
||||
| MICROSECOND_SYM { $$=INTERVAL_MICROSECOND; }
|
||||
| MINUTE_MICROSECOND_SYM { $$=INTERVAL_MINUTE_MICROSECOND; }
|
||||
| MINUTE_SECOND_SYM { $$=INTERVAL_MINUTE_SECOND; }
|
||||
| SECOND_MICROSECOND_SYM { $$=INTERVAL_SECOND_MICROSECOND; }
|
||||
| YEAR_MONTH_SYM { $$=INTERVAL_YEAR_MONTH; }
|
||||
;
|
||||
|
||||
interval_time_stamp:
|
||||
interval_time_st {}
|
||||
| FRAC_SECOND_SYM {
|
||||
$$=INTERVAL_MICROSECOND;
|
||||
/*
|
||||
FRAC_SECOND was mistakenly implemented with
|
||||
a wrong resolution. According to the ODBC
|
||||
standard it should be nanoseconds, not
|
||||
microseconds. Changing it to nanoseconds
|
||||
in MySQL would mean making TIMESTAMPDIFF
|
||||
and TIMESTAMPADD to return DECIMAL, since
|
||||
the return value would be too big for BIGINT
|
||||
Hence we just deprecate the incorrect
|
||||
implementation without changing its
|
||||
resolution.
|
||||
*/
|
||||
WARN_DEPRECATED(yythd, "6.2", "FRAC_SECOND", "MICROSECOND");
|
||||
}
|
||||
;
|
||||
|
||||
interval_time_st:
|
||||
DAY_SYM { $$=INTERVAL_DAY; }
|
||||
| WEEK_SYM { $$=INTERVAL_WEEK; }
|
||||
| HOUR_SYM { $$=INTERVAL_HOUR; }
|
||||
| FRAC_SECOND_SYM { $$=INTERVAL_MICROSECOND; }
|
||||
| MINUTE_SYM { $$=INTERVAL_MINUTE; }
|
||||
| MONTH_SYM { $$=INTERVAL_MONTH; }
|
||||
| QUARTER_SYM { $$=INTERVAL_QUARTER; }
|
||||
| SECOND_SYM { $$=INTERVAL_SECOND; }
|
||||
| MICROSECOND_SYM { $$=INTERVAL_MICROSECOND; }
|
||||
| YEAR_SYM { $$=INTERVAL_YEAR; }
|
||||
;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue