diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-09 09:52:15 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-09 09:52:15 +0200 |
| commit | 75d631f333544de4487a6dd251d6f361e1d55d6b (patch) | |
| tree | 4e234afa19a458b9b0727859c53c290c683a502d /sql/table.cc | |
| parent | 9cbf8ccf2990f9db8d9debee42bc9213cbb04457 (diff) | |
| parent | 1d480419822b53c840de54542c1d1a0851dbe2c8 (diff) | |
| download | mariadb-git-75d631f333544de4487a6dd251d6f361e1d55d6b.tar.gz | |
Merge branch '10.7' into 10.8
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sql/table.cc b/sql/table.cc index 3adb8575fc0..d3a2c396e80 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -9250,7 +9250,8 @@ bool TABLE::validate_default_values_of_unset_fields(THD *thd) const INSERT INTO t1 (a,b) VALUES (1,2); */ bool TABLE::check_assignability_explicit_fields(List<Item> fields, - List<Item> values) + List<Item> values, + bool ignore) { DBUG_ENTER("TABLE::check_assignability_explicit_fields"); DBUG_ASSERT(fields.elements == values.elements); @@ -9270,7 +9271,7 @@ bool TABLE::check_assignability_explicit_fields(List<Item> fields, */ continue; } - if (value->check_assignability_to(item_field->field)) + if (value->check_assignability_to(item_field->field, ignore)) DBUG_RETURN(true); } DBUG_RETURN(false); @@ -9282,7 +9283,8 @@ bool TABLE::check_assignability_explicit_fields(List<Item> fields, all visible fields of the table, e.g. INSERT INTO t1 VALUES (1,2); */ -bool TABLE::check_assignability_all_visible_fields(List<Item> &values) const +bool TABLE::check_assignability_all_visible_fields(List<Item> &values, + bool ignore) const { DBUG_ENTER("TABLE::check_assignability_all_visible_fields"); DBUG_ASSERT(s->visible_fields == values.elements); @@ -9291,7 +9293,7 @@ bool TABLE::check_assignability_all_visible_fields(List<Item> &values) const for (uint i= 0; i < s->fields; i++) { if (!field[i]->invisible && - (vi++)->check_assignability_to(field[i])) + (vi++)->check_assignability_to(field[i], ignore)) DBUG_RETURN(true); } DBUG_RETURN(false); |