summaryrefslogtreecommitdiff
path: root/sql/sql_lex.h
diff options
context:
space:
mode:
authorHery Ramilison <hery.ramilison@oracle.com>2013-01-08 13:29:11 +0100
committerHery Ramilison <hery.ramilison@oracle.com>2013-01-08 13:29:11 +0100
commit40bbd1862376fa634e42b4e0197e22f5633f0c21 (patch)
tree2ab539da3bd8cf0ce7d53e384a76ded7e77a7a8e /sql/sql_lex.h
parent1dbc62ce2e049cf29fe4c143c93889d5d310de64 (diff)
downloadmariadb-git-40bbd1862376fa634e42b4e0197e22f5633f0c21.tar.gz
Applying patch for Bug#67177 Bug#15967374 from Kent
Diffstat (limited to 'sql/sql_lex.h')
-rw-r--r--sql/sql_lex.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index d512190eecc..99cbd420607 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -47,7 +47,11 @@ class Event_parse_data;
#else
#include "lex_symbol.h"
#if MYSQL_LEX
-#include "sql_yacc.h"
+# if YACC_HEXT_HH
+# include "sql_yacc.hh"
+# else
+# include "sql_yacc.h"
+# endif
#define LEX_YYSTYPE YYSTYPE *
#else
#define LEX_YYSTYPE void *