diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-03-12 08:08:07 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-03-12 08:08:07 +0200 |
| commit | ab3c0ac156946ff9a6ef94b3cc987f02f940465a (patch) | |
| tree | e712faec357612fb2e2bde131fe44c40297f9730 /sql/sql_insert.cc | |
| parent | 0e812fc4b12f935184e78be4ee982799e99e6dc4 (diff) | |
| download | mariadb-git-ab3c0ac156946ff9a6ef94b3cc987f02f940465a.tar.gz | |
Proper fix for INSERT DELAYED and --max-delayed-threads
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 5bf852afc32..9f1a0e93cb9 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -139,9 +139,8 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list, List<Item> &fields, */ 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) || - !max_insert_delayed_threads) + thd->slave_thread || !max_insert_delayed_threads)) || + (lock_type == TL_WRITE_CONCURRENT_INSERT && duplic == DUP_REPLACE)) lock_type=TL_WRITE; if (lock_type == TL_WRITE_DELAYED) |