diff options
| author | Rich Prohaska <prohaska@tokutek.com> | 2014-04-21 12:35:59 -0400 |
|---|---|---|
| committer | Rich Prohaska <prohaska@tokutek.com> | 2014-04-21 12:35:59 -0400 |
| commit | 02fce5677755d20d65141faea19d8ae2b47a4d9e (patch) | |
| tree | fabd5ec3aed73e34f36f5e4d970c4e8cf5ddad14 /storage | |
| parent | 99c4517b296733250325c2b8b3d9e54a6a01a1f5 (diff) | |
| download | mariadb-git-02fce5677755d20d65141faea19d8ae2b47a4d9e.tar.gz | |
#110 turn off replace into and insert ignore optimizations when binlog format != statement (2nd try)
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/tokudb/ha_tokudb.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/storage/tokudb/ha_tokudb.cc b/storage/tokudb/ha_tokudb.cc index 3d4f3639ec7..a8ca125769c 100644 --- 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; } } |