summaryrefslogtreecommitdiff
path: root/sql/sql_insert.cc
diff options
context:
space:
mode:
authorunknown <jani@rhols221.adsl.netsonic.fi>2003-03-09 19:03:55 +0200
committerunknown <jani@rhols221.adsl.netsonic.fi>2003-03-09 19:03:55 +0200
commit64cf72900c4780e5bb32bd48dab7358dd0b08f62 (patch)
treea539bc0a4d491400c49093facc6e63911b519499 /sql/sql_insert.cc
parent44c9a3893dc25de21dccd6aab7e1b1d75ec13642 (diff)
downloadmariadb-git-64cf72900c4780e5bb32bd48dab7358dd0b08f62.tar.gz
Made it possible to use --max-delayed-threads=0 in order to disable
INSERT DELAYED.
Diffstat (limited to 'sql/sql_insert.cc')
-rw-r--r--sql/sql_insert.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index 7725808075a..5bf852afc32 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -140,7 +140,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))
+ (lock_type == TL_WRITE_CONCURRENT_INSERT && duplic == DUP_REPLACE) ||
+ !max_insert_delayed_threads)
lock_type=TL_WRITE;
if (lock_type == TL_WRITE_DELAYED)