diff options
| author | Marko Mäkelä <marko.makela@oracle.com> | 2012-02-16 12:28:49 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@oracle.com> | 2012-02-16 12:28:49 +0200 |
| commit | 6ff320e0f644a9d3eb3cfb59c829a72de3ebbd44 (patch) | |
| tree | be91fa4aa01352f1e0fb53efec15a4966772bd39 /storage/innobase/row/row0upd.c | |
| parent | ee9359840f659ce15a27aee1b2133e6f56b0b304 (diff) | |
| parent | 4045c9976cf475b3f42f4133440c1d9a9060fb25 (diff) | |
| download | mariadb-git-6ff320e0f644a9d3eb3cfb59c829a72de3ebbd44.tar.gz | |
Merge mysql-5.1 to mysql-5.5.
Diffstat (limited to 'storage/innobase/row/row0upd.c')
| -rw-r--r-- | storage/innobase/row/row0upd.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/storage/innobase/row/row0upd.c b/storage/innobase/row/row0upd.c index cfa69b8c572..dea4a539001 100644 --- a/storage/innobase/row/row0upd.c +++ b/storage/innobase/row/row0upd.c @@ -23,6 +23,9 @@ Update of a row Created 12/27/1996 Heikki Tuuri *******************************************************/ +#include "my_global.h" /* HAVE_* */ +#include "m_string.h" /* for my_sys.h */ +#include "my_sys.h" /* DEBUG_SYNC_C */ #include "row0upd.h" #ifdef UNIV_NONINL @@ -2010,15 +2013,20 @@ row_upd_clust_rec( rec_t* rec; rec_offs_init(offsets_); - mtr_start(mtr); + DBUG_EXECUTE_IF( + "row_upd_extern_checkpoint", + log_make_checkpoint_at(IB_ULONGLONG_MAX, TRUE);); + mtr_start(mtr); ut_a(btr_pcur_restore_position(BTR_MODIFY_TREE, pcur, mtr)); rec = btr_cur_get_rec(btr_cur); + DEBUG_SYNC_C("before_row_upd_extern"); err = btr_store_big_rec_extern_fields( index, btr_cur_get_block(btr_cur), rec, rec_get_offsets(rec, index, offsets_, ULINT_UNDEFINED, &heap), mtr, TRUE, big_rec); + DEBUG_SYNC_C("after_row_upd_extern"); mtr_commit(mtr); } |