summaryrefslogtreecommitdiff
path: root/sql/ha_blackhole.cc
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2005-05-13 21:43:26 +0200
committerunknown <serg@serg.mylan>2005-05-13 21:43:26 +0200
commitc3f73a428193150df234881352875ca3383b9740 (patch)
tree9e1bd4a5606cc3fbf098258ca30e28d3864cdbb8 /sql/ha_blackhole.cc
parentcbbc4ff6a25accdd3e11a0e2719c2201d23a7b68 (diff)
downloadmariadb-git-c3f73a428193150df234881352875ca3383b9740.tar.gz
sql/ha_blackhole.cc
bug#10175 - blackhole.test hangs with "Warning: prev link 1 didn't point at previous lock at read: read lock with no write locks" sql/sql_base.cc libmysqld/examples/mysql.cc linking problem sql/ha_blackhole.cc: bug#10175 - blackhole.test hangs with "Warning: prev link 1 didn't point at previous lock at read: read lock with no write locks" sql/sql_base.cc: libmysqld/examples/mysql.cc linking problem
Diffstat (limited to 'sql/ha_blackhole.cc')
-rw-r--r--sql/ha_blackhole.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/ha_blackhole.cc b/sql/ha_blackhole.cc
index 7c6e7cb56b6..c9c94b3a9d7 100644
--- a/sql/ha_blackhole.cc
+++ b/sql/ha_blackhole.cc
@@ -129,8 +129,9 @@ THR_LOCK_DATA **ha_blackhole::store_lock(THD *thd,
THR_LOCK_DATA **to,
enum thr_lock_type lock_type)
{
+ if (lock_type != TL_IGNORE && lock.type == TL_UNLOCK)
+ lock.type=lock_type;
*to++= &lock;
-
return to;
}