diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-06-24 22:15:15 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-06-24 22:15:15 +0300 |
| commit | d75022fff73ea5fc440966ae132fbdadb351b674 (patch) | |
| tree | 931e380c17bdd78f28855056a041f5d10b1633df /sql/sql_yacc.yy | |
| parent | b57fe1e26ae91b660c0d8665bb6e9e3f9e154076 (diff) | |
| download | mariadb-git-d75022fff73ea5fc440966ae132fbdadb351b674.tar.gz | |
parameter of my_yyoverflow made independed from YYSIZE_T (BUG#4204)
sql/sql_parse.cc:
parameter of my_yyoverflow made independed from YYSIZE_T
sql/sql_yacc.yy:
parameter of my_yyoverflow made independed from YYSIZE_T
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index d751dcd0927..1ed6d7a5fbf 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -30,7 +30,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) { @@ -65,7 +65,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 */ |