Percona Server moved to https://jira.percona.com/projects/PS

Merge lp:~laurynas-biveinis/percona-server/bug1262439-5.1 into lp:percona-server/5.1

  1. bug1262439-5.1
  2. Merge into 5.1
Proposed by Laurynas Biveinis
Status: Merged
Approved by: Alexey Kopytov
Approved revision: no longer in the source branch.
Merged at revision: 611
Proposed branch: lp:~laurynas-biveinis/percona-server/bug1262439-5.1
Merge into: lp:percona-server/5.1
Diff against target: 41 lines (+5/-5)
1 file modified
Percona-Server/sql/sql_yacc.yy (+5/-5)
To merge this branch: bzr merge lp:~laurynas-biveinis/percona-server/bug1262439-5.1
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve
Review via email: mp+216886@code.launchpad.net

Description of the change

Fix compilation with Bison 3.

Applied the smaller patch and not the MariaDB one. While the latter is more thorough, the smaller one is enough and I expect to replace any patch with Oracle one at the next point version merge. For that a smaller patch will be easier to revert.

http://jenkins.percona.com/job/percona-server-5.1-param/604/ and tested under Ubuntu 14.04 locally.

To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) wrote :

Ubuntu 14.04 Jenkins run:
http://jenkins.percona.com/job/percona-server-5.1-param/605/

Revision history for this message
Alexey Kopytov (akopytov) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Percona-Server/sql/sql_yacc.yy'
2--- Percona-Server/sql/sql_yacc.yy 2013-06-03 03:53:55 +0000
3+++ Percona-Server/sql/sql_yacc.yy 2014-04-23 13:48:41 +0000
4@@ -27,8 +27,6 @@
5 ** The type will be void*, so it must be cast to (THD*) when used.
6 ** Use the YYTHD macro for this.
7 */
8-#define YYPARSE_PARAM yythd
9-#define YYLEX_PARAM yythd
10 #define YYTHD ((THD *)yythd)
11 #define YYLIP (& YYTHD->m_parser_state->m_lip)
12
13@@ -64,7 +62,7 @@
14 ulong val= *(F); \
15 if (my_yyoverflow((B), (D), &val)) \
16 { \
17- yyerror((char*) (A)); \
18+ yyerror(yythd, (char*) (A)); \
19 return 2; \
20 } \
21 else \
22@@ -159,7 +157,7 @@
23 to abort from the parser.
24 */
25
26-void MYSQLerror(const char *s)
27+void MYSQLerror(void *yythd, const char *s)
28 {
29 THD *thd= current_thd;
30
31@@ -675,7 +673,9 @@
32 bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
33 %}
34
35-%pure_parser /* We have threads */
36+%pure-parser /* We have threads */
37+%parse-param { void *yythd }
38+%lex-param { void *yythd }
39 /*
40 Currently there are 169 shift/reduce conflicts.
41 We should not introduce new conflicts any more.

Subscribers

People subscribed via source and target branches