database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

post merge fixes

Browse Source 
sql/sql_parse.cc:
  Auto merged
This commit is contained in:
unknown
2005-03-08 22:59:21 +02:00
parent 50985b6783 39c32324d6
commit 12c6eb3b08
5 changed files with 56 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2697,6 +2697,30 @@ call bug7992()|
call bug7992()|
drop procedure bug7992|
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 (
lpitnumber int(11) default null,
lrecordtype int(11) default null

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

@ -3276,7 +3276,35 @@ call bug7992()|
call bug7992()|
drop procedure bug7992|
drop table t3|
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