Commit 18482ae8 authored by monty@bitch.mysql.fi's avatar monty@bitch.mysql.fi
Browse files

Merge hundin:/my/mysql-4.0 into bitch.mysql.fi:/my/mysql-4.0

parents 0cd2c623 3fc4f073

BitKeeper/etc/logging_ok

+2 −1
Original line number Diff line number Diff line 
Miguel@light.local

Sinisa@sinisa.nasamreza.org

davida@isil.mysql.com

heikki@donna.mysql.fi
@@ -26,6 +27,6 @@ tim@threads.polyesthetic.msg 
tim@white.box

tim@work.mysql.com

tonu@hundin.mysql.fi

tonu@volk.internalnet

tonu@x153.internalnet

tonu@x3.internalnet
 
tonu@volk.internalnet

Build-tools/Do-all-build-steps

+0 −1
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ aclocal; autoheader; aclocal; automake; autoconf 
 --enable-thread-safe-client \

 --with-berkeley-db \

 --with-innodb \

 --with-openssl \

 --with-vio \

 --without-pstack \

 --with-extra-tools \

Docs/manual.texi

+238 −123

File changed.

Preview size limit exceeded, changes collapsed.

acinclude.m4

+13 −12
Original line number Diff line number Diff line
@@ -690,8 +690,7 @@ fi 


AC_DEFUN(MYSQL_CHECK_VIO, [

  AC_ARG_WITH([vio],

              [\

  --with-vio          Include the Virtual IO support],

              [  --with-vio          Include the Virtual IO support],

              [vio="$withval"],

              [vio=no])
@@ -712,26 +711,25 @@ AC_DEFUN(MYSQL_CHECK_VIO, [ 
AC_DEFUN(MYSQL_CHECK_OPENSSL, [

AC_MSG_CHECKING(for OpenSSL)

  AC_ARG_WITH([openssl],

              [\

  --with-openssl          Include the OpenSSL support],

              [  --with-openssl          Include the OpenSSL support],

              [openssl="$withval"],

              [openssl=no])



  openssl_libs=""

  openssl_includes=""

  if test "$openssl" = "yes"

  then

    if test -n "$vio_dir"

    then

      AC_MSG_RESULT(yes)

      openssl_libs="-lssl -lcrypto -L/usr/local/ssl/lib"

      openssl_libs="-L/usr/local/ssl/lib -lssl -lcrypto"

      openssl_includes="-I/usr/local/ssl/include"

      AC_DEFINE(HAVE_OPENSSL)

    else

      AC_MSG_ERROR([OpenSSL requires Virtual IO support (--with-vio)])

      AC_MSG_RESULT(disabled because --with-vio wasn not used)

    fi

    AC_DEFINE(HAVE_OPENSSL)

  else

    AC_MSG_RESULT(no)

    openssl_libs=""

    openssl_includes=""

  fi

  NON_THREADED_CLIENT_LIBS="$NON_THREADED_CLIENT_LIBS $openssl_libs"

  AC_SUBST(openssl_libs)
@@ -750,16 +748,19 @@ dnl Call MYSQL_CHECK_ORBIT even if mysqlfs == no, so that @orbit_*@ 
dnl get substituted.

  MYSQL_CHECK_ORBIT



  AC_MSG_CHECKING(if we should build MySQLFS)

  fs_dirs=""

  if test "$mysqlfs" = "yes"

  then

    if test -n "$orbit_exec_prefix"

    then

      fs_dirs=fs

      AC_MSG_RESULT([yes])

    else

      AC_MSG_ERROR([mysqlfs requires ORBit, the CORBA ORB])

      AC_MSG_RESULT(disabled because ORBIT, the CORBA ORB, was not found)

    fi

  else

    fs_dirs=

    AC_MSG_RESULT([no])

  fi

  AC_SUBST([fs_dirs])

])
@@ -1250,7 +1251,7 @@ changequote([, ])dnl 
AC_DEFUN(AC_SYS_LARGEFILE,

  [AC_REQUIRE([AC_CANONICAL_HOST])

   AC_ARG_ENABLE(largefile,

     [  --disable-large-files   Omit support for large files])

     [  --disable-largefile    Omit support for large files])

   if test "$enable_largefile" != no; then

     AC_CHECK_TOOL(GETCONF, getconf)

     AC_SYS_LARGEFILE_FLAGS(CFLAGS)

client/client_priv.h

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <my_global.h>

#include <my_sys.h> 

#include <m_string.h>

#include <mysql_embed.h>

#include <mysql.h>

#include <errmsg.h>

#include <getopt.h>