bzr push into mysql-6.0-opt branch (sergefp:2691 to 2692)

[Sergey Petrunia]

 2692 Sergey Petrunia	2008-09-13
      Remove garbage comments
modified:
  storage/myisam/ha_myisam.cc

 2691 Sergey Petrunia	2008-09-12
      BUG:#37851: Crash in test_if_skip_sort_order tab->select is zero
      - Fix pushbuild test failure. It has turned out there are cases where tab->select->cond
        is used by filesort.
modified:
  sql/sql_select.cc

=== modified file 'storage/myisam/ha_myisam.cc'
--- a/storage/myisam/ha_myisam.cc	2008-07-09 07:12:43 +0000
+++ b/storage/myisam/ha_myisam.cc	2008-09-13 01:51:08 +0000
@@ -1482,7 +1482,6 @@ C_MODE_START
 my_bool index_cond_func_myisam(void *arg)
 {
   ha_myisam *h= (ha_myisam*)arg;
-  /*if (h->in_range_read)*/
   if (h->end_range)
   {
     if (h->compare_key2(h->end_range) > 0)
@@ -1497,7 +1496,6 @@ C_MODE_END
 int ha_myisam::index_init(uint idx, bool sorted)
 { 
   active_index=idx;
-  //in_range_read= FALSE;
   if (pushed_idx_cond_keyno == idx)
     mi_set_index_cond_func(file, index_cond_func_myisam, this);
   return 0; 
@@ -1605,13 +1603,7 @@ int ha_myisam::read_range_first(const ke
                                 bool sorted /* ignored */)
 {
   int res;
-  //if (!eq_range_arg)
-  //  in_range_read= TRUE;
-
   res= handler::read_range_first(start_key, end_key, eq_range_arg, sorted);
-
-  //if (res)
-  //  in_range_read= FALSE;
   return res;
 }
 
@@ -1619,8 +1611,6 @@ int ha_myisam::read_range_first(const ke
 int ha_myisam::read_range_next()
 {
   int res= handler::read_range_next();
-  //if (res)
-  //  in_range_read= FALSE;
   return res;
 }