Commit b6193540 authored by unknown's avatar unknown
Browse files

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 

into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0


sql/sql_parse.cc:
  Auto merged
parents c9457005 8e921914

mysql-test/mysql-test-run.sh

+6 −6
Original line number Diff line number Diff line
@@ -1535,12 +1535,12 @@ run_testcase () 
   return

 fi



 if [ -f "$TESTDIR/$tname.disabled" ]

 then

   comment=`$CAT $TESTDIR/$tname.disabled`;

   disable_test $tname "$comment"

   return

 fi

# if [ -f "$TESTDIR/$tname.disabled" ]

# then

#   comment=`$CAT $TESTDIR/$tname.disabled`;

#   disable_test $tname "$comment"

#   return

# fi

 if [ -f "$TESTDIR/disabled.def" ] ; then

   comment=`$GREP "^$tname *: *" $TESTDIR/disabled.def`;

   if [ -n "$comment" ]

mysql-test/r/sp.result

+19 −0
Original line number Diff line number Diff line
@@ -2777,4 +2777,23 @@ a 
3.2000

drop procedure bug8937|

delete from t1|

drop procedure if exists bug6600|

drop table if exists t3|

drop view if exists v1|

create table t3 (s1 decimal(31,30))|

create view v1 as select * from t3|

create procedure bug6600()

check table v1|

call bug6600()|

Table	Op	Msg_type	Msg_text

test.v1	check	status	OK

call bug6600()|

Table	Op	Msg_type	Msg_text

test.v1	check	status	OK

call bug6600()|

Table	Op	Msg_type	Msg_text

test.v1	check	status	OK

drop procedure bug6600|

drop view v1|

drop table t3|

drop table t1,t2;

mysql-test/r/sp_trans.result

+12 −12
Original line number Diff line number Diff line 
drop procedure if exists sp1;

drop procedure if exists bug8850|

create table t1 (a int) engine=innodb|

create procedure sp1 ()

create procedure bug8850()

begin

truncate table t1; insert t1 values (1); rollback;

end|

set autocommit=0;

insert t1 values (2);

call sp1();

set autocommit=0|

insert t1 values (2)|

call bug8850()|

ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction

commit;

select * from t1;

commit|

select * from t1|

a

2

call sp1();

call bug8850()|

ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction

set autocommit=1;

select * from t1;

set autocommit=1|

select * from t1|

a

2

drop table t1;

drop procedure sp1;
 
drop table t1|

drop procedure bug8850|

mysql-test/t/sp-error.test

+9 −0
Original line number Diff line number Diff line
@@ -680,6 +680,15 @@ begin 
end|





#

# BUG#NNNN: New bug synopsis

#

#--disable_warnings

#drop procedure if exists bugNNNN|

#--enable_warnings

#create procedure bugNNNN...





drop table t1|



delimiter ;|

mysql-test/t/sp-threads.test

+11 −1
Original line number Diff line number Diff line 
#

# Testing stored procedures with multiple connections

# Testing stored procedures with multiple connections,

# except security/privilege tests, they go to sp-security.test

#



connect (con1root,localhost,root,,);
@@ -52,3 +53,12 @@ connection con1root; 
drop table t1;

drop procedure bug4934;





#

# BUG#NNNN: New bug synopsis

#

#--disable_warnings

#drop procedure if exists bugNNNN;

#--enable_warnings

#create procedure bugNNNN...