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

Add support for Gemini table handler, Monty has checked and approved 

Fix bug when read return error
parent 3c484480

BitKeeper/etc/logging_ok

+1 −1
Original line number Diff line number Diff line 
monty@tik.mysql.fi
 
mikef@nslinux.bedford.progress.com

acconfig.h

+3 −0
Original line number Diff line number Diff line
@@ -117,6 +117,9 @@ 
/* POSIX readdir_r */

#undef HAVE_READDIR_R



/* Have Gemini db installed */

#undef HAVE_GEMINI_DB



/* POSIX sigwait */

#undef HAVE_SIGWAIT

acinclude.m4

+86 −0
Original line number Diff line number Diff line
@@ -941,6 +941,92 @@ dnl --------------------------------------------------------------------------- 
dnl END OF MYSQL_CHECK_INNOBASE SECTION

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



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

dnl Macro: MYSQL_CHECK_GEMINI

dnl Sets HAVE_GEMINI_DB if --with-gemini is used

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



AC_DEFUN([MYSQL_CHECK_GEMINI], [

  AC_ARG_WITH([gemini],

              [\

  --with-gemini[=DIR] Use Gemini DB located in DIR],

              [gemini="$withval"],

              [gemini=no])



  AC_MSG_CHECKING([for Gemini DB])



dnl     SORT OUT THE SUPPLIED ARGUMENTS TO DETERMINE WHAT TO DO

dnl echo "DBG_GEM1: gemini='$gemini'"

  have_gemini_db=no

  gemini_includes=

  gemini_libs=

  case "$gemini" in

    no )

      AC_MSG_RESULT([Not using Gemini DB])

      ;;

    yes | default  | *)

      have_gemini_db="yes"

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

      gemini_libs="\

 ../gemini/api/libapi.a\

 ../gemini/db/libdb.a\

 ../gemini/dbut/libdbut.a\

 ../gemini/vst/libvst.a"

      AC_MSG_RESULT([Using Gemini DB])

      ;;

  esac



  AC_SUBST(gemini_includes)

  AC_SUBST(gemini_libs)

])



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

dnl END OF MYSQL_CHECK_GEMINI SECTION

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



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

dnl Macro: MYSQL_CHECK_GEMINI

dnl Sets HAVE_GEMINI_DB if --with-gemini is used

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



AC_DEFUN([MYSQL_CHECK_GEMINI], [

  AC_ARG_WITH([gemini],

              [\

  --with-gemini[=DIR] Use Gemini DB located in DIR],

              [gemini="$withval"],

              [gemini=no])



  AC_MSG_CHECKING([for Gemini DB])



dnl     SORT OUT THE SUPPLIED ARGUMENTS TO DETERMINE WHAT TO DO

dnl echo "DBG_GEM1: gemini='$gemini'"

  have_gemini_db=no

  gemini_includes=

  gemini_libs=

  case "$gemini" in

    no )

      AC_MSG_RESULT([Not using Gemini DB])

      ;;

    yes | default  | *)

      have_gemini_db="yes"

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

      gemini_libs="\

 ../gemini/api/libapi.a\

 ../gemini/db/libdb.a\

 ../gemini/dbut/libdbut.a\

 ../gemini/vst/libvst.a"

      AC_MSG_RESULT([Using Gemini DB])

      ;;

  esac



  AC_SUBST(gemini_includes)

  AC_SUBST(gemini_libs)

])



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

dnl END OF MYSQL_CHECK_GEMINI SECTION

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



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

dnl Got this from the GNU tar 1.13.11 distribution

dnl by Paul Eggert <eggert@twinsun.com>

include/my_base.h

+2 −0
Original line number Diff line number Diff line
@@ -211,6 +211,8 @@ enum ha_base_keytype { 
#define HA_ERR_WRONG_TABLE_DEF	 143

#define HA_ERR_CRASHED_ON_REPAIR 144	/* Last (automatic?) repair failed */

#define HA_ERR_CRASHED_ON_USAGE  145	/* Table must be repaired */

#define HA_ERR_LOCK_WAIT_TIMEOUT 146    

#define HA_ERR_LOCK_TABLE_FULL   147



	/* Other constants */

mysql-test/include/have_gemini.inc

0 → 100644
+2 −0
Original line number Diff line number Diff line 
-- require r/have_gemini.require

show variables like "have_gemini";