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, 20 insertions, 3 deletions

diff --git a/mysql-test/r/grant2.result b/mysql-test/r/grant2.result
index c223d6e3541..6eb99712783 100644
--- a/mysql-test/r/grant2.result
+++ b/mysql-test/r/grant2.result
@@ -1,5 +1,6 @@
 SET NAMES binary;
 drop database if exists mysqltest;
+drop database if exists mysqltest_1;
 delete from mysql.user where user like 'mysqltest\_%';
 delete from mysql.db where user like 'mysqltest\_%';
 delete from mysql.tables_priv where user like 'mysqltest\_%';
@@ -27,9 +28,6 @@ grant create user on *.* to mysqltest_1@localhost;
 select current_user();
 current_user()
 mysqltest_1@localhost
-select current_user;
-current_user
-mysqltest_1@localhost
 grant all privileges on `my\_1`.* to mysqltest_2@localhost with grant option;
 grant all privileges on `my_%`.* to mysqltest_3@localhost with grant option;
 ERROR 42000: Access denied for user 'mysqltest_1'@'localhost' to database 'my_%'
@@ -54,6 +52,25 @@ ERROR 42000: There is no such grant defined for user 'mysqltest_3' on host 'loca
 delete from mysql.user where user like 'mysqltest\_%';
 delete from mysql.db where user like 'mysqltest\_%';
 flush privileges;
+create database mysqltest_1;
+grant all privileges on `mysqltest\_1`.* to mysqltest_1@localhost with grant option;
+select current_user();
+current_user()
+mysqltest_1@localhost
+show databases;
+Database
+mysqltest_1
+test
+grant all privileges on `mysqltest_1`.* to mysqltest_1@localhost with grant option;
+ERROR 42000: Access denied for user 'mysqltest_1'@'localhost' to database 'mysqltest_1'
+show grants for mysqltest_1@localhost;
+Grants for mysqltest_1@localhost
+GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost'
+GRANT ALL PRIVILEGES ON `mysqltest\_1`.* TO 'mysqltest_1'@'localhost' WITH GRANT OPTION
+delete from mysql.user where user like 'mysqltest\_%';
+delete from mysql.db where user like 'mysqltest\_%';
+drop database mysqltest_1;
+flush privileges;
 create database mysqltest;
 grant INSERT, SELECT on mysqltest.* to mysqltest_1@localhost;
 flush privileges;