diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-11-24 18:48:58 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-11-24 18:48:58 +0200 |
| commit | 69204571425ed3221e94c7eb1e030c00089bca26 (patch) | |
| tree | 3d9cfbc44a057883c7db6bce267c8ebfd5fa9313 /storage/xtradb/dict/dict0dict.c | |
| parent | e3e60a4102d6918e4231e402bef89b1a6b2a20cb (diff) | |
| parent | d26aefb0775048128495eaab151ee4118f8f7afd (diff) | |
| download | mariadb-git-69204571425ed3221e94c7eb1e030c00089bca26.tar.gz | |
Merge with MariaDB 5.1
Diffstat (limited to 'storage/xtradb/dict/dict0dict.c')
| -rw-r--r-- | storage/xtradb/dict/dict0dict.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/storage/xtradb/dict/dict0dict.c b/storage/xtradb/dict/dict0dict.c index 18880a5c72c..a8a1d7a11e6 100644 --- a/storage/xtradb/dict/dict0dict.c +++ b/storage/xtradb/dict/dict0dict.c @@ -4524,6 +4524,8 @@ dict_store_statistics( break; } + btr_pcur_store_position(&pcur, &mtr); + if (rec_get_deleted_flag(rec, 0)) { /* don't count */ i--; @@ -4564,6 +4566,10 @@ dict_store_statistics( rests--; next_rec: + mtr_commit(&mtr); + mtr_start(&mtr); + btr_pcur_restore_position(BTR_MODIFY_LEAF, &pcur, &mtr); + btr_pcur_move_to_next_user_rec(&pcur, &mtr); } btr_pcur_close(&pcur); @@ -4654,6 +4660,7 @@ dict_update_statistics( do { if (table->is_corrupt) { ut_a(srv_pass_corrupt_table); + dict_table_stats_unlock(table, RW_X_LATCH); return; } |