#110 turn off replace into and insert ignore optimizations when binlog format != statement (2nd try)

12 years ago · 02fce56777
1 changed files with 3 additions and 1 deletions
--- a/storage/tokudb/ha_tokudb.cc
+++ b/storage/tokudb/ha_tokudb.cc
@ -396,7 +396,9 @@ 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 (mysql_bin_log.is_open() && thd->variables.binlog_format == BINLOG_FORMAT_STMT) {
+                if (mysql_bin_log.is_open() && thd->variables.binlog_format != BINLOG_FORMAT_STMT) {
+                    do_opt = false;
+                } else {
                    do_opt = true;
                }
            }