Merge

client/mysqltest.c:
  Auto merged
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Auto merged
myisam/mi_create.c:
  Auto merged
mysql-test/r/grant2.result:
  Auto merged
mysql-test/r/metadata.result:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/type_enum.result:
  Auto merged
mysql-test/t/grant2.test:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  SCCS merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  SCCS merged
sql/sql_union.cc:
  DBUG_ASSERT(TRUE) is useless so assume opposite

1 files changed, 19 insertions, 1 deletions

diff --git a/mysql-test/t/grant2.test b/mysql-test/t/grant2.test
index 923e65e9e1d..528e3fde173 100644
--- a/mysql-test/t/grant2.test
+++ b/mysql-test/t/grant2.test
@@ -9,6 +9,7 @@ SET NAMES binary;
 # prepare playground before tests
 --disable_warnings
 drop database if exists mysqltest;
+drop database if exists mysqltest_1;
 --enable_warnings
 delete from mysql.user where user like 'mysqltest\_%';
 delete from mysql.db where user like 'mysqltest\_%';
@@ -56,7 +57,6 @@ grant create user on *.* to mysqltest_1@localhost;
 connect (user1,localhost,mysqltest_1,,);
 connection user1;
 select current_user();
-select current_user;
 grant all privileges on `my\_1`.* to mysqltest_2@localhost with grant option;
 --error 1044
 grant all privileges on `my_%`.* to mysqltest_3@localhost with grant option;
@@ -83,6 +83,24 @@ delete from mysql.user where user like 'mysqltest\_%';
 delete from mysql.db where user like 'mysqltest\_%';
 flush privileges;
 
+#
+# wild_compare part two - acl_cache
+#
+create database mysqltest_1;
+grant all privileges on `mysqltest\_1`.* to mysqltest_1@localhost with grant option;
+connect (user2,localhost,mysqltest_1,,);
+connection user2;
+select current_user();
+show databases;
+--error 1044
+grant all privileges on `mysqltest_1`.* to mysqltest_1@localhost with grant option;
+disconnect user2;
+connection default;
+show grants for mysqltest_1@localhost;
+delete from mysql.user where user like 'mysqltest\_%';
+delete from mysql.db where user like 'mysqltest\_%';
+drop database mysqltest_1;
+flush privileges;
 
 #
 # Bug #6173: One can circumvent missing UPDATE privilege if he has SELECT