mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
sp.test, sp.result:
transactional test removed sp_trans.test, sp_trans.result: new file mysql-test/r/sp.result: transactional test removed mysql-test/t/sp.test: transactional test removed
This commit is contained in:
@ -2778,25 +2778,3 @@ a
|
|||||||
drop procedure bug8937|
|
drop procedure bug8937|
|
||||||
delete from t1|
|
delete from t1|
|
||||||
drop table t1,t2;
|
drop table t1,t2;
|
||||||
drop procedure if exists sp1;
|
|
||||||
create table t1 (a int) engine=innodb|
|
|
||||||
create procedure sp1 ()
|
|
||||||
begin
|
|
||||||
truncate table t1; insert t1 values (1); rollback;
|
|
||||||
end
|
|
||||||
|
|
|
||||||
set autocommit=0;
|
|
||||||
insert t1 values (2);
|
|
||||||
call sp1();
|
|
||||||
ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction
|
|
||||||
commit;
|
|
||||||
set autocommit=1;
|
|
||||||
select * from t1;
|
|
||||||
a
|
|
||||||
2
|
|
||||||
call sp1();
|
|
||||||
select * from t1;
|
|
||||||
a
|
|
||||||
1
|
|
||||||
drop table t1;
|
|
||||||
drop procedure sp1;
|
|
||||||
|
22
mysql-test/r/sp_trans.result
Normal file
22
mysql-test/r/sp_trans.result
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
drop procedure if exists sp1;
|
||||||
|
create table t1 (a int) engine=innodb|
|
||||||
|
create procedure sp1 ()
|
||||||
|
begin
|
||||||
|
truncate table t1; insert t1 values (1); rollback;
|
||||||
|
end|
|
||||||
|
set autocommit=0;
|
||||||
|
insert t1 values (2);
|
||||||
|
call sp1();
|
||||||
|
ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction
|
||||||
|
commit;
|
||||||
|
select * from t1;
|
||||||
|
a
|
||||||
|
2
|
||||||
|
call sp1();
|
||||||
|
ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction
|
||||||
|
set autocommit=1;
|
||||||
|
select * from t1;
|
||||||
|
a
|
||||||
|
2
|
||||||
|
drop table t1;
|
||||||
|
drop procedure sp1;
|
@ -3390,28 +3390,3 @@ delete from t1|
|
|||||||
delimiter ;|
|
delimiter ;|
|
||||||
drop table t1,t2;
|
drop table t1,t2;
|
||||||
|
|
||||||
#
|
|
||||||
# BUG#8850
|
|
||||||
#
|
|
||||||
--disable_warnings
|
|
||||||
drop procedure if exists sp1;
|
|
||||||
--enable_warnings
|
|
||||||
delimiter |;
|
|
||||||
create table t1 (a int) engine=innodb|
|
|
||||||
create procedure sp1 ()
|
|
||||||
begin
|
|
||||||
truncate table t1; insert t1 values (1); rollback;
|
|
||||||
end
|
|
||||||
|
|
|
||||||
delimiter ;|
|
|
||||||
set autocommit=0;
|
|
||||||
insert t1 values (2);
|
|
||||||
--error 1192
|
|
||||||
call sp1();
|
|
||||||
commit;
|
|
||||||
set autocommit=1;
|
|
||||||
select * from t1;
|
|
||||||
call sp1();
|
|
||||||
select * from t1;
|
|
||||||
drop table t1;
|
|
||||||
drop procedure sp1;
|
|
||||||
|
35
mysql-test/t/sp_trans.test
Normal file
35
mysql-test/t/sp_trans.test
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
#
|
||||||
|
# tests that require InnoDB...
|
||||||
|
#
|
||||||
|
|
||||||
|
-- source include/have_innodb.inc
|
||||||
|
|
||||||
|
#
|
||||||
|
# BUG#8850
|
||||||
|
#
|
||||||
|
--disable_warnings
|
||||||
|
drop procedure if exists sp1;
|
||||||
|
--enable_warnings
|
||||||
|
delimiter |;
|
||||||
|
create table t1 (a int) engine=innodb|
|
||||||
|
create procedure sp1 ()
|
||||||
|
begin
|
||||||
|
truncate table t1; insert t1 values (1); rollback;
|
||||||
|
end|
|
||||||
|
delimiter ;|
|
||||||
|
set autocommit=0;
|
||||||
|
insert t1 values (2);
|
||||||
|
--error 1192
|
||||||
|
call sp1();
|
||||||
|
commit;
|
||||||
|
select * from t1;
|
||||||
|
#
|
||||||
|
# when CALL will be fixed to not start a transaction, the error should
|
||||||
|
# go away
|
||||||
|
--error 1192
|
||||||
|
call sp1();
|
||||||
|
set autocommit=1;
|
||||||
|
select * from t1;
|
||||||
|
drop table t1;
|
||||||
|
drop procedure sp1;
|
||||||
|
|
Reference in New Issue
Block a user