diff options
| author | unknown <monty@mysql.com> | 2004-06-25 18:55:03 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-06-25 18:55:03 +0300 |
| commit | 6dd6a606e79980fd2d5f6a7974d24b300364ce12 (patch) | |
| tree | 2d1467a41ccca408432f4ad785514c9db64f1ab5 | |
| parent | 9dc42fdaeffd371a048ea8bc21b4960f5f5e57c1 (diff) | |
| parent | aad5e13c007527aa6e606fad4e718036fd4d13b6 (diff) | |
| download | mariadb-git-6dd6a606e79980fd2d5f6a7974d24b300364ce12.tar.gz | |
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
| -rw-r--r-- | sql/sql_parse.cc | 4 | ||||
| -rw-r--r-- | sql/sql_yacc.yy | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 4dd5d126cc9..1f0af05a460 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -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) diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 2930c60310a..a50e37e54f5 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -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 */ |