1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
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.
|
GitWeb
