summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Lenev <Dmitry.Lenev@oracle.com>2012-03-11 16:11:08 +0400
committerDmitry Lenev <Dmitry.Lenev@oracle.com>2012-03-11 16:11:08 +0400
commitc7a6ee1964ae0a9c51f86d69dccd15981a996b9c (patch)
tree3af3f605e4dd876fa33771b3fd4790b248f44493
parent35d865f2fe497fb5bf15810cf31f717d5d9c4e46 (diff)
parent745b849455e39d38d56f51bfd4de6c95b76675eb (diff)
downloadmariadb-git-c7a6ee1964ae0a9c51f86d69dccd15981a996b9c.tar.gz
Merged fix for a test case into 5.5 tree.
-rw-r--r--mysql-test/r/sp-bugs.result1
-rw-r--r--mysql-test/t/sp-bugs.test1
2 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/sp-bugs.result b/mysql-test/r/sp-bugs.result
index 7d08ffb2f71..3f6445a2d47 100644
--- a/mysql-test/r/sp-bugs.result
+++ b/mysql-test/r/sp-bugs.result
@@ -130,4 +130,5 @@ CALL p1();
Warnings:
Note 1050 Table 't2' already exists
DROP DATABASE testdb;
+USE test;
End of 5.1 tests
diff --git a/mysql-test/t/sp-bugs.test b/mysql-test/t/sp-bugs.test
index a23ccea8189..2d143b6d86a 100644
--- a/mysql-test/t/sp-bugs.test
+++ b/mysql-test/t/sp-bugs.test
@@ -161,5 +161,6 @@ CALL p1();
--echo # below stmt should not return valgrind warnings
CALL p1();
DROP DATABASE testdb;
+USE test;
--echo End of 5.1 tests