bzr commit into mysql-5.1-bugteam branch (magne.mahre:3352) Bug#47974

[Magne Mahre]

#At file:///export/home/tmp/z/mysql-5.1-bugteam/ based on revid:timothy.smith@stripped

 3352 Magne Mahre	2010-02-23
      Revert of a change introduced by Bug#47974
      
      "TYPE=storage_engine" is deprecated, and will be removed
      in the Celosia release of MySQL.  Since the option is
      present in the Betony release and the version number of
      Celosia is still not decided, we need to bump the
      deprecation version number back up to "6.0".

    modified:
      sql/sql_yacc.yy
=== modified file 'sql/sql_yacc.yy'
--- a/sql/sql_yacc.yy	2010-02-09 10:30:50 +0000
+++ b/sql/sql_yacc.yy	2010-02-23 11:17:20 +0000
@@ -4596,7 +4596,7 @@ create_table_option:
         | TYPE_SYM opt_equal storage_engines
           {
             Lex->create_info.db_type= $3;
-            WARN_DEPRECATED(yythd, "5.4.4", "TYPE=storage_engine",
+            WARN_DEPRECATED(yythd, "6.0", "TYPE=storage_engine",
                             "'ENGINE=storage_engine'");
             Lex->create_info.used_fields|= HA_CREATE_USED_ENGINE;
           }


Attachment: [text/bzr-bundle] bzr/[e-mail]