[packages/percona-server/v5.1.x: 20/21] - up to 5.1.71 14.9

[glen]

commit c0a19179741b42fc4d17959f257c48841e1329bd
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Thu Aug 29 11:33:53 2013 +0200

    - up to 5.1.71 14.9

 bison3.patch | 40 ++++++++++++++++++++++++++++++++++++++++
 mysql.spec   |  8 +++++---
 2 files changed, 45 insertions(+), 3 deletions(-)
---
diff --git a/mysql.spec b/mysql.spec
index 695818c..3764c00 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -22,7 +22,7 @@
 %bcond_with	ndb		# NDB is now a separate product, this here is broken, so disable it
 
 %define		rel	1
-%define		percona_rel	14.8
+%define		percona_rel	14.9
 %include	/usr/lib/rpm/macros.perl
 Summary:	MySQL: a very fast and reliable SQL database engine
 Summary(de.UTF-8):	MySQL: ist eine SQL-Datenbank
@@ -33,13 +33,13 @@ Summary(ru.UTF-8):	MySQL - быстрый SQL-сервер
 Summary(uk.UTF-8):	MySQL - швидкий SQL-сервер
 Summary(zh_CN.UTF-8):	MySQL数据库服务器
 Name:		mysql
-Version:	5.1.70
+Version:	5.1.71
 Release:	%{percona_rel}.%{rel}
 License:	GPL + MySQL FLOSS Exception
 Group:		Applications/Databases
 # Source0Download: http://www.percona.com/downloads/Percona-Server-5.1/LATEST/source/
 Source0:	http://www.percona.com/downloads/Percona-Server-5.1/LATEST/source/Percona-Server-%{version}-rel%{percona_rel}.tar.gz
-# Source0-md5:	164230ac7b449eb69f0918fc5b8b09f2
+# Source0-md5:	b6d67802d3dceb45a29b211be2226646
 Source100:	http://www.sphinxsearch.com/downloads/sphinx-0.9.9.tar.gz
 # Source100-md5:	7b9b618cb9b378f949bb1b91ddcc4f54
 Source1:	%{name}.init
@@ -70,6 +70,7 @@ Patch13:	gcc-ice.patch
 Patch14:	%{name}-bug-43594.patch
 Patch15:	plugin-avoid-version.patch
 Patch16:	%{name}-fix-dummy-thread-race-condition.patch
+Patch17:	bison3.patch
 Patch18:	%{name}-sphinx.patch
 URL:		http://www.mysql.com/products/community/
 BuildRequires:	autoconf
@@ -515,6 +516,7 @@ mv sphinx-*/mysqlse storage/sphinx
 %patch14 -p0
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
 
 %build
 %if "%{pld_release}" == "ac"
diff --git a/bison3.patch b/bison3.patch
new file mode 100644
index 0000000..d8e0985
--- /dev/null
+++ b/bison3.patch
@@ -0,0 +1,40 @@
+--- 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.
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/percona-server.git/commitdiff/bf636d07b36bfd2921b9ecf2033c78270355c98c