diff options
| author | Alexander Barkov <bar@mariadb.com> | 2019-08-14 20:27:00 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2019-08-14 20:27:00 +0400 |
| commit | afe6eb499d7d5d9b4ba9de5746e78b43f25e31a4 (patch) | |
| tree | 8755d77c5aca99ddc5bafc874e5f550be85e6f45 /sql/sql_sequence.cc | |
| parent | e86010f909fb6b8c4ffd9d6df92991ac079e67e7 (diff) | |
| download | mariadb-git-afe6eb499d7d5d9b4ba9de5746e78b43f25e31a4.tar.gz | |
Revert "MDEV-20342 Turn Field::flags from a member to a method"
This reverts commit e86010f909fb6b8c4ffd9d6df92991ac079e67e7.
Reverting on Monty's request, as this change makes merging
things from 10.5 to 10.2 much harder.
Diffstat (limited to 'sql/sql_sequence.cc')
| -rw-r--r-- | sql/sql_sequence.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_sequence.cc b/sql/sql_sequence.cc index 2e0029afd33..4e8624d6360 100644 --- a/sql/sql_sequence.cc +++ b/sql/sql_sequence.cc @@ -209,7 +209,7 @@ bool check_sequence_fields(LEX *lex, List<Create_field> *fields) Field_definition *field_def= &sequence_structure[field_no]; if (my_strcasecmp(system_charset_info, field_def->field_name, field->field_name.str) || - field->flags() != field_def->flags || + field->flags != field_def->flags || field->type_handler() != field_def->type_handler) { reason= field->field_name.str; @@ -253,7 +253,7 @@ bool prepare_sequence_fields(THD *thd, List<Create_field> *fields) new_field->length= field_info->length; new_field->char_length= field_info->length; new_field->comment= field_info->comment; - new_field->set_flags(field_info->flags); + new_field->flags= field_info->flags; if (unlikely(fields->push_back(new_field))) DBUG_RETURN(TRUE); /* purify inspected */ } |