diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2021-02-15 16:43:15 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2021-02-15 16:43:15 +0100 |
| commit | 25d9d2e37f37fd3d6dfa0004a142f83c260e7ebf (patch) | |
| tree | dedbab65f15c43cfb4abba87f9ff5da7df47a73c /sql/field.cc | |
| parent | 5e3d3220bbe344b0de60b26c24fd5cdc9fe1741a (diff) | |
| parent | 26965387230a9b13fb716344477d108bb87dea98 (diff) | |
| download | mariadb-git-25d9d2e37f37fd3d6dfa0004a142f83c260e7ebf.tar.gz | |
Merge branch 'bb-10.4-release' into bb-10.5-release
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/field.cc b/sql/field.cc index 45b3a3c703e..52074417046 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -11159,7 +11159,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))) { @@ -11171,7 +11171,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; } |