diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2023-01-18 16:39:11 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2023-01-18 16:39:11 +0100 |
| commit | 08d4968404689331f8b89c185b92603dca044661 (patch) | |
| tree | 89f9e7edd07e3448cbf9f67467fd33bdcf6d98d9 /sql/sql_table.cc | |
| parent | b915b96f7224e04d4509f1e4c6a4193347715097 (diff) | |
| parent | 26d8485244bcf94923ab5bbd754276c9010dd569 (diff) | |
| download | mariadb-git-08d4968404689331f8b89c185b92603dca044661.tar.gz | |
Merge branch '10.8' into 10.9
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 41cc33055e4..06bfc8af645 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -3795,7 +3795,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); } } @@ -6223,10 +6223,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++) { |