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
4 ** The type will be void*, so it must be cast to (THD*) when used.
5 ** Use the YYTHD macro for this.
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)
14 const LEX_STRING null_lex_str={0,0};
16 -#define yyoverflow(A,B,C,D,E,F) {ulong val= (ulong) *(F); if (my_yyoverflow((B), (D), &val)) { yyerror((char*) (A)); return 2; } else { *(F)= (YYSIZE_T)val; }}
17 +#define yyoverflow(A,B,C,D,E,F) {ulong val= (ulong) *(F); if (my_yyoverflow((B), (D), &val)) { yyerror(yythd, (char*) (A)); return 2; } else { *(F)= (YYSIZE_T)val; }}
19 #undef WARN_DEPRECATED /* this macro is also defined in mysql_priv.h */
20 #define WARN_DEPRECATED(A,B) \
22 to abort from the parser.
25 -void MYSQLerror(const char *s)
26 +void MYSQLerror(void *yythd, const char *s)
28 THD *thd= current_thd;
31 bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
34 -%pure_parser /* We have threads */
35 +%pure-parser /* We have threads */
36 +%parse-param { void *yythd }
37 +%lex-param { void *yythd }
39 Currently there are 240 shift/reduce conflicts.
40 We should not introduce new conflicts any more.