Commit 39537435 authored by Sergei Golubchik's avatar Sergei Golubchik

clarify the comment

and use the same error message for CREATE and open table time
parent 6e5048e8
...@@ -2589,11 +2589,11 @@ static bool fix_and_check_vcol_expr(THD *thd, TABLE *table, Field *field, ...@@ -2589,11 +2589,11 @@ static bool fix_and_check_vcol_expr(THD *thd, TABLE *table, Field *field,
/* fix_fields could've changed the expression */ /* fix_fields could've changed the expression */
func_expr= vcol->expr_item; func_expr= vcol->expr_item;
/* Number of columns will be checked later */ /* this was checked in check_expression(), but the frm could be mangled... */
if (unlikely(func_expr->result_type() == ROW_RESULT)) if (unlikely(func_expr->result_type() == ROW_RESULT))
{ {
my_error(ER_ROW_EXPR_FOR_VCOL, MYF(0)); my_error(ER_OPERAND_COLUMNS, MYF(0), 1);
DBUG_RETURN(1); DBUG_RETURN(1);
} }
/* Check that we are not refering to any not yet initialized fields */ /* Check that we are not refering to any not yet initialized fields */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment