1 files changed, 24 insertions, 4 deletions
diff --git a/mysql-test/t/grant2.test b/mysql-test/t/grant2.test
index ad3fc1c228e..7a09559ac56 100644
--- a/mysql-test/t/grant2.test
+++ b/mysql-test/t/grant2.test
@@ -59,10 +59,9 @@ flush privileges;
 use mysqltest;
 create table t1 (id int primary key, data varchar(255));
 
-connect (mrbad, localhost, mysqltest_1,,);
+connect (mrbad, localhost, mysqltest_1,,mysqltest);
 connection mrbad;
 show grants for current_user();
-use mysqltest;
 insert into t1 values (1, 'I can''t change it!');
 --error 1142
 update t1 set data='I can change it!' where id = 1;
@@ -70,11 +69,10 @@ update t1 set data='I can change it!' where id = 1;
 --error 1142
 insert into t1 values (1, 'XXX') on duplicate key update data= 'I can change it!';
 select * from t1;
+disconnect mrbad;
 
 connection default;
 drop table t1;
-drop database mysqltest;
-use test;
 delete from mysql.user where user like 'mysqltest\_%';
 delete from mysql.db where user like 'mysqltest\_%';
 flush privileges;
@@ -226,4 +224,26 @@ connection default;
 drop user mysqltest_B@'%';
 drop user mysqltest_3@localhost;
 #
+#
+#
+create table t1 (a int, b int);
+grant select (a) on t1 to mysqltest_1@localhost with grant option;
+connect (mrugly, localhost, mysqltest_1,,mysqltest);
+connection mrugly;
+--error 1143
+grant select (a,b) on t1 to mysqltest_2@localhost;
+--error 1142
+grant select on t1 to mysqltest_3@localhost;
+disconnect mrugly;
+
+connection default;
+drop table t1;
+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\_%';
+delete from mysql.columns_priv where user like 'mysqltest\_%';
+flush privileges;
+
+drop database mysqltest;
+use test;