diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-02-11 09:07:06 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-02-11 09:07:06 +0200 |
| commit | 5ae70dbd877e22b47d7c3d238e150e13eb794273 (patch) | |
| tree | 6ba2e71fb2cbf157360fb490e294bd249d93b91e /sql/protocol.cc | |
| parent | f45327d42961fa4589f652af1916be4c8d6c82fd (diff) | |
| parent | ca28086d42df904f11d129fd3df57177a4f61979 (diff) | |
| download | mariadb-git-10.6-MDEV-20612-3-MDEV-23328.tar.gz | |
Merge bb-10.5-release10.6-MDEV-20612-3-MDEV-23328
FIXME: Many Galera tests hang
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; |