Commit a8a7fc34 authored by peter@mysql.com's avatar peter@mysql.com
Browse files

Merge mysql.com:/home/pz/mysql/mysql-4.0-root 

into mysql.com:/home/pz/mysql/mysql-4.0
parents 09725280 969c6b87

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -80,3 +80,4 @@ worm@altair.is.lan 
zak@balfor.local

zak@linux.local

zgreant@mysql.com

vva@genie.(none)

Docs/manual.texi

+101 −78

File changed.

Preview size limit exceeded, changes collapsed.

client/mysqlbinlog.cc

+21 −19

File changed.

Preview size limit exceeded, changes collapsed.

client/mysqltest.c

+38 −64

File changed.

Preview size limit exceeded, changes collapsed.

configure.in

+9 −1
Original line number Diff line number Diff line
@@ -922,7 +922,7 @@ case $SYSTEM_TYPE in 
      fi

    fi

    ;;

  *darwin*)

  *darwin5*)

    if test "$ac_cv_prog_gcc" = "yes"

    then

      CFLAGS="$CFLAGS -traditional-cpp -DHAVE_DARWIN_THREADS -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DHAVE_BROKEN_REALPATH"
@@ -931,6 +931,14 @@ case $SYSTEM_TYPE in 
      with_named_curses=""

    fi

    ;;

  *darwin6*)

    if test "$ac_cv_prog_gcc" = "yes"

    then

      CFLAGS="$CFLAGS -traditional-cpp -DHAVE_DARWIN_THREADS -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DHAVE_BROKEN_REALPATH"

      CXXFLAGS="$CXXFLAGS -traditional-cpp -DHAVE_DARWIN_THREADS -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ"

      MAX_C_OPTIMIZE="-O"

    fi

    ;;

  *freebsd*)

    echo "Adding fix for interrupted reads"

    CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000"