From b40cab657bb5d748423f2637fa96d135d4b9e804 Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Tue, 19 Nov 2019 15:55:36 +0400 Subject: [PATCH] Bison parser cleanups: define yyerror() instead of MYSQLerror()/ORAerror() To reduce the difference between sql_yacc.yy and sql_yacc_ora.yy, using yyerror() in both files, instead of MYSQLerror() and ORAerror(). The pre-processor replaces yyerror() to MYSQLerror() and ORAerror() anyway. --- sql/sql_yacc.yy | 2 +- sql/sql_yacc_ora.yy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 92f62ac98b8..02c7dcd5797 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -136,7 +136,7 @@ int yylex(void *yylval, void *yythd); to abort from the parser. */ -void MYSQLerror(THD *thd, const char *s) +static void yyerror(THD *thd, const char *s) { /* Restore the original LEX if it was replaced when parsing diff --git a/sql/sql_yacc_ora.yy b/sql/sql_yacc_ora.yy index 5eb6ac52a96..bb0baf98318 100644 --- a/sql/sql_yacc_ora.yy +++ b/sql/sql_yacc_ora.yy @@ -136,7 +136,7 @@ int yylex(void *yylval, void *yythd); to abort from the parser. */ -void ORAerror(THD *thd, const char *s) +static void yyerror(THD *thd, const char *s) { /* Restore the original LEX if it was replaced when parsing