Commit aadf481f authored by pem@mysql.com's avatar pem@mysql.com

Made it work with bison 1.875. They've changed the "parse error" string into

"syntax error".
parent 907a81af
...@@ -1260,7 +1260,8 @@ void yyerror(const char *s) ...@@ -1260,7 +1260,8 @@ void yyerror(const char *s)
{ {
THD *thd=current_thd; THD *thd=current_thd;
char *yytext=(char*) thd->lex.tok_start; 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); s=ER(ER_SYNTAX_ERROR);
net_printf(thd,ER_PARSE_ERROR, s, yytext ? (char*) yytext : "", net_printf(thd,ER_PARSE_ERROR, s, yytext ? (char*) yytext : "",
thd->lex.yylineno); thd->lex.yylineno);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment