Commit 4701bd90 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/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
parents 1c7b61e3 166accff

mysql-test/r/sp-error.result

+8 −0
Original line number Diff line number Diff line
@@ -646,4 +646,12 @@ drop procedure if exists bug10537| 
create procedure bug10537()

load data local infile '/tmp/somefile' into table t1|

ERROR 0A000: LOAD DATA is not allowed in stored procedures

drop function if exists bug8409|

create function bug8409()

returns int

begin

flush tables;

return 5;

end|

ERROR 0A000: FLUSH is not allowed in stored procedures

drop table t1|

mysql-test/r/sp.result

+11 −0
Original line number Diff line number Diff line
@@ -3098,4 +3098,15 @@ call bug5963_2(1)| 
call bug5963_2(1)|

drop procedure bug5963_2|

drop table t3|

drop function if exists bug9559|

create function bug9559()

returns int

begin

set @y = -6/2;

return @y;

end|

select bug9559()|

bug9559()

-3

drop function bug9559|

drop table t1,t2;

mysql-test/t/sp-error.test

+15 −0
Original line number Diff line number Diff line
@@ -905,6 +905,21 @@ create procedure bug10537() 
  load data local infile '/tmp/somefile' into table t1|





#

# BUG#8409: Stored procedure crash if function contains FLUSH

#

--disable_warnings

drop function if exists bug8409|

--enable_warnings

--error ER_SP_BADSTATEMENT

create function bug8409()

  returns int

begin

  flush tables;

  return 5;

end|





#

# BUG#NNNN: New bug synopsis

#

mysql-test/t/sp.test

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

drop table t3|



#

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

#           results.

#

--disable_warnings

drop function if exists bug9559|

--enable_warnings

create function bug9559()

  returns int

begin

  set @y = -6/2;

  return @y;

end|



select bug9559()|



drop function bug9559|





#

# BUG#NNNN: New bug synopsis

#

sql/item_cmpfunc.cc

+1 −1
Original line number Diff line number Diff line
@@ -2321,7 +2321,7 @@ Item_cond::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref) 
  */

  and_tables_cache= ~(table_map) 0;



  if (check_stack_overrun(thd, buff))

  if (check_stack_overrun(thd, STACK_MIN_SIZE))

    return TRUE;				// Fatal error flag is set!

  /*

    The following optimization reduces the depth of an AND-OR tree.