Commit 46ee5889 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.0 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
parents 7ecc18e1 85d705b6

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ AC_PROG_INSTALL 
test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'



# 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(DVIS,      tex,    manual.dvi)

sql/sql_analyse.cc

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ 
#pragma implementation				// gcc: Class implementation

#endif



#define MYSQL_LEX 1



#include "mysql_priv.h"

#include "procedure.h"

#include "sql_analyse.h"

sql/sql_lex.cc

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 


/* A lexical scanner on a temporary buffer with a yacc interface */



#define MYSQL_LEX 1

#include "mysql_priv.h"

#include "item_create.h"

#include <m_ctype.h>

sql/sql_lex.h

+4 −0
Original line number Diff line number Diff line
@@ -37,8 +37,12 @@ class sp_pcontext; 
#define LEX_YYSTYPE void *

#else

#include "lex_symbol.h"

#if MYSQL_LEX

#include "sql_yacc.h"

#define LEX_YYSTYPE YYSTYPE *

#else

#define LEX_YYSTYPE void *

#endif

#endif



/*

sql/sql_parse.cc

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
   along with this program; if not, write to the Free Software

   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */



#define MYSQL_LEX 1

#include "mysql_priv.h"

#include "sql_repl.h"

#include "repl_failsafe.h"