]>
Commit | Line | Data |
---|---|---|
cf421da8 JR |
1 | --- Percona-Server-5.5.32-rel31.0/sql/sql_yacc.yy.orig 2013-07-01 05:16:34.000000000 +0200 |
2 | +++ Percona-Server-5.5.32-rel31.0/sql/sql_yacc.yy 2013-08-18 21:33:19.181583895 +0200 | |
3 | @@ -26,8 +26,6 @@ | |
4 | ** The type will be void*, so it must be cast to (THD*) when used. | |
5 | ** Use the YYTHD macro for this. | |
6 | */ | |
7 | -#define YYPARSE_PARAM yythd | |
8 | -#define YYLEX_PARAM yythd | |
9 | #define YYTHD ((THD *)yythd) | |
10 | #define YYLIP (& YYTHD->m_parser_state->m_lip) | |
11 | #define YYPS (& YYTHD->m_parser_state->m_yacc) | |
12 | @@ -76,7 +74,7 @@ | |
13 | ulong val= *(F); \ | |
14 | if (my_yyoverflow((B), (D), &val)) \ | |
15 | { \ | |
16 | - yyerror((char*) (A)); \ | |
17 | + yyerror(yythd, (char*) (A)); \ | |
18 | return 2; \ | |
19 | } \ | |
20 | else \ | |
21 | @@ -174,7 +172,7 @@ | |
22 | to abort from the parser. | |
23 | */ | |
24 | ||
25 | -void MYSQLerror(const char *s) | |
26 | +void MYSQLerror(void *yythd, const char *s) | |
27 | { | |
28 | THD *thd= current_thd; | |
29 | ||
30 | @@ -780,7 +778,9 @@ | |
31 | bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); | |
32 | %} | |
33 | ||
34 | -%pure_parser /* We have threads */ | |
35 | +%pure-parser /* We have threads */ | |
36 | +%parse-param { void *yythd } | |
37 | +%lex-param { void *yythd } | |
38 | /* | |
39 | Currently there are 168 shift/reduce conflicts. | |
40 | We should not introduce new conflicts any more. |