10.0-base merge

1 files changed, 22 insertions, 0 deletions

diff --git a/mysql-test/t/grant_4332.test b/mysql-test/t/grant_4332.test
index f77d3be350f..302624e3873 100644
--- a/mysql-test/t/grant_4332.test
+++ b/mysql-test/t/grant_4332.test
@@ -58,16 +58,38 @@ select user from mysql.tables_priv;
 --error ER_COLUMNACCESS_DENIED_ERROR
 select user,host from mysql.tables_priv;
 
+--error ER_DBACCESS_DENIED_ERROR
+use mtr;
+
+--error ER_PROCACCESS_DENIED_ERROR
+drop procedure mtr.add_suppression;
+
 create procedure test.p1() select user(), current_user(), user from mysql.tables_priv;
 
 show create procedure test.p1;
 
+select definer from information_schema.routines;
+
 create table test.t1 (a text);
 create event e1 on schedule every 1 second
   do insert test.t1 values (concat(user(), ' ', current_user()));
 
+select definer from information_schema.events;
+
+create view v1 as select * from t1;
+select definer from information_schema.views;
+drop view v1;
+
+create trigger tr1 before delete on t1 for each row set @a:=1;
+select definer from information_schema.triggers;
+drop trigger tr1;
+
 connection default;
 
+--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
+--error ER_ACCESS_DENIED_ERROR
+connect (c80bad,localhost,c80cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc0,foobar,);
+
 call test.p1();
 
 disconnect a17;