bk commit into 5.1 tree (kaa:1.2668) BUG#33834

[Alexey Kopytov]

Below is the list of changes that have just been committed into a local
5.1 repository of kaa.  When kaa does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-02-25 16:03:28+03:00, kaa@kaamos.(none) +2 -0
  Post-merge fixes for bug #33834.

  mysql-test/r/func_time.result@stripped, 2008-02-25 16:03:27+03:00, kaa@kaamos.(none) +5 -5
    Post-merge fixes for bug #33834.

  sql/sql_yacc.yy@stripped, 2008-02-25 16:03:27+03:00, kaa@kaamos.(none) +2 -2
    Post-merge fixes for bug #33834.

diff -Nrup a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result
--- a/mysql-test/r/func_time.result	2008-02-25 13:28:16 +03:00
+++ b/mysql-test/r/func_time.result	2008-02-25 16:03:27 +03:00
@@ -667,7 +667,7 @@ select timestampadd(SQL_TSI_FRAC_SECOND,
 timestampadd(SQL_TSI_FRAC_SECOND, 1, date)
 2003-01-02 00:00:00.000001
 Warnings:
-Warning	1287	'FRAC_SECOND' is deprecated; use 'MICROSECOND' instead
+Warning	1287	The syntax 'FRAC_SECOND' is deprecated and will be removed in MySQL 6.2.
Please use MICROSECOND instead
 select timestampdiff(MONTH, '2001-02-01', '2001-05-01') as a;
 a
 3
@@ -702,7 +702,7 @@ select timestampdiff(SQL_TSI_FRAC_SECOND
 a
 7689538999999
 Warnings:
-Warning	1287	'FRAC_SECOND' is deprecated; use 'MICROSECOND' instead
+Warning	1287	The syntax 'FRAC_SECOND' is deprecated and will be removed in MySQL 6.2.
Please 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,
@@ -1073,7 +1073,7 @@ timestampdiff(SQL_TSI_FRAC_SECOND, '2001
 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
+Warning	1287	The syntax 'FRAC_SECOND' is deprecated and will be removed in MySQL 6.2.
Please 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')
@@ -1270,12 +1270,12 @@ SELECT TIMESTAMPADD(FRAC_SECOND, 1, '200
 TIMESTAMPADD(FRAC_SECOND, 1, '2008-02-18')
 2008-02-18 00:00:00.000001
 Warnings:
-Warning	1287	'FRAC_SECOND' is deprecated; use 'MICROSECOND' instead
+Warning	1287	The syntax 'FRAC_SECOND' is deprecated and will be removed in MySQL 6.2.
Please 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
+Warning	1287	The syntax 'FRAC_SECOND' is deprecated and will be removed in MySQL 6.2.
Please 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);
diff -Nrup a/sql/sql_yacc.yy b/sql/sql_yacc.yy
--- a/sql/sql_yacc.yy	2008-02-25 13:40:42 +03:00
+++ b/sql/sql_yacc.yy	2008-02-25 16:03:27 +03:00
@@ -508,10 +508,10 @@ bool my_yyoverflow(short **a, YYSTYPE **
 
 %pure_parser                                    /* We have threads */
 /*
-  Currently there are 172 shift/reduce conflicts.
+  Currently there are 177 shift/reduce conflicts.
   We should not introduce new conflicts any more.
 */
-%expect 172
+%expect 177
 
 /*
    Comments for TOKENS.