diff options
| author | Nayuta Yanagisawa <nayuta.yanagisawa@hey.com> | 2021-09-22 14:59:23 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-22 14:59:23 +0900 |
| commit | b194cc4933f4dde06761018bc6bf4bb16319d328 (patch) | |
| tree | 7b264db426390d239f108bfa35c8a422a70c7882 /sql/sql_parse.cc | |
| parent | b044ec100116f096e30f603d55b2b8fca2d3e6c2 (diff) | |
| parent | f4d6d01782ad4c885f1a4041514ba58f7b7d4ad2 (diff) | |
| download | mariadb-git-bb-10.2-mdev-26545.tar.gz | |
Merge branch '10.2' into 10.2-MDEV-26545bb-10.2-mdev-26545
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 4 |
1 files changed, 2 insertions, 2 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; |