Commit aecb4409 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr/local/bk/mysql-5.0 

into mysql.com:/home/pem/work/mysql-5.0


sql/sql_yacc.yy:
  Auto merged
parents bac98672 ae28b3bd

mysql-test/r/sp-error.result

+13 −0
Original line number Diff line number Diff line
@@ -658,4 +658,17 @@ create procedure bug9529_9012345678901234567890123456789012345678901234567890123 
begin

end|

ERROR 42000: Identifier name 'bug9529_90123456789012345678901234567890123456789012345678901234567890' is too long

drop procedure if exists bug10969|

create procedure bug10969()

begin

declare s1 int default 0;

select default(s1) from t30;

end|

ERROR 42000: Incorrect column name 's1'

create procedure bug10969()

begin

declare s1 int default 0;

select default(t30.s1) from t30;

end|

drop procedure bug10969|

drop table t1|

mysql-test/r/sp.result

+29 −0
Original line number Diff line number Diff line
@@ -3109,4 +3109,33 @@ select bug9559()| 
bug9559()

-3

drop function bug9559|

drop procedure if exists bug10961|

create procedure bug10961()

begin

declare v char;

declare x int;

declare c cursor for select * from dual;

declare continue handler for sqlexception select x;

set x = 1;

open c;

set x = 2;

fetch c into v;

set x = 3;

close c;

end|

call bug10961()|

x

1

x

2

x

3

call bug10961()|

x

1

x

2

x

3

drop procedure bug10961|

drop table t1,t2;

mysql-test/t/sp-error.test

+23 −0
Original line number Diff line number Diff line
@@ -930,6 +930,29 @@ begin 
end|





#

# BUG#10969: Stored procedures: crash if default() function

#

--disable_warnings

drop procedure if exists bug10969|

--enable_warnings

--error ER_WRONG_COLUMN_NAME

create procedure bug10969()

begin

  declare s1 int default 0;

  select default(s1) from t30;

end|



# This should work

create procedure bug10969()

begin

  declare s1 int default 0;

  select default(t30.s1) from t30;

end|



drop procedure bug10969|





#

# BUG#NNNN: New bug synopsis

#

mysql-test/t/sp.test

+29 −0
Original line number Diff line number Diff line
@@ -3801,6 +3801,7 @@ call bug5963_2(1)| 
drop procedure bug5963_2|

drop table t3|





#

# BUG#9559: Functions: Numeric Operations using -ve value gives incorrect

#           results.
@@ -3820,6 +3821,34 @@ select bug9559()| 
drop function bug9559|





#

# BUG#10961: Stored procedures: crash if select * from dual

#

--disable_warnings

drop procedure if exists bug10961|

--enable_warnings

# "select * from dual" results in an error, so the cursor will not open

create procedure bug10961()

begin

  declare v char;

  declare x int;

  declare c cursor for select * from dual;

  declare continue handler for sqlexception select x;



  set x = 1;

  open c;

  set x = 2;

  fetch c into v;

  set x = 3;

  close c;

end|



call bug10961()|

call bug10961()|



drop procedure bug10961|





#

# BUG#NNNN: New bug synopsis

#

sql/item.h

+7 −0
Original line number Diff line number Diff line
@@ -584,6 +584,13 @@ class Item_splocal : public Item 
    Item::maybe_null= TRUE;

  }



  /* For error printing */

  inline void my_name(char **strp, uint *lengthp)

  {

    *strp= m_name.str;

    *lengthp= m_name.length;

  }



  bool is_splocal() { return 1; } /* Needed for error checking */



  Item *this_item();