Commit 94d4b001 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/extern/mysql/bk/mysql-5.0 

into  mysql.com:/extern/mysql/work/cantrepeat/mysql-5.0
parents 86733db8 fd61a0c0

mysql-test/r/sp-error.result

+29 −0
Original line number Diff line number Diff line
@@ -1147,3 +1147,32 @@ show procedure status; 
Db	Name	Type	Definer	Modified	Created	Security_type	Comment

test	 bug15658	PROCEDURE	root@localhost	0000-00-00 00:00:00	0000-00-00 00:00:00	DEFINER	

drop procedure ` bug15658`;

drop function if exists bug14270;

drop table if exists t1;

create table t1 (s1 int primary key);

create function bug14270() returns int

begin

load index into cache t1;

return 1;

end|

ERROR 0A000: Not allowed to return a result set from a function

create function bug14270() returns int

begin

cache index t1 key (`primary`) in keycache1;

return 1;

end|

ERROR 0A000: Not allowed to return a result set from a function

drop table t1;

drop procedure if exists bug15091;

create procedure bug15091()

begin

declare selectstr varchar(6000) default ' ';

declare conditionstr varchar(5000)  default '';

set selectstr = concat(selectstr,

' and ',

c.operatorid,

'in (',conditionstr, ')');

end|

call bug15091();

ERROR 42S02: Unknown table 'c' in field list

drop procedure bug15091;

mysql-test/t/sp-error.test

+60 −0
Original line number Diff line number Diff line
@@ -1643,6 +1643,66 @@ show procedure status; 
drop procedure ` bug15658`;





#

# BUG#14270: Stored procedures: crash if load index

#

--disable_warnings

drop function if exists bug14270;

drop table if exists t1;

--enable_warnings



create table t1 (s1 int primary key);



delimiter |;

--error ER_SP_NO_RETSET

create function bug14270() returns int

begin

  load index into cache t1;

  return 1;

end|



--error ER_SP_NO_RETSET

create function bug14270() returns int

begin

  cache index t1 key (`primary`) in keycache1;

  return 1;

end|

delimiter ;|



drop table t1;





#

# BUG#15091: Sp Returns Unknown error in order clause....and 

#            there is no order by clause

#

--disable_warnings

drop procedure if exists bug15091;

--enable_warnings



delimiter |;

create procedure bug15091()

begin

  declare selectstr varchar(6000) default ' ';

  declare conditionstr varchar(5000)  default '';



  set selectstr = concat(selectstr,

                         ' and ',

                         c.operatorid,

                         'in (',conditionstr, ')');

end|

delimiter ;|



# The error message used to be:

#   ERROR 1109 (42S02): Unknown table 'c' in order clause

# but is now rephrased to something less misleading:

#   ERROR 1109 (42S02): Unknown table 'c' in field list

--error ER_UNKNOWN_TABLE

call bug15091();



drop procedure bug15091;





#

# BUG#NNNN: New bug synopsis

#