From 99c4517b296733250325c2b8b3d9e54a6a01a1f5 Mon Sep 17 00:00:00 2001 From: Rich Prohaska Date: Mon, 21 Apr 2014 10:35:03 -0400 Subject: #110 turn off replace into and insert ignore optimizations when binlog format != statement --- storage/tokudb/ha_tokudb.cc | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/storage/tokudb/ha_tokudb.cc b/storage/tokudb/ha_tokudb.cc index 0fb5ea4bdca..3d4f3639ec7 100644 --- a/storage/tokudb/ha_tokudb.cc +++ b/storage/tokudb/ha_tokudb.cc @@ -396,11 +396,7 @@ static inline bool do_ignore_flag_optimization(THD* thd, TABLE* table, bool opt_ if (is_replace_into(thd) || is_insert_ignore(thd)) { uint pk_insert_mode = get_pk_insert_mode(thd); if ((!table->triggers && pk_insert_mode < 2) || pk_insert_mode == 0) { - // if bin log row replication is on then ignore the session variable - if (mysql_bin_log.is_open() && - (thd->variables.binlog_format != BINLOG_FORMAT_STMT && thd->variables.binlog_format != BINLOG_FORMAT_MIXED)) { - do_opt = false; - } else { + if (mysql_bin_log.is_open() && thd->variables.binlog_format == BINLOG_FORMAT_STMT) { do_opt = true; } } -- cgit v1.2.1