List:Commits« Previous MessageNext Message »
From:msvensson Date:January 9 2006 9:57am
Subject:bk commit into 4.1 tree (msvensson:1.2472)
View as plain text  
Below is the list of changes that have just been committed into a local
4.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.2472 06/01/09 10:57:28 msvensson@stripped +1 -0
  Merge msvensson@stripped:/home/msvensson/mysql/bug15598/my41-bug15598
  into  devsrv-b.mysql.com:/space/magnus/my41-bug15598

  sql/sql_acl.cc
    1.173 06/01/09 10:57:23 msvensson@stripped +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:	devsrv-b.mysql.com
# Root:	/space/magnus/my41-bug15598/RESYNC

--- 1.172/sql/sql_acl.cc	2006-01-04 15:35:17 +01:00
+++ 1.173/sql/sql_acl.cc	2006-01-09 10:57:23 +01:00
@@ -1371,7 +1371,8 @@
 	acl_user->user && !strcmp(user,acl_user->user))
     {
       if (exact ? !my_strcasecmp(&my_charset_latin1, host,
-                                 acl_user->host.hostname) :
+                                 acl_user->host.hostname ?
+				 acl_user->host.hostname : "") :
           compare_hostname(&acl_user->host,host,host))
       {
 	DBUG_RETURN(acl_user);
@@ -3605,7 +3606,7 @@
     if (!(user=acl_user->user))
       user= "";
     if (!(host=acl_user->host.hostname))
-      host= "%";
+      host= "";
     if (!strcmp(user_name->user.str,user) &&
 	!my_strcasecmp(system_charset_info, user_name->host.str, host))
       break;
Thread
bk commit into 4.1 tree (msvensson:1.2472)msvensson9 Jan