diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-04-28 12:22:32 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-04-28 12:22:32 +0300 |
| commit | f740d23ce6574bf57449aa48b22d6345f35ad2c0 (patch) | |
| tree | 85eb18f1464b3dc76e571354401a2072cb8c8ba0 /storage/xtradb/dict | |
| parent | e21c15a7e626b5c01d9770d82aaed56053c7baef (diff) | |
| parent | 97e0c260dc8273f809915505f8dfdccd948b4b99 (diff) | |
| download | mariadb-git-f740d23ce6574bf57449aa48b22d6345f35ad2c0.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'storage/xtradb/dict')
| -rw-r--r-- | storage/xtradb/dict/dict0stats.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/xtradb/dict/dict0stats.cc b/storage/xtradb/dict/dict0stats.cc index 6a28f3cdf8f..33b6c2e23e0 100644 --- a/storage/xtradb/dict/dict0stats.cc +++ b/storage/xtradb/dict/dict0stats.cc @@ -1576,7 +1576,7 @@ dict_stats_analyze_index_below_cur( page = buf_block_get_frame(block); - if (btr_page_get_level(page, mtr) == 0) { + if (page_is_leaf(page)) { /* leaf level */ break; } @@ -1620,7 +1620,7 @@ dict_stats_analyze_index_below_cur( } /* make sure we got a leaf page as a result from the above loop */ - ut_ad(btr_page_get_level(page, &mtr) == 0); + ut_ad(page_is_leaf(page)); /* scan the leaf page and find the number of distinct keys, when looking only at the first n_prefix columns; also estimate |