database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

MDEV-18859 Server crashes in bitmap_bits_set / pack_row / THD::binlog_write_row upon DELETE .. FOR PORTION with binary logging

Browse Source 
rpl_write_set is initialized in TABLE::mark_columns_per_binlog_row_image.
Since we just call use_all_columns for PORTION OF case, no need in
column marking logic here. Instead, initialize table->rpl_write_set in
place.
This commit is contained in:
Nikita Malyavin
2019-03-13 22:31:43 +10:00
committed by Sergei Golubchik
parent 04055060b6
commit 7e3e2d060b
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/suite/period/t/delete.test
View File

@ -1,4 +1,5 @@
source suite/period/engines.inc; source suite/period/engines.inc;
source include/have_log_bin.inc;
create or replace table t (id int, s date, e date, period for apptime(s,e)); create or replace table t (id int, s date, e date, period for apptime(s,e));

5
sql/sql_delete.cc
View File

@ -718,9 +718,14 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds,
goto got_error; goto got_error;
if (table_list->has_period()) if (table_list->has_period())
{
table->use_all_columns(); table->use_all_columns();
table->rpl_write_set= table->write_set;
}
else else
{
table->mark_columns_needed_for_delete(); table->mark_columns_needed_for_delete();
}
if ((table->file->ha_table_flags() & HA_CAN_FORCE_BULK_DELETE) && if ((table->file->ha_table_flags() & HA_CAN_FORCE_BULK_DELETE) &&
!table->prepare_triggers_for_delete_stmt_or_event()) !table->prepare_triggers_for_delete_stmt_or_event())