diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-03-27 23:41:02 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-03-27 23:41:02 +0100 |
| commit | 993ea79f2df42292eceeee394e8ece9f4a3f6cf2 (patch) | |
| tree | d105c8288a89a25d412e9006b740c756db6326d6 /storage/xtradb/row/row0undo.c | |
| parent | 1827d9591e24ee469527021771088d842ab18374 (diff) | |
| parent | 6599fd3e9c23a8957a63146cbe6a0ffc4c292a3d (diff) | |
| download | mariadb-git-993ea79f2df42292eceeee394e8ece9f4a3f6cf2.tar.gz | |
5.5 merge
Diffstat (limited to 'storage/xtradb/row/row0undo.c')
| -rw-r--r-- | storage/xtradb/row/row0undo.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/storage/xtradb/row/row0undo.c b/storage/xtradb/row/row0undo.c index 09970b7fe21..74fc1baf1d2 100644 --- a/storage/xtradb/row/row0undo.c +++ b/storage/xtradb/row/row0undo.c @@ -216,7 +216,7 @@ row_undo_search_clust_to_pcur( node->row = row_build(ROW_COPY_DATA, clust_index, rec, offsets, NULL, ext, node->heap); - if (node->update) { + if (node->rec_type == TRX_UNDO_UPD_EXIST_REC) { node->undo_row = dtuple_copy(node->row, node->heap); row_upd_replace(node->undo_row, &node->undo_ext, clust_index, node->update, node->heap); @@ -282,25 +282,6 @@ row_undo( } else { node->state = UNDO_NODE_MODIFY; } - - } else if (node->state == UNDO_NODE_PREV_VERS) { - - /* Undo should be done to the same clustered index record - again in this same rollback, restoring the previous version */ - - roll_ptr = node->new_roll_ptr; - - node->undo_rec = trx_undo_get_undo_rec_low(roll_ptr, - node->heap); - node->roll_ptr = roll_ptr; - node->undo_no = trx_undo_rec_get_undo_no(node->undo_rec); - - if (trx_undo_roll_ptr_is_insert(roll_ptr)) { - - node->state = UNDO_NODE_INSERT; - } else { - node->state = UNDO_NODE_MODIFY; - } } /* Prevent DROP TABLE etc. while we are rolling back this row. |