summaryrefslogtreecommitdiff
path: root/sql/sql_yacc.yy
diff options
context:
space:
mode:
authorMattias Jonsson <mattias.jonsson@sun.com>2009-08-12 11:46:08 +0200
committerMattias Jonsson <mattias.jonsson@sun.com>2009-08-12 11:46:08 +0200
commitf09fc5000413a4daaa401997968fc8f13def2f2c (patch)
tree2fdde1428cc6146ffa20d94e13dc8f6d44f87c05 /sql/sql_yacc.yy
parent7b8d509b2d189cc1574d07291d02941ef7e24a59 (diff)
parent48e0325c5e22aef8faca34672c30873c361412e1 (diff)
downloadmariadb-git-f09fc5000413a4daaa401997968fc8f13def2f2c.tar.gz
merge
Diffstat (limited to 'sql/sql_yacc.yy')
-rw-r--r--sql/sql_yacc.yy4
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();