diff options
| author | Hery Ramilison <hery.ramilison@oracle.com> | 2013-01-08 13:29:11 +0100 |
|---|---|---|
| committer | Hery Ramilison <hery.ramilison@oracle.com> | 2013-01-08 13:29:11 +0100 |
| commit | 40bbd1862376fa634e42b4e0197e22f5633f0c21 (patch) | |
| tree | 2ab539da3bd8cf0ce7d53e384a76ded7e77a7a8e /sql | |
| parent | 1dbc62ce2e049cf29fe4c143c93889d5d310de64 (diff) | |
| download | mariadb-git-40bbd1862376fa634e42b4e0197e22f5633f0c21.tar.gz | |
Applying patch for Bug#67177 Bug#15967374 from Kent
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/.cvsignore | 1 | ||||
| -rw-r--r-- | sql/Makefile.am | 2 | ||||
| -rw-r--r-- | sql/sql_lex.h | 6 |
3 files changed, 7 insertions, 2 deletions
diff --git a/sql/.cvsignore b/sql/.cvsignore index 3e2f44f5a10..7fcd82ab952 100644 --- a/sql/.cvsignore +++ b/sql/.cvsignore @@ -9,4 +9,5 @@ mysqlbinlog mysqlbinlog mysqld sql_yacc.cc +sql_yacc.hh sql_yacc.h diff --git a/sql/Makefile.am b/sql/Makefile.am index 2336faf4e31..6c2e7079a51 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -146,7 +146,7 @@ DEFS = -DMYSQL_SERVER \ -DHAVE_EVENT_SCHEDULER \ @DEFS@ -BUILT_MAINT_SRC = sql_yacc.cc sql_yacc.h +BUILT_MAINT_SRC = sql_yacc.cc sql_yacc.$(YACC_HEXT) BUILT_SOURCES = $(BUILT_MAINT_SRC) lex_hash.h link_sources EXTRA_DIST = udf_example.c udf_example.def $(BUILT_MAINT_SRC) \ nt_servc.cc nt_servc.h \ 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 * |