Commit 791215f1 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0

parents d3ef9a5b 9b67b029

Docs/manual.texi

+4 −0
Original line number Diff line number Diff line
@@ -8120,6 +8120,10 @@ Convert your old ISAM files to MyISAM files with the command: 
be run if all tables in the given database is ISAM or MyISAM tables. If

this is not the case you should run @code{ALTER TABLE table_name TYPE=MyISAM}

on all ISAM tables.

@item

Ensure that you don't have any MySQL clients that uses shared libraries

(like the perl Msql-Mysql-modules). If you have, you should recompile

them as structures used in libmysqlclient.so has changed.

@end itemize









MySQL 4.0 will work even if you don't do the above, but you will not be

























innobase/pars/lexyy.c



+1
−0






























Original line number
Diff line number
Diff line







@@ -8,6 +8,7 @@







#define YY_FLEX_MAJOR_VERSION 2









#define YY_FLEX_MINOR_VERSION 5



















#include "univ.i"









#include <stdio.h>




















































innobase/pars/pars0grm.c



+1
−2






























Original line number
Diff line number
Diff line







@@ -94,9 +94,8 @@







/* The value of the semantic attribute is a pointer to a query tree node









que_node_t */



















#include <math.h>



















#include "univ.i"









#include <math.h>				/* Can't be before univ.i */









#include "pars0pars.h"









#include "mem0mem.h"









#include "que0types.h"
































innobase/pars/pars0grm.y



+1
−2






























Original line number
Diff line number
Diff line







@@ -14,9 +14,8 @@ the InnoDB parser.







/* The value of the semantic attribute is a pointer to a query tree node









que_node_t */



















#include <math.h>



















#include "univ.i"









#include <math.h>				/* Can't be before univ.i */









#include "pars0pars.h"









#include "mem0mem.h"









#include "que0types.h"
































innobase/pars/pars0lex.l



+3
−0






























Original line number
Diff line number
Diff line







@@ -28,6 +28,9 @@ How to make the InnoDB parser and lexer C files:

















6. Remove the #include of unistd.h from about line 2500 of lexyy.c



















7. Add '#include "univ.i"' before #include <stdio.h> in lexyy.c









   (Needed for AIX)



















These instructions seem to work at least with bison-1.28 and flex-2.5.4 on









Linux.









*******************************************************/