1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge from mysql-5.1-innodb to mysql-5.5-innodb

Browse Source
This commit is contained in:
Jimmy Yang 2011-01-28 01:10:40 -08:00
commit 5d2239e118
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
storage/innobase/btr/btr0cur.c
View File

@ -3643,6 +3643,9 @@ btr_estimate_number_of_different_key_vals(
while (!page_rec_is_supremum(rec)) { while (!page_rec_is_supremum(rec)) {
rec_t* next_rec = page_rec_get_next(rec); rec_t* next_rec = page_rec_get_next(rec);
if (page_rec_is_supremum(next_rec)) { if (page_rec_is_supremum(next_rec)) {
total_external_size +=
btr_rec_get_externally_stored_len(
rec, offsets_rec);
break; break;
} }
@ -3650,7 +3653,8 @@ btr_estimate_number_of_different_key_vals(
matched_bytes = 0; matched_bytes = 0;
offsets_next_rec = rec_get_offsets(next_rec, index, offsets_next_rec = rec_get_offsets(next_rec, index,
offsets_next_rec, offsets_next_rec,
n_cols, &heap); ULINT_UNDEFINED,
&heap);
cmp_rec_rec_with_match(rec, next_rec, cmp_rec_rec_with_match(rec, next_rec,
offsets_rec, offsets_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); mtr_commit(&mtr);
} }