From: Marcin Krol <hawk@tld-linux.org>
Date: Thu, 5 Jun 2014 09:54:40 +0000 (+0000)
Subject: - fixed upstream
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=refs%2Fheads%2FMYSQL_5_5;p=packages%2Fmysql.git

- fixed upstream
---

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.