summaryrefslogtreecommitdiff
path: root/sql/sql_lex.h
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2013-02-28 21:48:47 +0100
committerSergei Golubchik <sergii@pisem.net>2013-02-28 21:48:47 +0100
commitc4341d50950224bb4e976fd1aac23dddc7d78f71 (patch)
tree9fa2f700cbe0283ffaf3d7da57238fb4f7e96e25 /sql/sql_lex.h
parent0d55ebc05ea303a9aea44d953abbc335c12c9330 (diff)
parent5dec570d7c1e2a39b67503a90d2d7905ac4dbb44 (diff)
downloadmariadb-git-c4341d50950224bb4e976fd1aac23dddc7d78f71.tar.gz
5.2 -> 5.3
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 9b091f3bb3a..a3240d3bcab 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 *