mirror of
https://github.com/MariaDB/server.git
synced 2026-05-16 11:57:38 +02:00
Merge of mysql-5.1-bugteam into mysql-5.5-merge.
This commit is contained in:
commit
d63db001b6
4 changed files with 9 additions and 23 deletions
|
|
@ -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 */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue