mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 02:51:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix the bad merge

Browse source 
this fixes vcol.upgrade failure
This commit is contained in:
Sergei Golubchik 2017-07-08 01:38:56 +02:00
parent c65cce3698
commit f3ad96a3a6
1 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sql/item.cc
View file

@ -1011,13 +1011,6 @@ bool Item_field::check_field_expression_processor(void *arg)
Field *org_field= (Field*) arg;
if (field->flags & NO_DEFAULT_VALUE_FLAG)
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 == org_field ||