summaryrefslogtreecommitdiff
path: root/storage/innobase/btr/btr0cur.c
diff options
context:
space:
mode:
authorVasil Dimov <vasil.dimov@oracle.com>2010-11-03 12:07:16 +0200
committerVasil Dimov <vasil.dimov@oracle.com>2010-11-03 12:07:16 +0200
commit99cd1a616fbff508b7f877ef6f023f04ae511b78 (patch)
tree35815e669102f1b99802434563bd51fa93b3c2a6 /storage/innobase/btr/btr0cur.c
parentf45f5902cef9a7b4b83acf1868fd78c187972bbd (diff)
parenta491492f15ef8a06d426719cae0c20b370956790 (diff)
downloadmariadb-git-99cd1a616fbff508b7f877ef6f023f04ae511b78.tar.gz
Merge mysql-5.1-innodb -> mysql-5.5-innodb
Diffstat (limited to 'storage/innobase/btr/btr0cur.c')
-rw-r--r--storage/innobase/btr/btr0cur.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/storage/innobase/btr/btr0cur.c b/storage/innobase/btr/btr0cur.c
index 378b9020c0d..b8668abf321 100644
--- a/storage/innobase/btr/btr0cur.c
+++ b/storage/innobase/btr/btr0cur.c
@@ -3633,8 +3633,6 @@ btr_estimate_number_of_different_key_vals(
also the pages used for external storage of fields (those pages are
included in index->stat_n_leaf_pages) */
- dict_index_stat_mutex_enter(index);
-
for (j = 0; j <= n_cols; j++) {
index->stat_n_diff_key_vals[j]
= ((n_diff[j]
@@ -3664,8 +3662,6 @@ btr_estimate_number_of_different_key_vals(
index->stat_n_diff_key_vals[j] += add_on;
}
- dict_index_stat_mutex_exit(index);
-
mem_free(n_diff);
if (UNIV_LIKELY_NULL(heap)) {
mem_heap_free(heap);