bk commit into 5.1 tree (msvensson:1.2198)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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.2198 06/03/01 10:07:14 msvensson@shellback.(none) +2 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
  into  shellback.(none):/home/msvensson/mysql/mysql-5.1

  sql/sql_acl.cc
    1.183 06/03/01 10:07:08 msvensson@shellback.(none) +0 -0
    Auto merged

  sql/field.h
    1.179 06/03/01 10:07:08 msvensson@shellback.(none) +0 -3
    Auto merged

# 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:	msvensson
# Host:	shellback.(none)
# Root:	/home/msvensson/mysql/mysql-5.1/RESYNC

--- 1.178/sql/field.h	2006-02-28 22:46:22 +01:00
+++ 1.179/sql/field.h	2006-03-01 10:07:08 +01:00
@@ -1364,6 +1364,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); }

--- 1.182/sql/sql_acl.cc	2006-02-24 00:29:32 +01:00
+++ 1.183/sql/sql_acl.cc	2006-03-01 10:07:08 +01:00
@@ -263,7 +263,9 @@
 
   acl_cache= new hash_filo(ACL_CACHE_SIZE, 0, 0,
                            (hash_get_key) acl_entry_get_key,
-                           (hash_free_key) free, system_charset_info);
+                           (hash_free_key) free,
+                           /* Use the case sensitive "binary" charset */
+                           &my_charset_bin);
   if (dont_read_acl_tables)
   {
     DBUG_RETURN(0); /* purecov: tested */