diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2021-09-11 13:08:13 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2021-09-11 15:19:42 +0200 |
| commit | 3504f70f7f2017a98b929f182006b72ea494e1c0 (patch) | |
| tree | 385a9a757c13cc11280f49177adff2ee2eeaec0a | |
| parent | 879e21b68c34d252507298a53debb2c007a38177 (diff) | |
| download | mariadb-git-3504f70f7f2017a98b929f182006b72ea494e1c0.tar.gz | |
Bison 3.7 - fix "conversion from 'ptrdiff_t' to 'ulong', possible loss of data"
| -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 f782c5c25e7..3e1f248b082 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -7226,10 +7226,10 @@ bool check_stack_overrun(THD *thd, long margin, #define MY_YACC_INIT 1000 // Start with big alloc #define MY_YACC_MAX 32000 // Because of 'short' -bool my_yyoverflow(short **yyss, YYSTYPE **yyvs, ulong *yystacksize) +bool my_yyoverflow(short **yyss, YYSTYPE **yyvs, size_t *yystacksize) { Yacc_state *state= & current_thd->m_parser_state->m_yacc; - ulong old_info=0; + size_t old_info=0; DBUG_ASSERT(state); if ((uint) *yystacksize >= MY_YACC_MAX) return 1; diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index ec82c7f9f07..c9dbc6fa8cc 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -76,7 +76,7 @@ int yylex(void *yylval, void *yythd); #define yyoverflow(A,B,C,D,E,F) \ { \ - ulong val= *(F); \ + size_t val= *(F); \ if (my_yyoverflow((B), (D), &val)) \ { \ yyerror(thd, (char*) (A)); \ @@ -1024,7 +1024,7 @@ Virtual_column_info *add_virtual_expression(THD *thd, Item *expr) } %{ -bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); +bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize); %} %pure-parser /* We have threads */ |