Commit d1fc2f3c authored by mikef@nslinux.bedford.progress.com's avatar mikef@nslinux.bedford.progress.com
Browse files

Merge nusphere@work.mysql.com:/home/bk/mysql 

into nslinux.bedford.progress.com:/usr1/mikef/MYSQL/there
parents 68ad3413 ceac5f92

BUILD/FINISH.sh

+4 −0
Original line number Diff line number Diff line
@@ -15,6 +15,10 @@ $make -k clean || true 
aclocal && autoheader && aclocal && automake && autoconf

(cd bdb/dist && sh s_all)

(cd innobase && aclocal && autoheader && aclocal && automake && autoconf)

if [ -d gemini ]

then

   (cd gemini && aclocal && autoheader && aclocal && automake && autoconf)

fi



CFLAGS=\"$cflags\" CXX=gcc CXXFLAGS=\"$cxxflags\" $configure"

BitKeeper/etc/logging_ok

+4 −3
Original line number Diff line number Diff line 
mwagner@evoq.mwagner.org

sasha@mysql.sashanet.com

heikki@donna.mysql.fi

miguel@linux.local

monty@tik.mysql.fi

mikef@nslinux.bedford.progress.com

monty@donna.mysql.fi

monty@tik.mysql.fi

mwagner@evoq.mwagner.org

sasha@mysql.sashanet.com

Docs/manual.texi

+834 −57

File changed.

Preview size limit exceeded, changes collapsed.

acinclude.m4

+2 −2
Original line number Diff line number Diff line
@@ -999,10 +999,10 @@ dnl echo "DBG_GEM1: gemini='$gemini'" 
  gemini_includes=

  gemini_libs=

  case "$gemini" in

    no | default | *)

    no) 

      AC_MSG_RESULT([Not using Gemini DB])

      ;;

    yes )

    yes | default | *)

      have_gemini_db="yes"

      gemini_includes="-I../gemini/incl -I../gemini"

      gemini_libs="\

configure.in

+11 −0
Original line number Diff line number Diff line
@@ -2020,6 +2020,17 @@ EOF 
    echo "END OF INNODB CONFIGURATION"

  fi



  if test "X$have_gemini_db" = "Xyes"; then 

    sql_server_dirs="gemini $sql_server_dirs"

    echo "CONFIGURING FOR GEMINI DB"

    (cd gemini && sh ./configure) \

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



    echo "END OF GEMINI DB CONFIGURATION"



    AC_DEFINE(HAVE_GEMINI_DB)

  fi



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

  then

    # MIT user level threads