diff options
| author | Satya Bodapati <satya.bodapati@oracle.com> | 2013-09-11 17:02:18 +0530 |
|---|---|---|
| committer | Satya Bodapati <satya.bodapati@oracle.com> | 2013-09-11 17:02:18 +0530 |
| commit | a88bac6c664a6abff14ce5c5586e6483db3f7828 (patch) | |
| tree | 2d04560562e1ee58a5a53ace1e7092c6cfc82c20 /storage/innobase/ibuf | |
| parent | c2e0d7809ecbf1b2bd5ad4188155cc8a6d06bda7 (diff) | |
| parent | 59402fe0a76bae115c622cc241995180c4bdf4c9 (diff) | |
| download | mariadb-git-a88bac6c664a6abff14ce5c5586e6483db3f7828.tar.gz | |
Merge fix for BUG#16752251 from mysql-5.1 to mysql-5.5
Diffstat (limited to 'storage/innobase/ibuf')
| -rw-r--r-- | storage/innobase/ibuf/ibuf0ibuf.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/storage/innobase/ibuf/ibuf0ibuf.c b/storage/innobase/ibuf/ibuf0ibuf.c index 306cdefc304..59403bc599c 100644 --- a/storage/innobase/ibuf/ibuf0ibuf.c +++ b/storage/innobase/ibuf/ibuf0ibuf.c @@ -4016,6 +4016,24 @@ updated_in_place: to btr_cur_update_in_place(). */ row_upd_rec_in_place(rec, index, offsets, update, page_zip); + + /* Log the update in place operation. During recovery + MLOG_COMP_REC_UPDATE_IN_PLACE/MLOG_REC_UPDATE_IN_PLACE + expects trx_id, roll_ptr for secondary indexes. So we + just write dummy trx_id(0), roll_ptr(0) */ + btr_cur_update_in_place_log(BTR_KEEP_SYS_FLAG, rec, + index, update, + NULL, 0, mtr); + DBUG_EXECUTE_IF( + "crash_after_log_ibuf_upd_inplace", + log_buffer_flush_to_disk(); + fprintf(stderr, + "InnoDB: Wrote log record for ibuf " + "update in place operation\n"); + DBUG_SUICIDE(); + ); + + goto updated_in_place; } |