summaryrefslogtreecommitdiff
path: root/sql/sql_yacc.yy
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2021-09-11 16:40:08 +0200
committerVladislav Vaintroub <wlad@mariadb.com>2021-09-11 16:40:08 +0200
commitc3341f84404c67ab70faed1ec28fcb4e900ccfdd (patch)
tree49f93814f442692027d1e16c7926aa3660fa7613 /sql/sql_yacc.yy
parent40b743f99e8ca5ac479e8c559f8316b606033582 (diff)
parentc7a721ee3310870e1cbc05ea26ee60174c3d9b1c (diff)
downloadmariadb-git-c3341f84404c67ab70faed1ec28fcb4e900ccfdd.tar.gz
Merge branch '10.4' into 10.5
# Conflicts: # appveyor.yml
Diffstat (limited to 'sql/sql_yacc.yy')
-rw-r--r--sql/sql_yacc.yy2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 1f756450f3c..d2fc4273f49 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -79,7 +79,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)); \