diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2021-02-02 17:55:53 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2021-02-02 17:55:53 +0100 |
| commit | 0f810b58faf487c7cd59f2ee520f62deb0f712eb (patch) | |
| tree | dfb52d41ffd83d0dbffb969c091fe190b9457a24 /sql/field.cc | |
| parent | 542d769ea1a22a7a6a87c9fe76ff911a162ade44 (diff) | |
| parent | 251b52190070095e4c65ffb0ae545d49330a02b2 (diff) | |
| download | mariadb-git-10.4-merge-attempt.tar.gz | |
Merge branch 'bb-10.3-release' into bb-10.4-release10.4-merge-attempt
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sql/field.cc b/sql/field.cc index 70598619acd..7aea222ca07 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -8098,11 +8098,10 @@ uint Field_varstring::get_key_image(uchar *buff, uint length, { String val; uint local_char_length; - my_bitmap_map *old_map; - old_map= dbug_tmp_use_all_columns(table, table->read_set); + MY_BITMAP *old_map= dbug_tmp_use_all_columns(table, &table->read_set); val_str(&val, &val); - dbug_tmp_restore_column_map(table->read_set, old_map); + dbug_tmp_restore_column_map(&table->read_set, old_map); local_char_length= val.charpos(length / field_charset->mbmaxlen); if (local_char_length < val.length()) @@ -11396,7 +11395,7 @@ key_map Field::get_possible_keys() bool Field::validate_value_in_record_with_warn(THD *thd, const uchar *record) { - my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->read_set); + MY_BITMAP *old_map= dbug_tmp_use_all_columns(table, &table->read_set); bool rc; if ((rc= validate_value_in_record(thd, record))) { @@ -11408,7 +11407,7 @@ bool Field::validate_value_in_record_with_warn(THD *thd, const uchar *record) ER_THD(thd, ER_INVALID_DEFAULT_VALUE_FOR_FIELD), ErrConvString(&tmp).ptr(), field_name.str); } - dbug_tmp_restore_column_map(table->read_set, old_map); + dbug_tmp_restore_column_map(&table->read_set, old_map); return rc; } |