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

Docs/manual.texi

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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.
 *******************************************************/

ltconfig

@@ -1308,9 +1308,7 @@ else
       hardcode_direct=yes
     fi
     allow_undefined_flag=' ${wl}-berok'
-    # -qmkshrobj used to be -bexpall, but MySQL uses symbols which start with
-    # an underscore (e.g., _my_b_write), so -bexpall doesn't work.
-    archive_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-qmkshrobj ${wl}-bnoentry${allow_undefined_flag}'
+    archive_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bexpall ${wl}-bnoentry${allow_undefined_flag}'
     archive_expsym_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}'
     case "$host_os" in aix4.[01]|aix4.[01].*)
       # According to Greg Wooledge, -bexpall is only supported from AIX 4.2 on