From aadf481f49e8c58bdc648e0fa2567a6eb8ca5b29 Mon Sep 17 00:00:00 2001
From: "pem@mysql.com" <>
Date: Tue, 18 Feb 2003 11:58:19 +0100
Subject: [PATCH] Made it work with bison 1.875. They've changed the "parse
 error" string into "syntax error".

---
 sql/mysqld.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 9be4343b2f2..1be832964b9 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -1260,7 +1260,8 @@ void yyerror(const char *s)
 {
   THD *thd=current_thd;
   char *yytext=(char*) thd->lex.tok_start;
-  if (!strcmp(s,"parse error"))
+  /* "parse error" changed into "syntax error" between bison 1.75 and 1.875 */
+  if (strcmp(s,"parse error") == 0 || strcmp(s,"syntax error") == 0)
     s=ER(ER_SYNTAX_ERROR);
   net_printf(thd,ER_PARSE_ERROR, s, yytext ? (char*) yytext : "",
 	     thd->lex.yylineno);