#110 turn off replace into and insert ignore optimizations when binlog format...

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

#110 turn off replace into and insert ignore optimizations when binlog format...
#110 turn off replace into and insert ignore optimizations when binlog format != statement (2nd try)
fa3526f1 · Rich Prohaska · f2e73c9a · fa3526f1
Commit fa3526f1 authored Apr 25, 2014 by Rich Prohaska
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

storage/tokudb/ha_tokudb.cc storage/tokudb/ha_tokudb.cc +3 -1

No files found.
--- 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;
                }
            }