Skip to content

M
MariaDB
Commit f3ad96a3 authored by Sergei Golubchik's avatar Sergei Golubchik
Browse files
Options

fix the bad merge 

this fixes vcol.upgrade failure
parent c65cce36
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 7 deletions
sql/item.cc
View file @ f3ad96a3
...@@ -1011,13 +1011,6 @@ bool Item_field::check_field_expression_processor(void *arg) ...@@ -1011,13 +1011,6 @@ bool Item_field::check_field_expression_processor(void *arg)
Field *org_field= (Field*) arg; Field *org_field= (Field*) arg;
if (field->flags & NO_DEFAULT_VALUE_FLAG) if (field->flags & NO_DEFAULT_VALUE_FLAG)
return 0; return 0;
if (field->flags & AUTO_INCREMENT_FLAG)
{
my_error(ER_EXPRESSION_REFERS_TO_UNINIT_FIELD,
MYF(0),
org_field->field_name.str, field->field_name.str);
return 1;
}
if ((field->default_value && field->default_value->flags) || field->vcol_info) if ((field->default_value && field->default_value->flags) || field->vcol_info)
{ {
if (field == org_field || if (field == org_field ||
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7