summaryrefslogtreecommitdiff
path: root/mysql-test/t/sp_trans.test
diff options
context:
space:
mode:
authorunknown <lars@mysql.com>2005-06-07 16:43:43 +0200
committerunknown <lars@mysql.com>2005-06-07 16:43:43 +0200
commit887172a466de944bb580aa804ab8ea631ec502f0 (patch)
treeddb3cc0b06cbf143ef440314282f367bcfad266f /mysql-test/t/sp_trans.test
parent5c05594a24a75ea2230d76f6b224967d830b3042 (diff)
downloadmariadb-git-887172a466de944bb580aa804ab8ea631ec502f0.tar.gz
BUG#6883: Merge fixes
mysql-test/r/innodb.result: Minor fixes mysql-test/r/rpl_ddl.result: Merge fixes mysql-test/r/sp_trans.result: TRUNCATE now makes implicit commit mysql-test/t/sp_trans.test: No error since we have inplicit commit
Diffstat (limited to 'mysql-test/t/sp_trans.test')
-rw-r--r--mysql-test/t/sp_trans.test6
1 files changed, 1 insertions, 5 deletions
diff --git a/mysql-test/t/sp_trans.test b/mysql-test/t/sp_trans.test
index f5b38ada674..be124766181 100644
--- a/mysql-test/t/sp_trans.test
+++ b/mysql-test/t/sp_trans.test
@@ -20,14 +20,10 @@ end|
set autocommit=0|
insert t1 values (2)|
---error 1192
call bug8850()|
commit|
select * from t1|
-#
-# when CALL will be fixed to not start a transaction, the error should
-# go away
---error 1192
+
call bug8850()|
set autocommit=1|
select * from t1|