bk commit into 5.1 tree (kaa:1.2538)

[Alexey Kopytov]

Below is the list of changes that have just been committed into a local
5.1 repository of kaa. When kaa 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, 2007-06-06 21:44:05+04:00, kaa@stripped +2 -0
  Merge polly.local:/home/kaa/src/maint/bug28895/my50-bug28895
  into  polly.local:/home/kaa/src/maint/bug28895/my51-bug28895
  MERGE: 1.1810.2978.2

  mysql-test/r/view_grant.result@stripped, 2007-06-06 21:44:00+04:00, kaa@stripped +0 -0
    Auto merged
    MERGE: 1.8.1.17

  sql/sql_acl.cc@stripped, 2007-06-06 21:44:00+04:00, kaa@stripped +0 -0
    Auto merged
    MERGE: 1.128.1.92

# 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:	kaa
# Host:	polly.local
# Root:	/home/kaa/src/maint/bug28895/my51-bug28895/RESYNC

--- 1.234/sql/sql_acl.cc	2007-03-28 22:05:05 +04:00
+++ 1.235/sql/sql_acl.cc	2007-06-06 21:44:00 +04:00
@@ -1110,14 +1110,15 @@ bool acl_getroot_no_password(Security_co
   */
   for (i=0 ; i < acl_users.elements ; i++)
   {
-    acl_user= dynamic_element(&acl_users,i,ACL_USER*);
-    if ((!acl_user->user && !user[0]) ||
-	(acl_user->user && strcmp(user, acl_user->user) == 0))
+    ACL_USER *acl_user_tmp= dynamic_element(&acl_users,i,ACL_USER*);
+    if ((!acl_user_tmp->user && !user[0]) ||
+        (acl_user_tmp->user && strcmp(user, acl_user_tmp->user) == 0))
     {
-      if (compare_hostname(&acl_user->host, host, ip))
+      if (compare_hostname(&acl_user_tmp->host, host, ip))
       {
-	res= 0;
-	break;
+        acl_user= acl_user_tmp;
+        res= 0;
+        break;
       }
     }
   }

--- 1.33/mysql-test/r/view_grant.result	2007-03-28 22:05:00 +04:00
+++ 1.34/mysql-test/r/view_grant.result	2007-06-06 21:44:00 +04:00
@@ -603,9 +603,9 @@ Warnings:
 Note	1449	There is no 'no-such-user'@'localhost' registered
 SHOW CREATE VIEW v;
 View	Create View
-v	CREATE ALGORITHM=UNDEFINED DEFINER=`no-such-user`@`localhost` SQL SECURITY DEFINER VIEW `v` AS select `t1`.`a` AS `a` from `t1`
+v	CREATE ALGORITHM=UNDEFINED DEFINER=`no-such-user`@`localhost` SQL SECURITY DEFINER VIEW `v` AS select `test`.`t1`.`a` AS `a` from `t1`
 Warnings:
-Note	1449	There is no 'no-such-user'@'localhost' registered
+Warning	1356	View 'test.v' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
 SELECT * FROM v;
 ERROR HY000: There is no 'no-such-user'@'localhost' registered
 DROP VIEW v;