Commit 94276214 authored by tim@donna.mysql.com's avatar tim@donna.mysql.com
Browse files

Merge donna.mysql.com:/home/my/bk/mysql 

into donna.mysql.com:/home/tim/my/work
parents 96a86081 17174373

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -12,3 +12,4 @@ tfr@coyote.emotion.ee 
tim@cane.mysql.fi

tim@threads.polyesthetic.msg

tim@work.mysql.com

tim@donna.mysql.com

acconfig.h

+3 −0
Original line number Diff line number Diff line
@@ -78,6 +78,9 @@ 
/* Define if int8, int16 and int32 types exist */

#undef HAVE_INT_8_16_32



/* Using Innobase DB */

#undef HAVE_INNOBASE_DB



/* Define if we have GNU readline */

#undef HAVE_LIBREADLINE

acinclude.m4

+77 −0
Original line number Diff line number Diff line
@@ -848,6 +848,83 @@ dnl --------------------------------------------------------------------------- 
dnl END OF MYSQL_CHECK_BDB SECTION

dnl ---------------------------------------------------------------------------



dnl ---------------------------------------------------------------------------

dnl Macro: MYSQL_CHECK_INNOBASE

dnl Sets HAVE_INNOBASE_DB if --with-innobase-db is used

dnl ---------------------------------------------------------------------------



AC_DEFUN([MYSQL_CHECK_INNOBASE], [

  AC_ARG_WITH([innobase-db],

              [\

  --with-innobase-db      Use Innobase DB],

              [innobase="$withval"],

              [innobase=no])



  AC_MSG_CHECKING([for Innobase DB])



  have_innobase_db=no

  innobase_includes=

  innobase_libs=

  case "$innobase" in

    yes )

      AC_MSG_RESULT([Using Innobase DB])

      AC_DEFINE(HAVE_INNOBASE_DB)

      have_innobase_db="yes"

      innobase_includes="-I../innobase/include"

dnl Some libs are listed several times, in order for gcc to sort out

dnl circular references.

      innobase_libs="\

 ../innobase/usr/libusr.a\

 ../innobase/odbc/libodbc.a\

 ../innobase/srv/libsrv.a\

 ../innobase/que/libque.a\

 ../innobase/dict/libdict.a\

 ../innobase/ibuf/libibuf.a\

 ../innobase/row/librow.a\

 ../innobase/pars/libpars.a\

 ../innobase/btr/libbtr.a\

 ../innobase/trx/libtrx.a\

 ../innobase/read/libread.a\

 ../innobase/usr/libusr.a\

 ../innobase/buf/libbuf.a\

 ../innobase/ibuf/libibuf.a\

 ../innobase/eval/libeval.a\

 ../innobase/log/liblog.a\

 ../innobase/fsp/libfsp.a\

 ../innobase/fut/libfut.a\

 ../innobase/fil/libfil.a\

 ../innobase/lock/liblock.a\

 ../innobase/mtr/libmtr.a\

 ../innobase/page/libpage.a\

 ../innobase/rem/librem.a\

 ../innobase/thr/libthr.a\

 ../innobase/com/libcom.a\

 ../innobase/sync/libsync.a\

 ../innobase/data/libdata.a\

 ../innobase/mach/libmach.a\

 ../innobase/ha/libha.a\

 ../innobase/dyn/libdyn.a\

 ../innobase/mem/libmem.a\

 ../innobase/sync/libsync.a\

 ../innobase/ut/libut.a\

 ../innobase/os/libos.a\

 ../innobase/ut/libut.a"



      AC_CHECK_LIB(rt, aio_read, [innobase_libs="$innobase_libs -lrt"])

      ;;

    * )

      AC_MSG_RESULT([Not using Innobase DB])

      ;;

  esac



  AC_SUBST(innobase_includes)

  AC_SUBST(innobase_libs)

])



dnl ---------------------------------------------------------------------------

dnl END OF MYSQL_CHECK_INNOBASE SECTION

dnl ---------------------------------------------------------------------------



dnl ---------------------------------------------------------------------------

dnl Got this from the GNU tar 1.13.11 distribution

dnl by Paul Eggert <eggert@twinsun.com>

configure.in

+11 −0
Original line number Diff line number Diff line
@@ -1833,6 +1833,7 @@ AC_MSG_RESULT([default: $default_charset; compiled in: $CHARSETS]) 




MYSQL_CHECK_BDB

MYSQL_CHECK_INNOBASE





# If we have threads generate some library functions and test programs
@@ -1898,6 +1899,16 @@ mysql-noinstall-hack:' \ 
    AC_DEFINE(HAVE_BERKELEY_DB)

  fi



  if test X"$have_innobase_db" = Xyes

  then

    sql_server_dirs="innobase $sql_server_dirs"

    echo "CONFIGURING FOR INNOBASE DB" 

    (cd innobase && sh ./configure) \

    || AC_MSG_ERROR([could not configure Innobase DB])



    echo "END OF INNOBASE DB CONFIGURATION"

  fi



  if test "$with_posix_threads" = "no" -o "$with_mit_threads" = "yes"

  then

    # MIT user level threads

innobase/include/os0file.h

+6 −0
Original line number Diff line number Diff line
@@ -28,6 +28,12 @@ Created 10/21/1995 Heikki Tuuri 
#define POSIX_ASYNC_IO

#endif



#ifndef S_IRWXU

#define S_IRWXU 00700

#define S_IRWXG 00070

#define S_IRWXO 00007

#endif



#endif



#ifdef __WIN__