From: Date: February 27 2006 6:34pm
Subject: bk commit into 5.0 tree (lars:1.2090) BUG#13418
List-Archive: http://lists.mysql.com/commits/3206
X-Bug: 13418
Message-Id: <200602271734.k1RHYNB8004566@dl145h.mysql.com>

Below is the list of changes that have just been committed into a local
5.0 repository of lthalmann. When lthalmann 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
  1.2090 06/02/27 18:34:04 lars@stripped +1 -0
  BUG#13418: Virtualized some functions so that Bit_field class will use correct cmp functions

  sql/field.h
    1.172 06/02/27 18:33:56 lars@stripped +5 -2
    Virtualized some functions so that Bit_field class will use correct cmp functions

# 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:	lars
# Host:	dl145h.mysql.com
# Root:	/users/lthalmann/bk/mysql-5.0-bug13418

--- 1.171/sql/field.h	2006-01-03 18:04:31 +01:00
+++ 1.172/sql/field.h	2006-02-27 18:33:56 +01:00
@@ -166,8 +166,9 @@
   virtual int cmp(const char *,const char *)=0;
   virtual int cmp_binary(const char *a,const char *b, uint32 max_length=~0L)
   { return memcmp(a,b,pack_length()); }
-  int cmp_offset(uint row_offset) { return cmp(ptr,ptr+row_offset); }
-  int cmp_binary_offset(uint row_offset)
+  virtual int cmp_offset(uint row_offset)
+  { return cmp(ptr,ptr+row_offset); }
+  virtual int cmp_binary_offset(uint row_offset)
   { return cmp_binary(ptr, ptr+row_offset); };
   virtual int key_cmp(const byte *a,const byte *b)
   { return cmp((char*) a,(char*) b); }
@@ -1327,6 +1328,8 @@
   { return cmp_binary((char *) a, (char *) b); }
   int key_cmp(const byte *str, uint length);
   int cmp_offset(uint row_offset);
+  int cmp_binary_offset(uint row_offset)
+  { return cmp_offset(row_offset); }
   void get_key_image(char *buff, uint length, imagetype type);
   void set_key_image(char *buff, uint length)
   { Field_bit::store(buff, length, &my_charset_bin); }