bk commit into 5.1 tree (sergefp:1.2468)

[Sergey Petrunia]

Below is the list of changes that have just been committed into a local
5.1 repository of psergey. When psergey does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-03-10 01:02:08+03:00, sergefp@stripped +3 -0
  WL#2475: "Batched range read functions for MyISAM/InnoDb"
   - Fix compiler warnings

  storage/innobase/handler/ha_innodb.cc@stripped, 2007-03-10 01:02:04+03:00, sergefp@stripped +1 -1
    WL#2475: "Batched range read functions for MyISAM/InnoDb"
     - Fix compiler warnings

  storage/myisam/ha_myisam.cc@stripped, 2007-03-10 01:02:04+03:00, sergefp@stripped +1 -1
    WL#2475: "Batched range read functions for MyISAM/InnoDb"
     - Fix compiler warnings

  storage/myisam/mi_key.c@stripped, 2007-03-10 01:02:04+03:00, sergefp@stripped +1 -1
    WL#2475: "Batched range read functions for MyISAM/InnoDb"
     - Fix compiler warnings

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	sergefp
# Host:	pylon.mylan
# Root:	/home/psergey/mysql-5.2-mymrr-r55

--- 1.56/storage/myisam/mi_key.c	2007-03-10 01:02:16 +03:00
+++ 1.57/storage/myisam/mi_key.c	2007-03-10 01:02:16 +03:00
@@ -247,8 +247,8 @@
       */
       if (k_length > 0 && k_length < MI_MAX_KEY_LENGTH)
       {
-        pos=old;
         my_off_t rowid;
+        pos=old;
         rowid= my_get_ptr(pos, k_length);
         _mi_dpointer(info, key, rowid);
         pos+=length;

--- 1.211/storage/myisam/ha_myisam.cc	2007-03-10 01:02:16 +03:00
+++ 1.212/storage/myisam/ha_myisam.cc	2007-03-10 01:02:16 +03:00
@@ -1547,7 +1547,7 @@
     if (h->compare_key(h->end_range) > 0)
       return 2; /* caller should return HA_ERR_END_OF_FILE already */
   }
-  return h->idx_cond->val_int();
+  return (my_bool)h->idx_cond->val_int();
 }
 
 C_MODE_END

--- 1.323/storage/innobase/handler/ha_innodb.cc	2007-03-10 01:02:16 +03:00
+++ 1.324/storage/innobase/handler/ha_innodb.cc	2007-03-10 01:02:16 +03:00
@@ -7761,7 +7761,7 @@
     if (h->compare_key(h->end_range) > 0)
       return 2; /* caller should return HA_ERR_END_OF_FILE already */
   }
-  return h->idx_cond->val_int();
+  return (my_bool)h->idx_cond->val_int();
 }
 
 C_MODE_END