summaryrefslogtreecommitdiff
path: root/mysql-test/t/sp-security.test
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2006-02-07 20:02:08 +0100
committerunknown <msvensson@neptunus.(none)>2006-02-07 20:02:08 +0100
commit42b1cfc55d58de85ea77fa71bd08a5fc80167df9 (patch)
tree8f2b86d1f76745bbcfb19e853b9e7faf1b0db965 /mysql-test/t/sp-security.test
parent3eb41de8cb5aaafcc0a2ba37863114b4ad7bd2fb (diff)
parent56f138b9459c41ea635c7a342a410f7452ad2b38 (diff)
downloadmariadb-git-42b1cfc55d58de85ea77fa71bd08a5fc80167df9.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
Diffstat (limited to 'mysql-test/t/sp-security.test')
-rw-r--r--mysql-test/t/sp-security.test10
1 files changed, 8 insertions, 2 deletions
diff --git a/mysql-test/t/sp-security.test b/mysql-test/t/sp-security.test
index 0b24881a056..223bc09b9fc 100644
--- a/mysql-test/t/sp-security.test
+++ b/mysql-test/t/sp-security.test
@@ -196,7 +196,6 @@ use db2;
call q();
select * from t2;
-
#
# BUG#6030: Stored procedure has no appropriate DROP privilege
# (or ALTER for that matter)
@@ -233,9 +232,13 @@ drop database db2;
select type,db,name from mysql.proc;
# Get rid of the users
delete from mysql.user where user='user1' or user='user2';
+delete from mysql.user where user='' and host='%';
# And any routine privileges
delete from mysql.procs_priv where user='user1' or user='user2';
-
+# Delete the grants to user ''@'%' that was created above
+delete from mysql.procs_priv where user='' and host='%';
+delete from mysql.db where user='user2';
+flush privileges;
#
# Test the new security acls
#
@@ -304,6 +307,9 @@ use test;
drop database sptest;
delete from mysql.user where user='usera' or user='userb' or user='userc';
delete from mysql.procs_priv where user='usera' or user='userb' or user='userc';
+delete from mysql.tables_priv where user='usera';
+flush privileges;
+drop table t1;
#
# BUG#9503: reseting correct parameters of thread after error in SP function