BUG#11765650 Follow-up patch for Valgrind failures on PB2.

d1573ac1 · Rohit Kalhans · 1a02c266 · d1573ac1
Commit d1573ac1 authored Apr 03, 2012 by Rohit Kalhans
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

sql/sql_base.cc sql/sql_base.cc +2 -0

No files found.
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -5711,6 +5711,8 @@ bool lock_tables(THD *thd, TABLE_LIST *tables, uint count,
        if (!query_table->placeholder() &&
            query_table->lock_type >= TL_WRITE_ALLOW_WRITE &&
            unique_keys > 1 && thd->lex->sql_command == SQLCOM_INSERT &&
+            /* Duplicate key update is not supported by INSERT DELAYED */
+            thd->command != COM_DELAYED_INSERT &&
            thd->lex->duplicates == DUP_UPDATE)
          thd->lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_INSERT_TWO_KEYS);
      }