summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorMagne Mahre <magne.mahre@sun.com>2010-02-23 12:17:20 +0100
committerMagne Mahre <magne.mahre@sun.com>2010-02-23 12:17:20 +0100
commit710d571030b9c97fef10968cc217012316106646 (patch)
treea12723eec6fc7b6ea615cdca38457be884449e69 /sql
parent60ef324416e0ededb5fd3fe41285cb32213a2241 (diff)
downloadmariadb-git-710d571030b9c97fef10968cc217012316106646.tar.gz
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".
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_yacc.yy2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 37150bf835d..8dc08f8425f 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -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;
}