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

Proposed by Laurynas Biveinis on 2014-04-23
Status: Merged
Approved by: Alexey Kopytov on 2014-04-25
Approved revision: 625
Merged at revision: 652
Proposed branch: lp:~laurynas-biveinis/percona-server/bug1262439-5.5
Merge into: lp:percona-server/5.5
Diff against target: 41 lines (+5/-5)
1 file modified
sql/sql_yacc.yy (+5/-5)
To merge this branch: bzr merge lp:~laurynas-biveinis/percona-server/bug1262439-5.5
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) 2014-04-23 Approve on 2014-04-25
Review via email: mp+216887@code.launchpad.net

Description of the change

To post a comment you must log in.
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 'sql/sql_yacc.yy'
2--- sql/sql_yacc.yy 2014-03-27 15:42:21 +0000
3+++ sql/sql_yacc.yy 2014-04-23 13:50:22 +0000
4@@ -26,8 +26,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 #define YYPS (& YYTHD->m_parser_state->m_yacc)
13@@ -76,7 +74,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@@ -174,7 +172,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@@ -787,7 +785,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 168 shift/reduce conflicts.
41 We should not introduce new conflicts any more.

Subscribers

People subscribed via source and target branches