From a7ba7978b9155f592bcb660a3f6345b1dc5e2ac1 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Thu, 5 Jun 2014 10:32:39 +0000 Subject: [PATCH] - fixed upstream --- bison3.patch | 40 ---------------------------------------- 1 file changed, 40 deletions(-) delete mode 100644 bison3.patch diff --git a/bison3.patch b/bison3.patch deleted file mode 100644 index d8e0985..0000000 --- a/bison3.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- Percona-Server-5.5.32-rel31.0/sql/sql_yacc.yy.orig 2013-07-01 05:16:34.000000000 +0200 -+++ Percona-Server-5.5.32-rel31.0/sql/sql_yacc.yy 2013-08-18 21:33:19.181583895 +0200 -@@ -26,8 +26,6 @@ - ** The type will be void*, so it must be cast to (THD*) when used. - ** Use the YYTHD macro for this. - */ --#define YYPARSE_PARAM yythd --#define YYLEX_PARAM yythd - #define YYTHD ((THD *)yythd) - #define YYLIP (& YYTHD->m_parser_state->m_lip) - #define YYPS (& YYTHD->m_parser_state->m_yacc) -@@ -76,7 +74,7 @@ - ulong val= *(F); \ - if (my_yyoverflow((B), (D), &val)) \ - { \ -- yyerror((char*) (A)); \ -+ yyerror(yythd, (char*) (A)); \ - return 2; \ - } \ - else \ -@@ -174,7 +172,7 @@ - to abort from the parser. - */ - --void MYSQLerror(const char *s) -+void MYSQLerror(void *yythd, const char *s) - { - THD *thd= current_thd; - -@@ -780,7 +778,9 @@ - bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); - %} - --%pure_parser /* We have threads */ -+%pure-parser /* We have threads */ -+%parse-param { void *yythd } -+%lex-param { void *yythd } - /* - Currently there are 168 shift/reduce conflicts. - We should not introduce new conflicts any more. -- 2.46.0