From 08e929388b2cea170f6a44e9c8669f9c0f636808 Mon Sep 17 00:00:00 2001
From: Venkatesh Duggirala <venkatesh.duggirala@oracle.com>
Date: Sat, 21 Nov 2015 11:08:44 +0530
Subject: [PATCH] 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.
---
 sql/sql_class.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 629088dd862..4711009d7cd 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -4477,7 +4477,9 @@ int THD::decide_logging_format(TABLE_LIST *tables)
           given statement.
         */
         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;
           for (KEY* keyinfo= table->table->s->key_info;