diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-04-05 10:49:38 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-04-05 10:49:38 +0200 |
| commit | dea3544b2d9bd68961b8e84c3772deda435f15b5 (patch) | |
| tree | d65a66f9f2f9378a1f4ca014e18952ae514f4cb1 /storage/xtradb | |
| parent | c72d5e80c53c53a9a847b1c3b6ac66a7ad7eb815 (diff) | |
| parent | ceec7cea338e117d15a9679e517cc2bb24d44fcc (diff) | |
| download | mariadb-git-dea3544b2d9bd68961b8e84c3772deda435f15b5.tar.gz | |
mysql-5.1.62 merge
Diffstat (limited to 'storage/xtradb')
| -rw-r--r-- | storage/xtradb/row/row0sel.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/storage/xtradb/row/row0sel.c b/storage/xtradb/row/row0sel.c index e8e9465d838..edfccfc495d 100644 --- a/storage/xtradb/row/row0sel.c +++ b/storage/xtradb/row/row0sel.c @@ -4384,7 +4384,9 @@ no_gap_lock: applicable to unique secondary indexes. Current behaviour is to widen the scope of a lock on an already delete marked record if the same record is deleted twice by the same transaction */ - if (index == clust_index && unique_search) { + if (index == clust_index && unique_search + && !prebuilt->used_in_HANDLER) { + err = DB_RECORD_NOT_FOUND; goto normal_return; |