bk commit into 6.0 tree (kaa:1.2810) BUG#33834

[Alexey Kopytov]

Below is the list of changes that have just been committed into a local
6.0 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-26 16:06:58+03:00, kaa@kaamos.(none) +1 -0
  Post-merge fixes for bug #33834.

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

diff -Nrup a/sql/sql_yacc.yy b/sql/sql_yacc.yy
--- a/sql/sql_yacc.yy	2008-02-25 16:04:21 +03:00
+++ b/sql/sql_yacc.yy	2008-02-26 16:06:57 +03:00
@@ -8050,7 +8050,7 @@ interval_time_stamp:
                                     implementation without changing its
                                     resolution.
                                   */
-                                  WARN_DEPRECATED(yythd, "6.2", "FRAC_SECOND",
"MICROSECOND");
+                                  WARN_DEPRECATED(YYTHD, 6, 2, "FRAC_SECOND",
"MICROSECOND");
                                 }
 	;