summaryrefslogtreecommitdiff
path: root/mysql-test/t/sp_notembedded.test
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2016-04-09 17:03:48 +0200
committerVladislav Vaintroub <wlad@mariadb.com>2016-04-09 17:03:48 +0200
commitcd776fedba3e2902bc25ee206d6e6266e7eb9411 (patch)
tree95bf82d0e0522c6af708cd28639c82e004b5a264 /mysql-test/t/sp_notembedded.test
parentf884d233e6a5f68bab846a7bdbd041fc4415ad77 (diff)
parentd516a2ae0cbd09d3b5b1667ec62b421330ab9902 (diff)
downloadmariadb-git-10.2-connector-c-integ.tar.gz
Merge branch '10.2' into 10.2-connector-c-integ10.2-connector-c-integ
Diffstat (limited to 'mysql-test/t/sp_notembedded.test')
-rw-r--r--mysql-test/t/sp_notembedded.test4
1 files changed, 0 insertions, 4 deletions
diff --git a/mysql-test/t/sp_notembedded.test b/mysql-test/t/sp_notembedded.test
index d7aaaa4340f..c620f415e22 100644
--- a/mysql-test/t/sp_notembedded.test
+++ b/mysql-test/t/sp_notembedded.test
@@ -331,7 +331,6 @@ FLUSH PRIVILEGES;
--echo #
SELECT GET_LOCK('Bug44521', 0);
--connect (con1,localhost,root,,)
---echo ** Connection con1
delimiter $;
CREATE PROCEDURE p()
BEGIN
@@ -342,7 +341,6 @@ END$
delimiter ;$
--send CALL p();
--connection default
---echo ** Default connection
let $wait_condition=
SELECT count(*) = 1 FROM information_schema.processlist
WHERE state = "User lock" AND info = "SELECT GET_LOCK('Bug44521', 100)";
@@ -420,14 +418,12 @@ use `my.db`;
CREATE FUNCTION f1(a int) RETURNS INT RETURN a;
---echo # Create new connection.
connect (addcon, localhost, root,,);
connection addcon;
USE `my.db`;
SELECT f1(1);
SELECT `my.db`.f1(2);
---echo # Switching to default connection.
connection default;
disconnect addcon;
DROP DATABASE `my.db`;