diff options
| author | monty@donna.mysql.com <> | 2000-11-18 23:13:48 +0200 |
|---|---|---|
| committer | monty@donna.mysql.com <> | 2000-11-18 23:13:48 +0200 |
| commit | b31d0768794e964852562c0ba307e6eea35f101b (patch) | |
| tree | 287897ebd815b64a05c0ca7076beccd5245a2f8d /sql/sql_insert.cc | |
| parent | 23dc1a6b8568eab379492213be67d11c99522eca (diff) | |
| download | mariadb-git-b31d0768794e964852562c0ba307e6eea35f101b.tar.gz | |
Fixed some reported bugs
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) |