From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (unknown [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 4351A1381FA for ; Wed, 14 May 2014 00:52:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AE186E0AA8; Wed, 14 May 2014 00:52:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3EB93E0AA8 for ; Wed, 14 May 2014 00:52:37 +0000 (UTC) Received: from spoonbill.gentoo.org (unknown [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3FE6933FEEF for ; Wed, 14 May 2014 00:52:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id D8CB7180A9 for ; Wed, 14 May 2014 00:52:34 +0000 (UTC) From: "Brian Evans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" Message-ID: <1400028738.aa902e1b4ae3e98d6c8d87a6d8af160e4fa6fe2e.grknight.pub@gentoo> Subject: [gentoo-commits] proj/mysql-extras:master commit in: / X-VCS-Repository: proj/mysql-extras X-VCS-Files: 00000_index.txt 20010_all_mysql51-bison3.patch X-VCS-Directories: / X-VCS-Committer: grknight.pub X-VCS-Committer-Name: Brian Evans X-VCS-Revision: aa902e1b4ae3e98d6c8d87a6d8af160e4fa6fe2e X-VCS-Branch: master Date: Wed, 14 May 2014 00:52:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d82744f4-836f-4459-87f5-15014ac85337 X-Archives-Hash: ccfb3ea04146e7fbd668002be6ee64f0 commit: aa902e1b4ae3e98d6c8d87a6d8af160e4fa6fe2e Author: Brian Evans tuffmail com> AuthorDate: Wed May 14 00:52:18 2014 +0000 Commit: Brian Evans lavabit com> CommitDate: Wed May 14 00:52:18 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=aa902e1b fix bison3 on mysql 5.1.xx --- 00000_index.txt | 5 +++++ 20010_all_mysql51-bison3.patch | 43 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/00000_index.txt b/00000_index.txt index 9cb418b..b40707d 100644 --- a/00000_index.txt +++ b/00000_index.txt @@ -1666,3 +1666,8 @@ @pn mariadb-galera @@ Export missing symbol my_charset_latin1 @@ MariaDB bug MDEV-6131 + +@patch 20010_all_mysql-bison3.patch +@ver 5.01.73.00 to 5.01.99.99 +@pn mysql +@@ Fix Bison 3 compatibility diff --git a/20010_all_mysql51-bison3.patch b/20010_all_mysql51-bison3.patch new file mode 100644 index 0000000..78d0faf --- /dev/null +++ b/20010_all_mysql51-bison3.patch @@ -0,0 +1,43 @@ +X-Upstream-Patch-URL: https://bazaar.launchpad.net/~percona-core/percona-server/5.1/revision/611 +=== modified file 'Percona-Server/sql/sql_yacc.yy' +--- Percona-Server/sql/sql_yacc.yy 2013-06-03 03:53:55 +0000 ++++ Percona-Server/sql/sql_yacc.yy 2014-04-23 09:26:47 +0000 +@@ -27,8 +27,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) + +@@ -64,7 +62,7 @@ + ulong val= *(F); \ + if (my_yyoverflow((B), (D), &val)) \ + { \ +- yyerror((char*) (A)); \ ++ yyerror(yythd, (char*) (A)); \ + return 2; \ + } \ + else \ +@@ -159,7 +157,7 @@ + to abort from the parser. + */ + +-void MYSQLerror(const char *s) ++void MYSQLerror(void *yythd, const char *s) + { + THD *thd= current_thd; + +@@ -675,7 +673,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 169 shift/reduce conflicts. + We should not introduce new conflicts any more. +