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

[Laurynas Biveinis]

Automerge bug 1262439 fix from 5.5.

http://jenkins.percona.com/job/percona-server-5.6-param/591/

[Laurynas Biveinis (laurynas-biveinis)]

Ubuntu 14.04 Jenkins run:
http://jenkins.percona.com/job/percona-server-5.6-param/594/

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'sql/sql_yacc.yy'
--- sql/sql_yacc.yy	2014-03-26 10:11:16 +0000
+++ sql/sql_yacc.yy	2014-04-23 13:51:49 +0000
@@ -26,8 +26,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)
 #define YYPS (& YYTHD->m_parser_state->m_yacc)
@@ -85,7 +83,7 @@
     ulong val= *(F);                          \
     if (my_yyoverflow((B), (D), &val))        \
     {                                         \
-      yyerror((char*) (A));                   \
+      yyerror(yythd, (char*) (A));            \
       return 2;                               \
     }                                         \
     else                                      \
@@ -183,7 +181,7 @@
   to abort from the parser.
 */
 
-void MYSQLerror(const char *s)
+void MYSQLerror(void *yythd, const char *s)
 {
   THD *thd= current_thd;
 
@@ -1024,7 +1022,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 161 shift/reduce conflicts.
   We should not introduce new conflicts any more.