summaryrefslogtreecommitdiff
path: root/sql/sql_table.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/sql_table.cc')
-rw-r--r--sql/sql_table.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 3ca70ff93f0..9a60da58022 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -3796,7 +3796,7 @@ without_overlaps_err:
my_error(ER_TOO_LONG_IDENT, MYF(0), check->name.str);
DBUG_RETURN(TRUE);
}
- if (check_expression(check, &check->name, VCOL_CHECK_TABLE))
+ if (check_expression(check, &check->name, VCOL_CHECK_TABLE, alter_info))
DBUG_RETURN(TRUE);
}
}
@@ -6222,10 +6222,8 @@ remove_key:
while ((check=it++))
{
- if (!(check->flags & VCOL_CHECK_CONSTRAINT_IF_NOT_EXISTS) &&
- check->name.length)
+ if (!check->if_not_exists && check->name.length)
continue;
- check->flags= 0;
for (c= share->field_check_constraints;
c < share->table_check_constraints ; c++)
{