Commit 69636739 authored by unknown's avatar unknown
Browse files

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

into  zim.(none):/home/brian/mysql/mysql-5.0
parents 2fbd1777 01d69c4b

sql/mysql_priv.h

+2 −2
Original line number Diff line number Diff line
@@ -1093,7 +1093,7 @@ File open_binlog(IO_CACHE *log, const char *log_file_name, 
                 const char **errmsg);



/* mysqld.cc */

extern void yyerror(const char*);

extern void MYSQLerror(const char*);



/* item_func.cc */

extern bool check_reserved_words(LEX_STRING *name);
@@ -1415,7 +1415,7 @@ void free_list(I_List <i_string_pair> *list); 
void free_list(I_List <i_string> *list);



/* sql_yacc.cc */

extern int yyparse(void *thd);

extern int MYSQLparse(void *thd);



/* frm_crypt.cc */

#ifdef HAVE_CRYPTED_FRM

sql/mysqld.cc

+1 −1
Original line number Diff line number Diff line
@@ -1524,7 +1524,7 @@ static void network_init(void) 


#endif /*!EMBEDDED_LIBRARY*/



void yyerror(const char *s)

void MYSQLerror(const char *s)

{

  THD *thd=current_thd;

  char *yytext= (char*) thd->lex->tok_start;

sql/sp.cc

+2 −2
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ db_find_routine_aux(THD *thd, int type, sp_name *name, TABLE *table) 
static int

db_find_routine(THD *thd, int type, sp_name *name, sp_head **sphp)

{

  extern int yyparse(void *thd);

  extern int MYSQLparse(void *thd);

  TABLE *table;

  const char *params, *returns, *body;

  int ret;
@@ -459,7 +459,7 @@ db_load_routine(THD *thd, int type, sp_name *name, sp_head **sphp, 
  lex_start(thd, (uchar*)defstr.c_ptr(), defstr.length());



  thd->spcont= 0;

  if (yyparse(thd) || thd->is_fatal_error || newlex.sphead == NULL)

  if (MYSQLparse(thd) || thd->is_fatal_error || newlex.sphead == NULL)

  {

    sp_head *sp= newlex.sphead;

sql/sql_lex.cc

+2 −2
Original line number Diff line number Diff line
@@ -507,14 +507,14 @@ static inline uint int_token(const char *str,uint length) 
}



/*

  yylex remember the following states from the following yylex()

  MYSQLlex remember the following states from the following MYSQLlex()



  - MY_LEX_EOQ			Found end of query

  - MY_LEX_OPERATOR_OR_IDENT	Last state was an ident, text or number

				(which can't be followed by a signed number)

*/



int yylex(void *arg, void *yythd)

int MYSQLlex(void *arg, void *yythd)

{

  reg1	uchar c;

  int	tokval, result_state;

sql/sql_lex.h

+2 −2
Original line number Diff line number Diff line
@@ -716,7 +716,7 @@ typedef struct st_lex 
  uchar *buf;			/* The beginning of string, used by SPs */

  uchar *ptr,*tok_start,*tok_end,*end_of_query;

  

  /* The values of tok_start/tok_end as they were one call of yylex before */

  /* The values of tok_start/tok_end as they were one call of MYSQLlex before */

  uchar *tok_start_prev, *tok_end_prev;



  char *length,*dec,*change,*name;
@@ -1065,7 +1065,7 @@ extern void lex_init(void); 
extern void lex_free(void);

extern void lex_start(THD *thd, uchar *buf,uint length);

extern void lex_end(LEX *lex);

extern int yylex(void *arg, void *yythd);

extern int MYSQLlex(void *arg, void *yythd);



extern pthread_key(LEX*,THR_LEX);