diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2021-09-11 19:05:25 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2021-09-11 19:05:25 +0200 |
| commit | 329d370f2d6af13cee89bc2c8db0f5915dcbfd4a (patch) | |
| tree | 6921dab38b180dbd97b5395170b16d3beae65f87 | |
| parent | 15139964d52539a8bb96d090fa1b5b26921eab3e (diff) | |
| parent | 42e9506ce9d796921ec8bf023fe81fce1c3fc28d (diff) | |
| download | mariadb-git-329d370f2d6af13cee89bc2c8db0f5915dcbfd4a.tar.gz | |
Merge branch '10.5' into 10.6
# Conflicts:
# appveyor.yml
| -rw-r--r-- | sql/sql_yacc.yy | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 0c1c68cd644..f5a4fc99135 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -80,7 +80,7 @@ int yylex(void *yylval, void *yythd); #define yyoverflow(A,B,C,D,E,F) \ { \ - size_t val= *(F); \ + size_t val= *(F); \ if (unlikely(my_yyoverflow((B), (D), &val))) \ { \ yyerror(thd, (char*) (A)); \ |