Merge bk-internal.mysql.com:/home/bk/mysql-4.1

into neptunus.(none):/home/msvensson/mysql/mysql-4.1

Docs/Makefile.am

@@ -36,22 +36,22 @@ CLEAN_FILES:		$(txt_files)
 GT = $(srcdir)/Support/generate-text-files.pl
 
 ../INSTALL-SOURCE:	mysql.info $(GT)
-	perl -w $(GT) mysql.info "Installing" "Tutorial" > $@
+	perl -w $(GT) mysql.info "installing-source" "windows-source-build" > $@
 
 ../INSTALL-WIN-SOURCE:	mysql.info $(GT)
-	perl -w $(GT) mysql.info "Windows source build" "Post-installation" > $@
+	perl -w $(GT) mysql.info "windows-source-build" "post-installation" > $@
 
 # We put the description for the binary installation here so that
 # people who download source wont have to see it. It is moved up to
 # the toplevel by the script that makes the binary tar files.
 INSTALL-BINARY:	mysql.info $(GT)
-	perl -w $(GT) mysql.info "Installing binary" "Installing source" > $@
+	perl -w $(GT) mysql.info "installing-binary" "installing-source" > $@
 
 ../EXCEPTIONS-CLIENT: mysql.info $(GT)
-	perl -w $(GT) mysql.info "MySQL FLOSS License Exception" "Function Index" > $@
+	perl -w $(GT) mysql.info "mysql-floss-license-exception" "function-index" > $@
 
 ../support-files/MacOSX/ReadMe.txt:	mysql.info $(GT)
-	perl -w $(GT) mysql.info "Mac OS X installation" "NetWare installation" > $@
+	perl -w $(GT) mysql.info "mac-os-x-installation" "netware-installation" > $@
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%

Docs/Support/generate-flag-images

-#!/bin/sh
-
-flags=`grep @image mirrors.texi | cut -d" " -f1 | cut -d/ -f2 | tr -d "}" | sort | uniq`
-
-set -x
-cd Flags
-
-for c in $flags
-do
-  # For PNM, to be used later
-  giftopnm ../Raw-Flags/$c.gif | pnmscale -xsize 30 > $c-tmp.pnm
-  pnmpaste $c-tmp.pnm 1 1 ../Images/flag-background.pnm > $c.pnm
-  rm -f $c-tmp.pnm
-
-  # For GIF version
-  ppmtogif $c.pnm > $c.gif
-  # or cjpeg -optimize -quality 70 -outfile $c.jpg
-
-  # For EPS version
-  pnmtops -noturn $c.pnm > $c.eps
-
-  # For PDF version
-  ps2pdf $c.eps $c.pdf
-
-  # For text version
-  echo -n "" > $c.txt
-
-  # PNM isn't really needed
-  rm -f $c.pnm
-
-done

Docs/Support/generate-text-files.pl

@@ -13,7 +13,7 @@ while (<IN>)
 {
   if ($in)
   {
-    if (/Node: $tnode,/)
+    if (/Node: $tnode,/ || /\[index/)
     {
       $in = 0;
     }

support-files/mysql.spec.sh

 %define mysql_version		@VERSION@
-%ifarch i386
+# use "rpmbuild --with static" or "rpm --define '_with_static 1'" (for RPM 3.x)
+# to enable static linking (off by default)
+%{?_with_static:%define STATIC_BUILD 1}
+%{!?_with_static:%define STATIC_BUILD 0}
+%if %{STATIC_BUILD}
 %define release 0
 %else
 %define release 0.glibc23
@@ -341,7 +345,7 @@ make clean
 # so don't link statically there
 #
 BuildMySQL "--disable-shared \
-%ifarch i386
+%if %{STATIC_BUILD}
 		--with-mysqld-ldflags='-all-static' \
 		--with-client-ldflags='-all-static' \
 		$USE_OTHER_LIBC_DIR \
@@ -663,6 +667,13 @@ fi
 # itself - note that they must be ordered by date (important when
 # merging BK trees)
 %changelog 
+* Tue Jun 14 2005 Lenz Grimmer <lenz@mysql.com>
+
+- Do not build statically on i386 by default, only when adding either "--with
+  static" or "--define '_with_static 1'" to the RPM build options. Static
+  linking really only makes sense when linking against the specially patched
+  glibc 2.2.5.
+
 * Mon Jun 06 2005 Lenz Grimmer <lenz@mysql.com>
 
 - added mysql_client_test to the "bench" subpackage (BUG 10676)