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/ha_partition.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/ha_partition.cc')
| -rw-r--r-- | sql/ha_partition.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index 0140a825ef5..cdfde2cc3ee 100644 --- a/sql/ha_partition.cc +++ b/sql/ha_partition.cc @@ -4418,7 +4418,7 @@ int ha_partition::write_row(const uchar * buf) int error; longlong func_value; bool have_auto_increment= table->next_number_field && buf == table->record[0]; - my_bitmap_map *old_map; + MY_BITMAP *old_map; THD *thd= ha_thd(); Sql_mode_save sms(thd); bool saved_auto_inc_field_not_null= table->auto_increment_field_not_null; @@ -4459,9 +4459,9 @@ int ha_partition::write_row(const uchar * buf) thd->variables.sql_mode|= MODE_NO_AUTO_VALUE_ON_ZERO; } } - old_map= dbug_tmp_use_all_columns(table, table->read_set); + old_map= dbug_tmp_use_all_columns(table, &table->read_set); error= m_part_info->get_partition_id(m_part_info, &part_id, &func_value); - dbug_tmp_restore_column_map(table->read_set, old_map); + dbug_tmp_restore_column_map(&table->read_set, old_map); if (unlikely(error)) { m_part_info->err_value= func_value; @@ -11424,13 +11424,12 @@ int ha_partition::bulk_update_row(const uchar *old_data, const uchar *new_data, int error= 0; uint32 part_id; longlong func_value; - my_bitmap_map *old_map; DBUG_ENTER("ha_partition::bulk_update_row"); - old_map= dbug_tmp_use_all_columns(table, table->read_set); + MY_BITMAP *old_map= dbug_tmp_use_all_columns(table, &table->read_set); error= m_part_info->get_partition_id(m_part_info, &part_id, &func_value); - dbug_tmp_restore_column_map(table->read_set, old_map); + dbug_tmp_restore_column_map(&table->read_set, old_map); if (unlikely(error)) { m_part_info->err_value= func_value; |