Merge mronstrom@bk-internal.mysql.com:/home/bk/bugs/bug18198

into  dator5.(none):/home/pappa/bug18198


mysql-test/r/partition.result:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/partition_info.cc:
  manual merge
sql/partition_info.h:
  manual merge
sql/sql_table.cc:
  manual merge

1 files changed, 9 insertions, 2 deletions

diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 0632e2298cd..e12985faca8 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -3619,6 +3619,7 @@ part_bit_expr:
         {
           Item *part_expr= $1;
           bool not_corr_func;
+          bool part_expression_ok= TRUE;
           LEX *lex= Lex;
           THD *thd= YYTHD;
           longlong item_value;
@@ -3636,13 +3637,19 @@ part_bit_expr:
             mem_alloc_error(sizeof(part_elem_value));
             YYABORT;
           }
-
+          part_expr->walk(&Item::check_partition_func_processor, 0,
+                          (byte*)(&part_expression_ok));
+          if (!part_expression_ok)
+          {
+            my_error(ER_PARTITION_FUNCTION_IS_NOT_ALLOWED, MYF(0));
+            YYABORT;
+          }
           if (part_expr->fix_fields(YYTHD, (Item**)0) ||
               ((context->table_list= save_list), FALSE) ||
               (!part_expr->const_item()) ||
               (!lex->safe_to_cache_query))
           {
-            yyerror(ER(ER_NO_CONST_EXPR_IN_RANGE_OR_LIST_ERROR));
+            my_error(ER_NO_CONST_EXPR_IN_RANGE_OR_LIST_ERROR, MYF(0));
             YYABORT;
           }
           thd->where= save_where;