diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-02-21 20:51:56 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-02-21 20:51:56 +0100 |
| commit | edab37cd680ebcca999d989c34251f6be1115c54 (patch) | |
| tree | 9a960e6324916997d8efa87ce8d48d099d78cab8 /storage/myisam/mi_rkey.c | |
| parent | 5bf311e1e853457c31dbadd3d130b2569a867d80 (diff) | |
| parent | 446554a15bd84f39ec4a8163e9f4456fa9be8fb2 (diff) | |
| download | mariadb-git-edab37cd680ebcca999d989c34251f6be1115c54.tar.gz | |
5.3 merge
Diffstat (limited to 'storage/myisam/mi_rkey.c')
| -rw-r--r-- | storage/myisam/mi_rkey.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/storage/myisam/mi_rkey.c b/storage/myisam/mi_rkey.c index b1c0c0a4829..b70922b0505 100644 --- a/storage/myisam/mi_rkey.c +++ b/storage/myisam/mi_rkey.c @@ -158,7 +158,11 @@ int mi_rkey(MI_INFO *info, uchar *buf, int inx, const uchar *key, mi_yield_and_check_if_killed(info, inx)) { /* Aborted by user */ + DBUG_ASSERT(info->lastpos == HA_OFFSET_ERROR && + my_errno == HA_ERR_ABORTED_BY_USER); + res= ICP_ERROR; buf= 0; /* Fast abort */ + break; } } if (res == ICP_OUT_OF_RANGE) @@ -180,7 +184,7 @@ int mi_rkey(MI_INFO *info, uchar *buf, int inx, const uchar *key, } else { - DBUG_ASSERT(info->lastpos= HA_OFFSET_ERROR); + DBUG_ASSERT(info->lastpos == HA_OFFSET_ERROR); } } if (share->concurrent_insert) |