diff options
| author | Jimmy Yang <jimmy.yang@oracle.com> | 2011-01-28 01:10:40 -0800 |
|---|---|---|
| committer | Jimmy Yang <jimmy.yang@oracle.com> | 2011-01-28 01:10:40 -0800 |
| commit | df13ee2eb6fe6609819438bc1d1fa1c219a3eb98 (patch) | |
| tree | 0c18f4cb7fede678a1c2c112d855526a736e93e2 /storage/innobase/btr/btr0cur.c | |
| parent | 438888dfebc3aacaa9e5ea4497f3eb808ee32a15 (diff) | |
| parent | 71e8043bae2071ba875b18326504b1058b8deb98 (diff) | |
| download | mariadb-git-df13ee2eb6fe6609819438bc1d1fa1c219a3eb98.tar.gz | |
Merge from mysql-5.1-innodb to mysql-5.5-innodb
Diffstat (limited to 'storage/innobase/btr/btr0cur.c')
| -rw-r--r-- | storage/innobase/btr/btr0cur.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/storage/innobase/btr/btr0cur.c b/storage/innobase/btr/btr0cur.c index cc2a1bcde40..8218fc81c13 100644 --- a/storage/innobase/btr/btr0cur.c +++ b/storage/innobase/btr/btr0cur.c @@ -3643,6 +3643,9 @@ btr_estimate_number_of_different_key_vals( while (!page_rec_is_supremum(rec)) { rec_t* next_rec = page_rec_get_next(rec); if (page_rec_is_supremum(next_rec)) { + total_external_size += + btr_rec_get_externally_stored_len( + rec, offsets_rec); break; } @@ -3650,7 +3653,8 @@ btr_estimate_number_of_different_key_vals( matched_bytes = 0; offsets_next_rec = rec_get_offsets(next_rec, index, offsets_next_rec, - n_cols, &heap); + ULINT_UNDEFINED, + &heap); cmp_rec_rec_with_match(rec, next_rec, offsets_rec, offsets_next_rec, @@ -3705,10 +3709,6 @@ btr_estimate_number_of_different_key_vals( } } - offsets_rec = rec_get_offsets(rec, index, offsets_rec, - ULINT_UNDEFINED, &heap); - total_external_size += btr_rec_get_externally_stored_len( - rec, offsets_rec); mtr_commit(&mtr); } |