summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKentoku SHIBA <kentokushiba@gmail.com>2013-09-19 03:03:55 +0900
committerKentoku SHIBA <kentokushiba@gmail.com>2013-09-19 03:03:55 +0900
commit708a28ff7911c68ed5358cd5ebf4db8c534041ed (patch)
treef945f0c8dbd6903b775e9d88714772e35f6fe054
parent178e6cfb2879370edd3900bd2427439c9a278a81 (diff)
downloadmariadb-git-708a28ff7911c68ed5358cd5ebf4db8c534041ed.tar.gz
fix MDEV-4738 INSERT DELAYED on a SPIDER table doesn't produce ER_DELAYED_NOT_SUPPORTED, doesn't work like delayed, and doesn't honor lock_wait_timeout like normal INSERT
-rw-r--r--storage/spider/ha_spider.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/storage/spider/ha_spider.cc b/storage/spider/ha_spider.cc
index a0f425d8f58..841b48000f1 100644
--- a/storage/spider/ha_spider.cc
+++ b/storage/spider/ha_spider.cc
@@ -1191,6 +1191,7 @@ THR_LOCK_DATA **ha_spider::store_lock(
lock_type = TL_READ;
if (
lock_type >= TL_WRITE_CONCURRENT_INSERT && lock_type <= TL_WRITE &&
+ lock_type != TL_WRITE_DELAYED &&
!thd->in_lock_tables && !thd_tablespace_op(thd)
)
lock_type = TL_WRITE_ALLOW_WRITE;