Commit 2d8f4a61 authored by unknown's avatar unknown
Browse files

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

into avenger.(none):/export/brian/tina-4.1


acinclude.m4:
  Auto merged
BitKeeper/deleted/.del-acconfig.h~8d2e3113fc8056da:
  Auto merged
configure.in:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
parents a5a4ed90 ff5ade15

acinclude.m4

+31 −0
Original line number Diff line number Diff line
@@ -1458,6 +1458,37 @@ dnl --------------------------------------------------------------------------- 
dnl END OF MYSQL_CHECK_ARCHIVE SECTION

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



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

dnl Macro: MYSQL_CHECK_CSVDB

dnl Sets HAVE_CSV_DB if --with-csv-storage-engine is used

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

AC_DEFUN([MYSQL_CHECK_CSVDB], [

  AC_ARG_WITH([csv-storage-engine],

              [

  --with-csv-storage-engine

                          Enable the CSV Storage Engine],

              [csvdb="$withval"],

              [csvdb=no])

  AC_MSG_CHECKING([for csv storage engine])



  case "$csvdb" in

    yes )

      AC_DEFINE(HAVE_CSV_DB)

      AC_MSG_RESULT([yes])

      [csvdb=yes]

      ;;

    * )

      AC_MSG_RESULT([no])

      [csvdb=no]

      ;;

  esac



])

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

dnl END OF MYSQL_CHECK_CSV 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
@@ -2740,6 +2740,7 @@ MYSQL_CHECK_BDB 
MYSQL_CHECK_INNODB

MYSQL_CHECK_EXAMPLEDB

MYSQL_CHECK_ARCHIVEDB

MYSQL_CHECK_CSVDB

MYSQL_CHECK_NDBCLUSTER



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

mysql-test/include/have_csv.inc

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

disable_query_log;

show variables like "have_csv";

enable_query_log;

mysql-test/r/csv.result

0 → 100644
+4931 −0

File added.

Preview size limit exceeded, changes collapsed.

mysql-test/r/have_csv.require

0 → 100644
+2 −0
Original line number Diff line number Diff line 
Variable_name	Value

have_csv	YES