diff options
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 84b41e94fc9..5f39f514b59 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -5723,7 +5723,7 @@ static void update_field_dependencies(THD *thd, Field *field, TABLE *table) table->used_fields++; } if (table->get_fields_in_item_tree) - field->add_flags(GET_FIXED_FIELDS_FLAG); + field->flags|= GET_FIXED_FIELDS_FLAG; DBUG_VOID_RETURN; } @@ -8603,7 +8603,7 @@ static bool not_null_fields_have_null_values(TABLE *table) if (ff != of) { // copy after-update flags to of, copy before-update flags to ff - ff->swap_flags(of); + swap_variables(uint32, of->flags, ff->flags); if (ff->is_real_null()) { ff->set_notnull(); // for next row WHERE condition in UPDATE |