From: msvensson
Date: December 21 2005 2:56pm
Subject: bk commit into 5.1 tree (msvensson:1.1973)
List-Archive: http://lists.mysql.com/commits/321
Message-Id: <20051221145659.DFE5C20781F@localhost.localdomain>

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.1973 05/12/21 15:56:53 msvensson@neptunus.(none) +1 -0
  Merge neptunus.(none):/home/msvensson/mysql/bug15775/my50-bug15775
  into  neptunus.(none):/home/msvensson/mysql/bug15775/my51-bug15775

  sql/sql_acl.cc
    1.167 05/12/21 15:56:43 msvensson@neptunus.(none) +0 -0
    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:	neptunus.(none)
# Root:	/home/msvensson/mysql/bug15775/my51-bug15775/RESYNC

--- 1.166/sql/sql_acl.cc	2005-12-07 12:58:25 +01:00
+++ 1.167/sql/sql_acl.cc	2005-12-21 15:56:43 +01:00
@@ -1282,7 +1282,7 @@
 	if (j == acl_wild_hosts.elements)	// If new
 	  (void) push_dynamic(&acl_wild_hosts,(char*) &acl_user->host);
       }
-      else if (!hash_search(&acl_check_hosts,(byte*) &acl_user->host,
+      else if (!hash_search(&acl_check_hosts,(byte*) acl_user->host.hostname,
 			    (uint) strlen(acl_user->host.hostname)))
       {
 	if (my_hash_insert(&acl_check_hosts,(byte*) acl_user))