Allow binlog row image column marking even for wsrep binlog emulation.

This commit is contained in:
Nirbhay Choubey 2015-07-14 17:16:28 -04:00
parent dd4d81ddfd
commit 0e2ce3b745

View file

@ -5985,17 +5985,17 @@ void TABLE::mark_columns_per_binlog_row_image()
DBUG_ASSERT(read_set->bitmap);
DBUG_ASSERT(write_set->bitmap);
THD *thd= current_thd;
/**
If in RBR we may need to mark some extra columns,
depending on the binlog-row-image command line argument.
*/
if ((mysql_bin_log.is_open() && in_use &&
in_use->is_current_stmt_binlog_format_row() &&
!ha_check_storage_engine_flag(s->db_type(), HTON_NO_BINLOG_ROW_OPT)))
if ((WSREP_EMULATE_BINLOG(thd) || mysql_bin_log.is_open()) &&
in_use &&
in_use->is_current_stmt_binlog_format_row() &&
!ha_check_storage_engine_flag(s->db_type(), HTON_NO_BINLOG_ROW_OPT))
{
THD *thd= current_thd;
/* if there is no PK, then mark all columns for the BI. */
if (s->primary_key >= MAX_KEY)
bitmap_set_all(read_set);