Commit 1ceef15c authored by unknown's avatar unknown
Browse files

Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 

into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/handler.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
parents 3a675ff5 9a162f9a

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ bell@laptop.sanja.is.com.ua 
bell@sanja.is.com.ua

bk@admin.bk

bk@mysql.r18.ru

brian@avenger.(none)

brian@brian-akers-computer.local

carsten@tsort.bitbybit.dk

davida@isil.mysql.com

acconfig.h

+3 −0
Original line number Diff line number Diff line
@@ -115,6 +115,9 @@ 
/* Builds Example DB */

#undef HAVE_EXAMPLE_DB



/* Builds Archive Storage Engine */

#undef HAVE_ARCHIVE_DB



/* fp_except from ieeefp.h */

#undef HAVE_FP_EXCEPT

acinclude.m4

+30 −0
Original line number Diff line number Diff line
@@ -1332,6 +1332,36 @@ dnl --------------------------------------------------------------------------- 
dnl END OF MYSQL_CHECK_EXAMPLE SECTION

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



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

dnl Macro: MYSQL_CHECK_ARCHIVEDB

dnl Sets HAVE_ARCHIVE_DB if --with-archive-storage-engine is used

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

AC_DEFUN([MYSQL_CHECK_ARCHIVEDB], [

  AC_ARG_WITH([archive-storage-engine],

              [

  --with-archive-storage-engine

                          Enable the Archive Storge Engine],

              [archivedb="$withval"],

              [archivedb=no])

  AC_MSG_CHECKING([for archive storage engine])



  case "$archivedb" in

    yes )

      AC_DEFINE(HAVE_ARCHIVE_DB)

      AC_MSG_RESULT([yes])

      [archivedb=yes]

      ;;

    * )

      AC_MSG_RESULT([no])

      [archivedb=no]

      ;;

  esac



])

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

dnl END OF MYSQL_CHECK_ARCHIVE SECTION

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



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

dnl Macro: MYSQL_CHECK_NDBCLUSTER

dnl Sets HAVE_NDBCLUSTER_DB if --with-ndbcluster is used

configure.in

+1 −0
Original line number Diff line number Diff line
@@ -2621,6 +2621,7 @@ MYSQL_CHECK_ISAM 
MYSQL_CHECK_BDB

MYSQL_CHECK_INNODB

MYSQL_CHECK_EXAMPLEDB

MYSQL_CHECK_ARCHIVEDB

MYSQL_CHECK_NDBCLUSTER



# If we have threads generate some library functions and test programs

mysql-test/include/have_archive.inc

0 → 100644
+4 −0
Original line number Diff line number Diff line 
-- require r/have_archive.require

disable_query_log;

show variables like "have_archive";

enable_query_log;