Commit 07589a6d authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/my/mysql-3.23 into mysql.com:/home/my/mysql-4.0 


sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
parents 72093a6d d75022ff

sql/sql_parse.cc

+2 −2
Original line number Diff line number Diff line
@@ -2869,10 +2869,10 @@ bool check_stack_overrun(THD *thd,char *buf __attribute__((unused))) 
#define MY_YACC_INIT 1000			// Start with big alloc

#define MY_YACC_MAX  32000			// Because of 'short'



bool my_yyoverflow(short **yyss, YYSTYPE **yyvs, int *yystacksize)

bool my_yyoverflow(short **yyss, YYSTYPE **yyvs, ulong *yystacksize)

{

  LEX	*lex=current_lex;

  int  old_info=0;

  ulong old_info=0;

  if ((uint) *yystacksize >= MY_YACC_MAX)

    return 1;

  if (!lex->yacc_yyvs)

sql/sql_yacc.yy

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
extern void yyerror(const char*);

int yylex(void *yylval);



#define yyoverflow(A,B,C,D,E,F) if (my_yyoverflow((B),(D),(int*) (F))) { yyerror((char*) (A)); return 2; }

#define yyoverflow(A,B,C,D,E,F) {ulong val= *(F); if(my_yyoverflow((B), (D), &val)) { yyerror((char*) (A)); return 2; } else { *(F)= (YYSIZE_T)val; }}



inline Item *or_or_concat(Item* A, Item* B)

{
@@ -71,7 +71,7 @@ inline Item *or_or_concat(Item* A, Item* B) 
}



%{

bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize);

bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);

%}



%pure_parser					/* We have threads */