bk commit into 5.1 tree (msvensson:1.2021)

[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.2021 06/01/10 08:01:47 msvensson@neptunus.(none) +9 -0
  Merge neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration
  into  neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration

  sql/sql_acl.cc
    1.172 06/01/10 08:01:40 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/mysqltest.test
    1.27 06/01/10 08:01:40 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/grant.result
    1.45 06/01/10 08:01:40 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/mysql-test-run.sh
    1.285 06/01/10 08:01:40 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/mysql-test-run.pl
    1.49 06/01/10 08:01:40 msvensson@neptunus.(none) +0 -0
    Auto merged

  libmysql_r/Makefile.am
    1.24 06/01/10 08:01:40 msvensson@neptunus.(none) +0 -2
    Auto merged

  include/Makefile.am
    1.59 06/01/10 08:01:40 msvensson@neptunus.(none) +0 -2
    Auto merged

  config/ac-macros/yassl.m4
    1.12 06/01/10 08:01:39 msvensson@neptunus.(none) +0 -3
    Auto merged

  client/mysqltest.c
    1.169 06/01/10 08:01:39 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/wl2930/my51-wl2930-integration/RESYNC

--- 1.171/sql/sql_acl.cc	2006-01-06 19:34:57 +01:00
+++ 1.172/sql/sql_acl.cc	2006-01-10 08:01:40 +01:00
@@ -1541,7 +1541,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);
@@ -4649,7 +4650,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;

--- 1.44/mysql-test/r/grant.result	2005-11-28 20:07:09 +01:00
+++ 1.45/mysql-test/r/grant.result	2006-01-10 08:01:40 +01:00
@@ -615,3 +615,12 @@
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
 set names latin1;
+create user mysqltest_7@;
+set password for mysqltest_7@ = password('systpass');
+show grants for mysqltest_7@;
+Grants for mysqltest_7@
+GRANT USAGE ON *.* TO 'mysqltest_7'@'' IDENTIFIED BY PASSWORD '*2FB071A056F9BB745219D9C876814231DAF46517'
+drop user mysqltest_7@;
+flush privileges;
+show grants for mysqltest_7@;
+ERROR 42000: There is no such grant defined for user 'mysqltest_7' on host ''