diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-11-23 23:39:59 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-11-23 23:39:59 +0200 |
| commit | b52020221e8b4e58d1bc6dd5a5a6f065a6a3a083 (patch) | |
| tree | 6068b9d90b4127b1c3608e29913fa82bf1a1f20e /storage/myisam/rt_index.c | |
| parent | 7840965db9460e2117c163f3db83aaa247c65203 (diff) | |
| parent | 498ee6bd19eabc85dcbd9abebc9cf6aeb79d1985 (diff) | |
| download | mariadb-git-b52020221e8b4e58d1bc6dd5a5a6f065a6a3a083.tar.gz | |
Merge with MySQL 5.1.52
Diffstat (limited to 'storage/myisam/rt_index.c')
| -rw-r--r-- | storage/myisam/rt_index.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/storage/myisam/rt_index.c b/storage/myisam/rt_index.c index 575cc32eb56..6a825bab1fa 100644 --- a/storage/myisam/rt_index.c +++ b/storage/myisam/rt_index.c @@ -481,17 +481,13 @@ static uchar *rtree_pick_key(MI_INFO *info, MI_KEYDEF *keyinfo, uchar *key, uint key_length, uchar *page_buf, uint nod_flag) { double increase; - double best_incr; + double UNINIT_VAR(best_incr); double area; - double best_area; + double UNINIT_VAR(best_area); uchar *best_key= NULL; uchar *k = rt_PAGE_FIRST_KEY(page_buf, nod_flag); uchar *last = rt_PAGE_END(page_buf); - LINT_INIT(best_area); - LINT_INIT(best_key); - LINT_INIT(best_incr); - for (; k < last; k = rt_PAGE_NEXT_KEY(k, key_length, nod_flag)) { /* The following is safe as -1.0 is an exact number */ |