diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2016-12-30 08:56:13 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2016-12-30 08:56:13 +0200 |
| commit | 970f17cbfc8825a39d10a6dec0bb7d8c432a9b3e (patch) | |
| tree | 2f285ed9e12c27a63e9fb99012ecfc5dca0a3929 /mysql-test/r/sp.result | |
| parent | 341c375d4bddf0e5c381954606ca18be3b8c55e0 (diff) | |
| parent | 23cc1be270c7304963643947d8e5ab88f4e312ee (diff) | |
| download | mariadb-git-970f17cbfc8825a39d10a6dec0bb7d8c432a9b3e.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'mysql-test/r/sp.result')
| -rw-r--r-- | mysql-test/r/sp.result | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result index 4a37c33746f..02cca6b7284 100644 --- a/mysql-test/r/sp.result +++ b/mysql-test/r/sp.result @@ -8041,6 +8041,16 @@ end | ERROR 0A000: Not allowed to return a result set from a function drop table t1,t2; # +# MDEV-11584: GRANT inside an SP does not work well on 2nd execution +# +CREATE PROCEDURE sp1() +GRANT ALL PRIVILEGES ON *.* TO 'foo'@'%' IDENTIFIED BY 'pass'; +CALL sp1(); +CALL sp1(); +drop user 'foo'@'%'; +drop procedure sp1; +#End of 10.1 tests +# # MDEV-11081: CURSOR for query with GROUP BY # CREATE TABLE t1 (name VARCHAR(10), value INT); @@ -8079,12 +8089,3 @@ v_name v_total c 1 DROP PROCEDURE p1; DROP TABLE t1; -# -# MDEV-11584: GRANT inside an SP does not work well on 2nd execution -# -CREATE PROCEDURE sp1() -GRANT ALL PRIVILEGES ON *.* TO 'foo'@'%' IDENTIFIED BY 'pass'; -CALL sp1(); -CALL sp1(); -drop user 'foo'@'%'; -drop procedure sp1; |