Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0

Docs/manual.texi:
  Auto merged

1 files changed, 2 insertions, 2 deletions

diff --git a/sql/field.h b/sql/field.h
index a9b257f0c3a..df31721186e 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -107,7 +107,7 @@ public:
   inline bool real_maybe_null(void) { return null_ptr != 0; }
   virtual void make_field(Send_field *)=0;
   virtual void sort_string(char *buff,uint length)=0;
-  virtual bool optimize_range();
+  virtual bool optimize_range(uint idx);
   virtual bool store_for_compare() { return 0; }
   Field *new_field(MEM_ROOT *root, struct st_table *new_table)
   {
@@ -944,7 +944,7 @@ public:
   uint size_of() const { return sizeof(*this); }
   enum_field_types real_type() const { return FIELD_TYPE_ENUM; }
   virtual bool zero_pack() const { return 0; }
-  bool optimize_range() { return 0; }
+  bool optimize_range(uint idx) { return 0; }
   bool binary() const { return 0; }
   bool eq_def(Field *field);
 };