wl 1562 (To improve RTree indexes)

some changes to make code nicer

1 files changed, 2 insertions, 10 deletions

diff --git a/myisam/rt_index.c b/myisam/rt_index.c
index 824cb7a396f..8d8a5412c7b 100644
--- a/myisam/rt_index.c
+++ b/myisam/rt_index.c
@@ -462,21 +462,13 @@ static uchar *rtree_pick_key(MI_INFO *info, MI_KEYDEF *keyinfo, uchar *key,
     if ((increase = rtree_perimeter_increase(keyinfo->seg, k, key, key_length,
 					     &perimeter)) == -1)
       return NULL;
-    if (increase < best_incr)
+    if ((increase < best_incr)||
+	(increase == best_incr && perimeter < best_perimeter))
     {
       best_key = k;
       best_perimeter= perimeter;
       best_incr = increase;
     }
-    else
-    {
-      if ((increase == best_incr) && (perimeter < best_perimeter))
-      {
-        best_key = k;
-        best_perimeter= perimeter;
-        best_incr = increase;
-      }
-    }
   }
   return best_key;
 }