diff options
| author | Rich Prohaska <prohaska@tokutek.com> | 2014-04-25 14:39:53 -0400 |
|---|---|---|
| committer | Rich Prohaska <prohaska@tokutek.com> | 2014-04-25 14:39:53 -0400 |
| commit | f2e73c9a6f6f2b3b6c281b1ad6d0ca8930a3157c (patch) | |
| tree | 1092aa91f44af91a2eea4960d46aca7f64f6bfd2 /storage | |
| parent | 975c904f16ff31cd7fc878c9e533129e4ecf5529 (diff) | |
| download | mariadb-git-f2e73c9a6f6f2b3b6c281b1ad6d0ca8930a3157c.tar.gz | |
#110 turn off replace into and insert ignore optimizations when binlog format != statement
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/tokudb/ha_tokudb.cc | 6 |
1 files changed, 1 insertions, 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; } } |