1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Porting fix that allows others to include compiled code with different parsers.

Browse Source 
Makes you wonder what I am up to, doesn't?
This commit is contained in:
brian@zim.(none) 2006-03-09 10:09:52 -08:00
parent 3d37ec6b8b
commit 78abb2d117
5 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.in
View File

@ -236,7 +236,7 @@ AC_PROG_INSTALL
test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
# Not critical since the generated file is distributed # Not critical since the generated file is distributed
AC_PROG_YACC AC_CHECK_PROGS(YACC, ['bison -y -p MYSQL'])
AC_CHECK_PROG(PDFMANUAL, pdftex, manual.pdf) AC_CHECK_PROG(PDFMANUAL, pdftex, manual.pdf)
AC_CHECK_PROG(DVIS, tex, manual.dvi) AC_CHECK_PROG(DVIS, tex, manual.dvi)

2
sql/sql_analyse.cc
View File

@ -27,6 +27,8 @@
#pragma implementation // gcc: Class implementation #pragma implementation // gcc: Class implementation
#endif #endif
#define MYSQL_LEX 1
#include "mysql_priv.h" #include "mysql_priv.h"
#include "procedure.h" #include "procedure.h"
#include "sql_analyse.h" #include "sql_analyse.h"

1
sql/sql_lex.cc
View File

@ -17,6 +17,7 @@
/* A lexical scanner on a temporary buffer with a yacc interface */ /* A lexical scanner on a temporary buffer with a yacc interface */
#define MYSQL_LEX 1
#include "mysql_priv.h" #include "mysql_priv.h"
#include "item_create.h" #include "item_create.h"
#include <m_ctype.h> #include <m_ctype.h>

4
sql/sql_lex.h
View File

@ -37,8 +37,12 @@ class sp_pcontext;
#define LEX_YYSTYPE void * #define LEX_YYSTYPE void *
#else #else
#include "lex_symbol.h" #include "lex_symbol.h"
#if MYSQL_LEX
#include "sql_yacc.h" #include "sql_yacc.h"
#define LEX_YYSTYPE YYSTYPE * #define LEX_YYSTYPE YYSTYPE *
#else
#define LEX_YYSTYPE void *
#endif
#endif #endif
/* /*

1
sql/sql_parse.cc
View File

@ -14,6 +14,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#define MYSQL_LEX 1
#include "mysql_priv.h" #include "mysql_priv.h"
#include "sql_repl.h" #include "sql_repl.h"
#include "repl_failsafe.h" #include "repl_failsafe.h"