diff options
author | Mattias Jonsson <mattias.jonsson@sun.com> | 2009-08-12 11:46:08 +0200 |
---|---|---|
committer | Mattias Jonsson <mattias.jonsson@sun.com> | 2009-08-12 11:46:08 +0200 |
commit | 475c64238a615e5720f99437cf320631ffb8e6a5 (patch) | |
tree | 2fdde1428cc6146ffa20d94e13dc8f6d44f87c05 /sql/sql_yacc.yy | |
parent | dc4b7b89436ac40362d62c661f0d28ca01ad132a (diff) | |
parent | 1200228277d3016f2c34665fca788dc35a1a402e (diff) | |
download | mariadb-git-475c64238a615e5720f99437cf320631ffb8e6a5.tar.gz |
merge
Diffstat (limited to 'sql/sql_yacc.yy')
-rw-r--r-- | sql/sql_yacc.yy | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 320b43c8e5c..cf791890311 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -3757,8 +3757,8 @@ partitioning: LEX_STRING partition_name={C_STRING_WITH_LEN("partition")}; if (!plugin_is_ready(&partition_name, MYSQL_STORAGE_ENGINE_PLUGIN)) { - my_error(ER_FEATURE_DISABLED, MYF(0), - "partitioning", "--with-partition"); + my_error(ER_OPTION_PREVENTS_STATEMENT, MYF(0), + "--skip-partition"); MYSQL_YYABORT; } lex->part_info= new partition_info(); |