diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-02-17 19:39:05 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-02-17 19:39:05 +0200 |
| commit | 94b45787045677c106a25ebb5aaf1273040b2ff6 (patch) | |
| tree | 4231461f1f43bc3dd1335c7f7738cd85d2957621 /sql/protocol.cc | |
| parent | 66b8edf8a57c106b15ef1de2b25ce3e992540b71 (diff) | |
| parent | 16388f393c63b3e2158db1efec8dd9625a0a295e (diff) | |
| download | mariadb-git-94b45787045677c106a25ebb5aaf1273040b2ff6.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'sql/protocol.cc')
| -rw-r--r-- | sql/protocol.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/protocol.cc b/sql/protocol.cc index 7d479ab2e3b..f369fa1c66f 100644 --- a/sql/protocol.cc +++ b/sql/protocol.cc @@ -1580,16 +1580,16 @@ bool Protocol_text::store(Field *field) return store_null(); #ifdef DBUG_ASSERT_EXISTS TABLE *table= field->table; - my_bitmap_map *old_map= 0; + MY_BITMAP *old_map= 0; if (table->file) - old_map= dbug_tmp_use_all_columns(table, table->read_set); + old_map= dbug_tmp_use_all_columns(table, &table->read_set); #endif bool rc= field->send(this); #ifdef DBUG_ASSERT_EXISTS if (old_map) - dbug_tmp_restore_column_map(table->read_set, old_map); + dbug_tmp_restore_column_map(&table->read_set, old_map); #endif return rc; |