diff options
author | Sergei Golubchik <sergii@pisem.net> | 2011-07-02 22:12:12 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2011-07-02 22:12:12 +0200 |
commit | b4a0b2c2f862ab0de853dc34e1e56f6159043e45 (patch) | |
tree | 18a0c25fdc9ac0076da19247666414a46434b85e /storage/maria/ma_delete.c | |
parent | 9809f05199aeb0b67991fac41bd86f38730768dc (diff) | |
download | mariadb-git-b4a0b2c2f862ab0de853dc34e1e56f6159043e45.tar.gz |
post-merge fixes.
most tests pass.
5.3 merge is next
Diffstat (limited to 'storage/maria/ma_delete.c')
-rw-r--r-- | storage/maria/ma_delete.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/storage/maria/ma_delete.c b/storage/maria/ma_delete.c index 2c13ddfe5bb..22ffb05af38 100644 --- a/storage/maria/ma_delete.c +++ b/storage/maria/ma_delete.c @@ -118,7 +118,6 @@ int maria_delete(MARIA_HA *info,const uchar *record) mi_sizestore(lastpos, info->cur_row.lastpos); _ma_writeinfo(info, WRITEINFO_UPDATE_KEYFILE); - allow_break(); /* Allow SIGHUP & SIGINT */ if (info->invalidator != 0) { DBUG_PRINT("info", ("invalidator... '%s' (delete)", @@ -142,7 +141,6 @@ err: } _ma_writeinfo(info, WRITEINFO_UPDATE_KEYFILE); info->update|=HA_STATE_WRITTEN; /* Buffer changed */ - allow_break(); /* Allow SIGHUP & SIGINT */ if (save_errno == HA_ERR_KEY_NOT_FOUND) { maria_print_error(share, HA_ERR_CRASHED); |