diff options
| author | Vasil Dimov <vasil.dimov@oracle.com> | 2011-12-22 13:05:33 +0200 |
|---|---|---|
| committer | Vasil Dimov <vasil.dimov@oracle.com> | 2011-12-22 13:05:33 +0200 |
| commit | dfc75197f933c9eebef8ecaf17e23a22a0259612 (patch) | |
| tree | 2cdcbe48d6777d66f6ac60908a03885442a037fe /storage | |
| parent | d8c1d83dd0c403800d73355d3ccb21c65ce0e264 (diff) | |
| parent | 86505c3c545d3866a85464b0762b452d85599993 (diff) | |
| download | mariadb-git-dfc75197f933c9eebef8ecaf17e23a22a0259612.tar.gz | |
Merge mysql-5.1-security -> mysql-5.5-security
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/row/row0sel.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/storage/innobase/row/row0sel.c b/storage/innobase/row/row0sel.c index 5d8f53f68da..5a6ba448a36 100644 --- a/storage/innobase/row/row0sel.c +++ b/storage/innobase/row/row0sel.c @@ -4362,7 +4362,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; |