merge (remove conflicting zip files)

BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-ChangeLog:
  Delete: zlib/ChangeLog
BitKeeper/deleted/.del-descrip.mms:
  Delete: zlib/descrip.mms
BitKeeper/deleted/.del-zlib.def:
  Delete: zlib/os2/zlib.def
BitKeeper/deleted/.del-example.c:
  Delete: zlib/example.c
BitKeeper/deleted/.del-faq:
  Delete: zlib/faq
BitKeeper/deleted/.del-gzio.c:
  Delete: zlib/gzio.c
BitKeeper/deleted/.del-index:
  Delete: zlib/index
BitKeeper/deleted/.del-infblock.c:
  Delete: zlib/infblock.c
BitKeeper/deleted/.del-infblock.h:
  Delete: zlib/infblock.h
BitKeeper/deleted/.del-infcodes.c:
  Delete: zlib/infcodes.c
BitKeeper/deleted/.del-infcodes.h:
  Delete: zlib/infcodes.h
BitKeeper/deleted/.del-inffast.c:
  Delete: zlib/inffast.c
BitKeeper/deleted/.del-Make_vms.com:
  Delete: zlib/Make_vms.com
BitKeeper/deleted/.del-inffast.h:
  Delete: zlib/inffast.h
BitKeeper/deleted/.del-inffixed.h:
  Delete: zlib/inffixed.h
BitKeeper/deleted/.del-inflate.c:
  Delete: zlib/inflate.c
BitKeeper/deleted/.del-inftrees.c:
  Delete: zlib/inftrees.c
BitKeeper/deleted/.del-inftrees.h:
  Delete: zlib/inftrees.h
BitKeeper/deleted/.del-infutil.c:
  Delete: zlib/infutil.c
BitKeeper/deleted/.del-infutil.h:
  Delete: zlib/infutil.h
BitKeeper/deleted/.del-maketree.c:
  Delete: zlib/maketree.c
BitKeeper/deleted/.del-minigzip.c:
  Delete: zlib/minigzip.c
BitKeeper/deleted/.del-readme:
  Delete: zlib/readme
BitKeeper/deleted/.del-Makefile.riscos:
  Delete: zlib/Makefile.riscos
BitKeeper/deleted/.del-trees.c:
  Delete: zlib/trees.c
BitKeeper/deleted/.del-trees.h:
  Delete: zlib/trees.h
BitKeeper/deleted/.del-uncompr.c:
  Delete: zlib/uncompr.c
BitKeeper/deleted/.del-zconf.h:
  Delete: zlib/zconf.h
BitKeeper/deleted/.del-zlib.3:
  Delete: zlib/zlib.3
BitKeeper/deleted/.del-zlib.dsp:
  Delete: zlib/zlib.dsp
BitKeeper/deleted/.del-zlib.h:
  Delete: zlib/zlib.h
BitKeeper/deleted/.del-zlib.html:
  Delete: zlib/zlib.html
BitKeeper/deleted/.del-zutil.c:
  Delete: zlib/zutil.c
BitKeeper/deleted/.del-zutil.h:
  Delete: zlib/zutil.h
BitKeeper/deleted/.del-adler32.c:
  Delete: zlib/adler32.c
BitKeeper/deleted/.del-Makefile.pup:
  Delete: zlib/amiga/Makefile.pup
BitKeeper/deleted/.del-Makefile.sas:
  Delete: zlib/amiga/Makefile.sas
BitKeeper/deleted/.del-README.contrib:
  Delete: zlib/contrib/README.contrib
BitKeeper/deleted/.del-visual-basic.txt:
  Delete: zlib/contrib/visual-basic.txt
BitKeeper/deleted/.del-gvmat32.asm:
  Delete: zlib/contrib/asm386/gvmat32.asm
BitKeeper/deleted/.del-gvmat32c.c:
  Delete: zlib/contrib/asm386/gvmat32c.c
BitKeeper/deleted/.del-mkgvmt32.bat:
  Delete: zlib/contrib/asm386/mkgvmt32.bat
BitKeeper/deleted/.del-zlibvc.def:
  Delete: zlib/contrib/asm386/zlibvc.def
BitKeeper/deleted/.del-zlibvc.dsp:
  Delete: zlib/contrib/asm386/zlibvc.dsp
BitKeeper/deleted/.del-zlibvc.dsw:
  Delete: zlib/contrib/asm386/zlibvc.dsw
BitKeeper/deleted/.del-algorithm.txt:
  Delete: zlib/algorithm.txt
BitKeeper/deleted/.del-match.s:
  Delete: zlib/contrib/asm586/match.s
BitKeeper/deleted/.del-readme.586:
  Delete: zlib/contrib/asm586/readme.586
BitKeeper/deleted/.del-match.s~1:
  Delete: zlib/contrib/asm686/match.s
BitKeeper/deleted/.del-readme.686:
  Delete: zlib/contrib/asm686/readme.686
BitKeeper/deleted/.del-zlib.mak:
  Delete: zlib/contrib/delphi/zlib.mak
BitKeeper/deleted/.del-zlibdef.pas:
  Delete: zlib/contrib/delphi/zlibdef.pas
BitKeeper/deleted/.del-d_zlib.bpr:
  Delete: zlib/contrib/delphi2/d_zlib.bpr
BitKeeper/deleted/.del-d_zlib.cpp:
  Delete: zlib/contrib/delphi2/d_zlib.cpp
BitKeeper/deleted/.del-readme.txt:
  Delete: zlib/contrib/delphi2/readme.txt
BitKeeper/deleted/.del-zlib.bpg:
  Delete: zlib/contrib/delphi2/zlib.bpg
BitKeeper/deleted/.del-compress.c:
  Delete: zlib/compress.c
BitKeeper/deleted/.del-zlib.bpr:
  Delete: zlib/contrib/delphi2/zlib.bpr
BitKeeper/deleted/.del-zlib.cpp:
  Delete: zlib/contrib/delphi2/zlib.cpp
BitKeeper/deleted/.del-zlib.pas:
  Delete: zlib/contrib/delphi2/zlib.pas
BitKeeper/deleted/.del-zlib32.bpr:
  Delete: zlib/contrib/delphi2/zlib32.bpr
BitKeeper/deleted/.del-zlib32.cpp:
  Delete: zlib/contrib/delphi2/zlib32.cpp
BitKeeper/deleted/.del-test.cpp:
  Delete: zlib/contrib/iostream/test.cpp
BitKeeper/deleted/.del-zfstream.cpp:
  Delete: zlib/contrib/iostream/zfstream.cpp
BitKeeper/deleted/.del-zfstream.h:
  Delete: zlib/contrib/iostream/zfstream.h
BitKeeper/deleted/.del-zstream.h:
  Delete: zlib/contrib/iostream2/zstream.h
BitKeeper/deleted/.del-zstream_test.cpp:
  Delete: zlib/contrib/iostream2/zstream_test.cpp
BitKeeper/deleted/.del-crc32.c:
  Delete: zlib/crc32.c
BitKeeper/deleted/.del-ChangeLogUnzip:
  Delete: zlib/contrib/minizip/ChangeLogUnzip
BitKeeper/deleted/.del-miniunz.c:
  Delete: zlib/contrib/minizip/miniunz.c
BitKeeper/deleted/.del-minizip.c:
  Delete: zlib/contrib/minizip/minizip.c
BitKeeper/deleted/.del-readme.txt~1:
  Delete: zlib/contrib/minizip/readme.txt
BitKeeper/deleted/.del-unzip.c:
  Delete: zlib/contrib/minizip/unzip.c
BitKeeper/deleted/.del-unzip.def:
  Delete: zlib/contrib/minizip/unzip.def
BitKeeper/deleted/.del-unzip.h:
  Delete: zlib/contrib/minizip/unzip.h
BitKeeper/deleted/.del-zip.c:
  Delete: zlib/contrib/minizip/zip.c
BitKeeper/deleted/.del-zip.def:
  Delete: zlib/contrib/minizip/zip.def
BitKeeper/deleted/.del-zip.h:
  Delete: zlib/contrib/minizip/zip.h
BitKeeper/deleted/.del-deflate.c:
  Delete: zlib/deflate.c
BitKeeper/deleted/.del-zlibvc.def~1:
  Delete: zlib/contrib/minizip/zlibvc.def
BitKeeper/deleted/.del-zlibvc.dsp~1:
  Delete: zlib/contrib/minizip/zlibvc.dsp
BitKeeper/deleted/.del-zlibvc.dsw~1:
  Delete: zlib/contrib/minizip/zlibvc.dsw
BitKeeper/deleted/.del-makefile.w32:
  Delete: zlib/contrib/untgz/makefile.w32
BitKeeper/deleted/.del-untgz.c:
  Delete: zlib/contrib/untgz/untgz.c
BitKeeper/deleted/.del-Makefile.b32:
  Delete: zlib/msdos/Makefile.b32
BitKeeper/deleted/.del-Makefile.bor:
  Delete: zlib/msdos/Makefile.bor
BitKeeper/deleted/.del-Makefile.dj2:
  Delete: zlib/msdos/Makefile.dj2
BitKeeper/deleted/.del-Makefile.emx:
  Delete: zlib/msdos/Makefile.emx
BitKeeper/deleted/.del-Makefile.msc:
  Delete: zlib/msdos/Makefile.msc
BitKeeper/deleted/.del-deflate.h:
  Delete: zlib/deflate.h
BitKeeper/deleted/.del-Makefile.tc:
  Delete: zlib/msdos/Makefile.tc
BitKeeper/deleted/.del-Makefile.w32:
  Delete: zlib/msdos/Makefile.w32
BitKeeper/deleted/.del-Makefile.wat:
  Delete: zlib/msdos/Makefile.wat
BitKeeper/deleted/.del-zlib.def~1:
  Delete: zlib/msdos/zlib.def
BitKeeper/deleted/.del-zlib.rc:
  Delete: zlib/msdos/zlib.rc
BitKeeper/deleted/.del-Makefile.emx~1:
  Delete: zlib/nt/Makefile.emx
BitKeeper/deleted/.del-Makefile.gcc:
  Delete: zlib/nt/Makefile.gcc
BitKeeper/deleted/.del-Makefile.nt:
  Delete: zlib/nt/Makefile.nt
BitKeeper/deleted/.del-zlib.dnt:
  Delete: zlib/nt/zlib.dnt
BitKeeper/deleted/.del-Makefile.os2:
  Delete: zlib/os2/Makefile.os2
configure.in:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
sql/handler.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
Docs/manual.texi:
  merge
sql/ha_innodb.cc:
  merge

1 files changed, 44 insertions, 15 deletions

diff --git a/configure.in b/configure.in
index 8794f0fb884..17edcabbaf0 100644
--- a/configure.in
+++ b/configure.in
@@ -38,7 +38,7 @@ for i in $AVAILABLE_LANGUAGES
 do
   AVAILABLE_LANGUAGES_ERRORS="$AVAILABLE_LANGUAGES_ERRORS $i/errmsg.sys"
   echo "$i/errmsg.sys: $i/errmsg.txt
-	\$(top_builddir)/extra/comp_err $i/errmsg.txt $i/errmsg.sys" \
+	\$(top_builddir)/extra/comp_err \$^ $i/errmsg.sys" \
     >> $AVAILABLE_LANGUAGES_ERRORS_RULES
 done
 
@@ -126,6 +126,20 @@ AC_PROG_CC
 AC_PROG_CXX
 AC_PROG_CPP
 
+# Print version of CC and CXX compiler (if they support --version)
+CC_VERSION=`$CC --version`
+if test $? -eq "0"
+then
+  AC_MSG_CHECKING("C Compiler version");
+  AC_MSG_RESULT("$CC $CC_VERSION")
+fi
+CXX_VERSION=`$CXX --version`
+if test $? -eq "0"
+then
+  AC_MSG_CHECKING("C++ compiler version");
+  AC_MSG_RESULT("$CXX $CXX_VERSION")
+fi
+
 # Fix for sgi gcc / sgiCC which tries to emulate gcc
 if test "$CC" = "sgicc"
 then
@@ -307,6 +321,19 @@ then
   # Disable exceptions as they seams to create problems with gcc and threads.
   # mysqld doesn't use run-time-type-checking, so we disable it.
   CXXFLAGS="$CXXFLAGS -fno-implicit-templates -fno-exceptions -fno-rtti"
+
+  # If you are using 'gcc' 3.0 (not g++) to compile C++ programs,
+  # we will gets some problems when linking static programs.
+  # The following code is used to fix this problem.
+
+  if test "$CXX" = "gcc"
+  then
+    if $CXX -v 2>&1 | grep 'version 3' > /dev/null 2>&1
+    then
+      CXXFLAGS="$CXXFLAGS -DUSE_MYSYS_NEW"
+      CXXLDFLAGS="$CXXLDFLAGS -Wl,--defsym -Wl,__cxa_pure_virtual=0"
+    fi
+  fi
 fi
 
 # Avoid bug in fcntl on some versions of linux
@@ -435,16 +462,17 @@ AC_ARG_WITH(other-libc,
    enable_shared="no"
    all_is_static="yes"
    CFLAGS="$CFLAGS -I$other_libc_include"
+   # There seems to be a feature in gcc that treats system and libc headers
+   # silently when they violatate ANSI C++ standard, but it is strict otherwise
+   # since gcc cannot now recognize that our headers are libc, we work around
+   # by telling it to be permissive. Note that this option only works with
+   # new versions of gcc (2.95.x and above)
    CXXFLAGS="$CXXFLAGS -fpermissive -I$other_libc_include"
-#There seems to be a feature in gcc that treats system and libc headers
-#leniently when they violatate ANSI C++ standard, but it is strict otherwise
-#since gcc cannot now recognize that our headers are libc, we work around
-#by telling it to be permissive
    static_nss=
    if test -f "$other_libc_lib/libnss_files.a"
    then
-   # libc has been compiled with --enable-static-nss
-   # we need special flags, but we will have to add those later
+     # libc has been compiled with --enable-static-nss
+     # we need special flags, but we will have to add those later
      STATIC_NSS_FLAGS="-Wl,--start-group -lc -lnss_files -lnss_dns -lresolv \
   -Wl,--end-group"
      static_nss=1
@@ -460,12 +488,12 @@ AC_ARG_WITH(other-libc,
      LDFLAGS="$LDFLAGS -static -L$other_libc_lib "
    fi
    
+   # When linking against custom libc installed separately, we want to force
+   # all binary builds to be static, including the build done by configure
+   # itself to test for system features.
    with_mysqld_ldflags="-all-static"
    with_client_ldflags="-all-static"
    NOINST_LDFLAGS="-all-static"
-#when linking against custom libc installed separately, we want to force all
-#binary builds to be static, including the build done by configure itself
-#to test for system features   
  ],
  [
   other_libc_include=
@@ -974,7 +1002,8 @@ Reference Manual.])
         if test -f /usr/shlib/libpthread.so -a -f /usr/lib/libmach.a -a -f /usr/ccs/lib/cmplrs/cc/libexc.a
 	then
 	  with_named_thread="-lpthread -lmach -lexc"
-	  #with_named_thread="-lpthread -lmach -lexc -lc"
+	  CFLAGS="$CFLAGS -D_REENTRANT"
+	  CXXFLAGS="$CXXFLAGS -D_REENTRANT"
 	  AC_DEFINE(HAVE_DEC_THREADS)
 	  AC_MSG_RESULT("yes")
 	else
@@ -1557,9 +1586,9 @@ ac_save_CXXFLAGS="$CXXFLAGS"
 AC_CACHE_CHECK([style of gethost* routines], mysql_cv_gethost_style,
 AC_LANG_SAVE
 AC_LANG_CPLUSPLUS
-#do not treat warnings as errors if we are linking agaist other libc
-#this is to work around gcc not being permissive on non-system includes
-#with respect to ANSI C++
+# Do not treat warnings as errors if we are linking agaist other libc
+# this is to work around gcc not being permissive on non-system includes
+# with respect to ANSI C++
 if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no" 
 then
   CXXFLAGS="$CXXFLAGS -Werror"
@@ -2300,7 +2329,7 @@ EOF
   fi
 fi
 
-#IMPORTANT - do not modify LIBS past this line - this hack is the only way
+# IMPORTANT - do not modify LIBS past this line - this hack is the only way
 # I know to add the static NSS magic if we have static NSS libraries with
 # glibc - Sasha