1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing post-merge errors

Browse Source
This commit is contained in:
Sinisa@sinisa.nasamreza.org 2005-03-09 00:09:18 +02:00
parent b2c77c1c9c
commit b8e28ff9bd
2 changed files with 49 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
mysql-test/r/sp.result
View File

@ -2697,30 +2697,6 @@ call bug7992()|
call bug7992()| call bug7992()|
drop procedure bug7992| drop procedure bug7992|
drop table t3| drop table t3|
drop table t2;
drop table t1;
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;
create table t3 ( create table t3 (
lpitnumber int(11) default null, lpitnumber int(11) default null,
lrecordtype int(11) default null lrecordtype int(11) default null
@ -2780,3 +2756,25 @@ 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;

55
mysql-test/t/sp.test
View File

@ -3277,34 +3277,6 @@ call bug7992()|
drop procedure bug7992| drop procedure bug7992|
drop table t3| drop table t3|
delimiter ;| delimiter ;|
drop table t2;
drop table t1;
#
# 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;
# #
# BUG#8849: problem with insert statement with table alias's # BUG#8849: problem with insert statement with table alias's
@ -3312,6 +3284,7 @@ drop procedure sp1;
# Rolling back changes to AND/OR structure of ON and WHERE clauses in SP # Rolling back changes to AND/OR structure of ON and WHERE clauses in SP
# #
delimiter |;
create table t3 ( create table t3 (
lpitnumber int(11) default null, lpitnumber int(11) default null,
lrecordtype int(11) default null lrecordtype int(11) default null
@ -3387,3 +3360,29 @@ delete from t1|
# practical, or create table t3, t3 etc temporarily (and drop them). # practical, or create table t3, t3 etc temporarily (and drop them).
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;