diff options
Diffstat (limited to 'storage/xtradb')
| -rw-r--r-- | storage/xtradb/os/os0file.c | 2 | ||||
| -rw-r--r-- | storage/xtradb/row/row0sel.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/storage/xtradb/os/os0file.c b/storage/xtradb/os/os0file.c index 1e863109bed..b502be1eb00 100644 --- a/storage/xtradb/os/os0file.c +++ b/storage/xtradb/os/os0file.c @@ -2785,7 +2785,7 @@ retry: "InnoDB: Check also that the disk is not full" " or a disk quota exceeded.\n", name, (ulong) offset_high, (ulong) offset, - (ulong) n, (ulong) len, (ulong) err); + (ulong) n, ret ? len : 0, (ulong) err); if (strerror((int)err) != NULL) { fprintf(stderr, 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; |