diff options
| author | konstantin@mysql.com <> | 2005-05-14 12:38:12 +0400 |
|---|---|---|
| committer | konstantin@mysql.com <> | 2005-05-14 12:38:12 +0400 |
| commit | 89bd09fed2565f0e509a9d81ca7e9782ff1f8ea1 (patch) | |
| tree | 301d852032306dc5560a6076b889c4d7c3d6da7d /sql/ha_blackhole.cc | |
| parent | 3ff39b3704b4b0023ab107217ec36fe578f26e4d (diff) | |
| parent | 6c981c0b8005a1577c7dfd93eb656a5da46ef9f0 (diff) | |
| download | mariadb-git-89bd09fed2565f0e509a9d81ca7e9782ff1f8ea1.tar.gz | |
Manual merge (again)
Diffstat (limited to 'sql/ha_blackhole.cc')
| -rw-r--r-- | sql/ha_blackhole.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/ha_blackhole.cc b/sql/ha_blackhole.cc index c5062c4ea81..dcc542a7247 100644 --- a/sql/ha_blackhole.cc +++ b/sql/ha_blackhole.cc @@ -132,8 +132,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; } |