Commit 08e92938 authored by Venkatesh Duggirala's avatar Venkatesh Duggirala

Bug #17047208 REPLICATION DIFFERENCE FOR MULTIPLE TRIGGERS

Fixing pb2 valgrind failure
Missed a 'if condition' check while moving the logic
from one place to another place.
parent a7fb5aec
...@@ -4477,7 +4477,9 @@ int THD::decide_logging_format(TABLE_LIST *tables) ...@@ -4477,7 +4477,9 @@ int THD::decide_logging_format(TABLE_LIST *tables)
given statement. given statement.
*/ */
if (!lex->is_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_INSERT_TWO_KEYS) && if (!lex->is_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_INSERT_TWO_KEYS) &&
lex->sql_command == SQLCOM_INSERT && lex->duplicates == DUP_UPDATE) lex->sql_command == SQLCOM_INSERT &&
/* Duplicate key update is not supported by INSERT DELAYED */
command != COM_DELAYED_INSERT && lex->duplicates == DUP_UPDATE)
{ {
uint keys= table->table->s->keys, i= 0, unique_keys= 0; uint keys= table->table->s->keys, i= 0, unique_keys= 0;
for (KEY* keyinfo= table->table->s->key_info; for (KEY* keyinfo= table->table->s->key_info;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment