diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2021-02-12 17:44:22 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2021-02-12 17:44:22 +0100 |
| commit | 00a313ecf329098d4b31a42030b9b5c6f80a6031 (patch) | |
| tree | f4983a6629b04563c48fa7276686dfc2187efb5f /storage/archive | |
| parent | ef5adf520760536c7396bdfe884fc509ac065694 (diff) | |
| parent | 691f93d6d17603f11a0c90f64e94b7ce9d187db4 (diff) | |
| download | mariadb-git-00a313ecf329098d4b31a42030b9b5c6f80a6031.tar.gz | |
Merge branch 'bb-10.3-release' into bb-10.4-release
Note, the fix for "MDEV-23328 Server hang due to Galera lock conflict resolution"
was null-merged. 10.4 version of the fix is coming up separately
Diffstat (limited to 'storage/archive')
| -rw-r--r-- | storage/archive/ha_archive.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/archive/ha_archive.cc b/storage/archive/ha_archive.cc index fa49b081ad1..689c61a0ff4 100644 --- a/storage/archive/ha_archive.cc +++ b/storage/archive/ha_archive.cc @@ -1547,7 +1547,7 @@ int ha_archive::optimize(THD* thd, HA_CHECK_OPT* check_opt) share->rows_recorded= 0; stats.auto_increment_value= 1; share->archive_write.auto_increment= 0; - my_bitmap_map *org_bitmap= tmp_use_all_columns(table, table->read_set); + MY_BITMAP *org_bitmap= tmp_use_all_columns(table, &table->read_set); while (!(rc= get_row(&archive, table->record[0]))) { @@ -1568,7 +1568,7 @@ int ha_archive::optimize(THD* thd, HA_CHECK_OPT* check_opt) } } - tmp_restore_column_map(table->read_set, org_bitmap); + tmp_restore_column_map(&table->read_set, org_bitmap); share->rows_recorded= (ha_rows)writer.rows; } |