diff options
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index ec727591e2a..25ca7d76e03 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -118,11 +118,10 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list, List<Item> &fields, if we are told to replace duplicates, the insert cannot be concurrent delayed insert changed to regular in slave thread */ - if (lock_type == TL_WRITE_DELAYED && - ((specialflag & (SPECIAL_NO_NEW_FUNC | SPECIAL_SAFE_MODE)) || - thd->slave_thread - ) || - lock_type == TL_WRITE_CONCURRENT_INSERT && duplic == DUP_REPLACE) + if ((lock_type == TL_WRITE_DELAYED && + ((specialflag & (SPECIAL_NO_NEW_FUNC | SPECIAL_SAFE_MODE)) || + thd->slave_thread)) || + (lock_type == TL_WRITE_CONCURRENT_INSERT && duplic == DUP_REPLACE)) lock_type=TL_WRITE; if (lock_type == TL_WRITE_DELAYED) |