summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <pem@mysql.com>2005-09-14 10:54:02 +0200
committerunknown <pem@mysql.com>2005-09-14 10:54:02 +0200
commit8c86f8e4bfb7627051f8f231daf8bfa87c4e468a (patch)
treedb9b07109e3ba0edcb810cc5c7115a60015f74a8 /mysql-test
parent38c43ecdd3c0c57fbf8bc4e969d79d346a7b6b99 (diff)
downloadmariadb-git-8c86f8e4bfb7627051f8f231daf8bfa87c4e468a.tar.gz
Post-review fix for BUG#12712: SET AUTOCOMMIT should fail within SP/functions/triggers
mysql-test/r/sp.result: Added missing drop table. mysql-test/t/sp.test: Added missing drop table. sql/sp_head.h: Post-review fix for autocommit check in SPs and triggers. sql/sql_yacc.yy: Post-review fix for autocommit check in SPs and triggers.
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/sp.result1
-rw-r--r--mysql-test/t/sp.test1
2 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result
index 0559b45168b..e4259eae6bf 100644
--- a/mysql-test/r/sp.result
+++ b/mysql-test/r/sp.result
@@ -3323,6 +3323,7 @@ drop function bug12379|
drop procedure bug12379_1|
drop procedure bug12379_2|
drop procedure bug12379_3|
+drop table t3|
drop procedure if exists bug13124|
create procedure bug13124()
begin
diff --git a/mysql-test/t/sp.test b/mysql-test/t/sp.test
index a1e2bf8aa32..1e78a38c040 100644
--- a/mysql-test/t/sp.test
+++ b/mysql-test/t/sp.test
@@ -4161,6 +4161,7 @@ drop function bug12379|
drop procedure bug12379_1|
drop procedure bug12379_2|
drop procedure bug12379_3|
+drop table t3|
#
# Bug #13124 Stored Procedure using SELECT INTO crashes server