Commit 87e742c1 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
parents ce02a55c db40f4a5

mysql-test/r/sp.result

+6 −0
Original line number Diff line number Diff line
@@ -2844,4 +2844,10 @@ drop procedure bug6900| 
drop procedure bug9074|

drop procedure bug6900_9074|

drop table t3|

drop procedure if exists avg|

create procedure avg ()

begin

end|

call avg ()|

drop procedure avg|

drop table t1,t2;

mysql-test/t/sp.test

+14 −0
Original line number Diff line number Diff line
@@ -3481,6 +3481,20 @@ drop procedure bug6900_9074| 
drop table t3|





#

# BUG#7185: Stored procedure crash if identifier is AVG

#

--disable_warnings

drop procedure if exists avg|

--enable_warnings

create procedure avg ()

begin

end|



call avg ()|

drop procedure avg|





#

# BUG#NNNN: New bug synopsis

#

sql/sql_parse.cc

+16 −2
Original line number Diff line number Diff line
@@ -4128,8 +4128,16 @@ mysql_execute_command(THD *thd) 
	sp= sp_find_function(thd, lex->spname);

      mysql_reset_errors(thd, 0);

      if (! sp)

      {

	if (lex->spname->m_db.str)

	  result= SP_KEY_NOT_FOUND;

	else

	{

	  my_message(ER_NO_DB_ERROR, ER(ER_NO_DB_ERROR), MYF(0));

	  goto error;

	}

      }

      else

      {

        if (check_procedure_access(thd, ALTER_PROC_ACL, sp->m_db.str, 

				  sp->m_name.str, 0))
@@ -4207,7 +4215,13 @@ mysql_execute_command(THD *thd) 
	  }

	}

#endif

	if (lex->spname->m_db.str)

	  result= SP_KEY_NOT_FOUND;

	else

	{

	  my_message(ER_NO_DB_ERROR, ER(ER_NO_DB_ERROR), MYF(0));

	  goto error;

	}

      }

      res= result;

      switch (result)

sql/sql_yacc.yy

+2 −2
Original line number Diff line number Diff line
@@ -1328,12 +1328,12 @@ clear_privileges: 
        ;



sp_name:

	  IDENT_sys '.' IDENT_sys

	  ident '.' ident

	  {

	    $$= new sp_name($1, $3);

	    $$->init_qname(YYTHD);

	  }

	| IDENT_sys

	| ident

	  {

	    $$= sp_name_current_db_new(YYTHD, $1);

	  }