summaryrefslogtreecommitdiff
path: root/mysql-test/t/sp.test
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2016-12-30 08:56:13 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2016-12-30 08:56:13 +0200
commit970f17cbfc8825a39d10a6dec0bb7d8c432a9b3e (patch)
tree2f285ed9e12c27a63e9fb99012ecfc5dca0a3929 /mysql-test/t/sp.test
parent341c375d4bddf0e5c381954606ca18be3b8c55e0 (diff)
parent23cc1be270c7304963643947d8e5ab88f4e312ee (diff)
downloadmariadb-git-970f17cbfc8825a39d10a6dec0bb7d8c432a9b3e.tar.gz
Merge 10.1 into 10.2
Diffstat (limited to 'mysql-test/t/sp.test')
-rw-r--r--mysql-test/t/sp.test26
1 files changed, 14 insertions, 12 deletions
diff --git a/mysql-test/t/sp.test b/mysql-test/t/sp.test
index 5d8db90ab4d..08f7fa5035b 100644
--- a/mysql-test/t/sp.test
+++ b/mysql-test/t/sp.test
@@ -9499,6 +9499,20 @@ end |
drop table t1,t2;
--echo #
+--echo # MDEV-11584: GRANT inside an SP does not work well on 2nd execution
+--echo #
+
+CREATE PROCEDURE sp1()
+ GRANT ALL PRIVILEGES ON *.* TO 'foo'@'%' IDENTIFIED BY 'pass';
+CALL sp1();
+CALL sp1();
+drop user 'foo'@'%';
+drop procedure sp1;
+
+
+--echo #End of 10.1 tests
+
+--echo #
--echo # MDEV-11081: CURSOR for query with GROUP BY
--echo #
@@ -9534,15 +9548,3 @@ DELIMITER ;|
CALL p1();
DROP PROCEDURE p1;
DROP TABLE t1;
-
-
---echo #
---echo # MDEV-11584: GRANT inside an SP does not work well on 2nd execution
---echo #
-
-CREATE PROCEDURE sp1()
- GRANT ALL PRIVILEGES ON *.* TO 'foo'@'%' IDENTIFIED BY 'pass';
-CALL sp1();
-CALL sp1();
-drop user 'foo'@'%';
-drop procedure sp1;