Proper fix for INSERT DELAYED and --max-delayed-threads

ab3c0ac1 · unknown · 0e812fc4 · ab3c0ac1
Commit ab3c0ac1 authored Mar 12, 2003 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

sql/sql_insert.cc sql/sql_insert.cc +2 -3

No files found.
--- 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)