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 /storage/innobase/handler/handler0alter.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 'storage/innobase/handler/handler0alter.cc')
| -rw-r--r-- | storage/innobase/handler/handler0alter.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc index 54a20a95a31..ac17a7a8a3f 100644 --- a/storage/innobase/handler/handler0alter.cc +++ b/storage/innobase/handler/handler0alter.cc @@ -3360,9 +3360,9 @@ innobase_row_to_mysql( } } if (table->vfield) { - my_bitmap_map* old_read_set = tmp_use_all_columns(table, table->read_set); + MY_BITMAP* old_read_set = tmp_use_all_columns(table, &table->read_set); table->update_virtual_fields(table->file, VCOL_UPDATE_FOR_READ); - tmp_restore_column_map(table->read_set, old_read_set); + tmp_restore_column_map(&table->read_set, old_read_set); } } |