diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-06-24 19:43:47 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-06-24 19:43:47 +0300 |
| commit | 6d05b1834bd4c35039c89195e0f4c1b3ecc64f5d (patch) | |
| tree | 10d2465676271f902b0c168eba51afe0cd06a9be /sql/sql_yacc.yy | |
| parent | 4195f96c665e72019587e0cf32f5c99e7c711528 (diff) | |
| parent | a616e1decb984d88c0045e7797b1a296a8b9e501 (diff) | |
| download | mariadb-git-6d05b1834bd4c35039c89195e0f4c1b3ecc64f5d.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-innodb-4.1
sql/sql_yacc.yy:
Auto merged
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 1e194d953c1..6e88247bf32 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -40,7 +40,7 @@ int yylex(void *yylval, void *yythd); -#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; }} #define WARN_DEPRECATED(A,B) \ push_warning_printf(((THD *)yythd), MYSQL_ERROR::WARN_LEVEL_WARN, \ @@ -90,7 +90,7 @@ inline Item *or_or_concat(THD *thd, 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 */ |