bk commit into 5.0 tree (tnurnberg:1.2248)

[Tatjana A Nuernberg]

Below is the list of changes that have just been committed into a local
5.0 repository of tnurnberg. When tnurnberg 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@stripped, 2006-08-22 14:31:57+02:00, tnurnberg@stripped +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
  into  salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.0-maint-20411
  MERGE: 1.2216.21.1

  sql/sql_acl.cc@stripped, 2006-08-22 14:31:51+02:00, tnurnberg@stripped
+0 -0
    Auto merged
    MERGE: 1.200.2.1

# 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:	tnurnberg
# Host:	salvation.intern.azundris.com
# Root:	/home/tnurnberg/work/mysql-5.0-maint-20411/RESYNC

--- 1.203/sql/sql_acl.cc	2006-08-22 14:32:12 +02:00
+++ 1.204/sql/sql_acl.cc	2006-08-22 14:32:12 +02:00
@@ -874,6 +874,7 @@ int acl_getroot(THD *thd, USER_RESOURCES
             sql_print_information("X509 issuer mismatch: should be '%s' "
 			      "but is '%s'", acl_user->x509_issuer, ptr);
           free(ptr);
+          user_access=NO_ACCESS;
           break;
         }
         user_access= acl_user->access;
@@ -889,11 +890,13 @@ int acl_getroot(THD *thd, USER_RESOURCES
         if (strcmp(acl_user->x509_subject,ptr))
         {
           if (global_system_variables.log_warnings)
-            sql_print_information("X509 subject mismatch: '%s' vs '%s'",
+            sql_print_information("X509 subject mismatch: should be '%s' but is '%s'",
                             acl_user->x509_subject, ptr);
+          free(ptr);
+          user_access=NO_ACCESS;
+          break;
         }
-        else
-          user_access= acl_user->access;
+        user_access= acl_user->access;
         free(ptr);
       }
       break;