Commit 286bd2ad authored by unknown's avatar unknown
Browse files

Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 

into patrick-galbraiths-computer.local:/Users/patg/5.0-federated


sql/Makefile.am:
  Auto merged
sql/field.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
parents 490ff28a 7d2e580c

config/ac-macros/ha_federated.m4

0 → 100644
+29 −0
Original line number Diff line number Diff line 
dnl ---------------------------------------------------------------------------

dnl Macro: MYSQL_CHECK_FEDERATED

dnl Sets HAVE_FEDERATED if --with-federated-storage-engine is used

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

AC_DEFUN([MYSQL_CHECK_FEDERATED], [

  AC_ARG_WITH([federated-storage-engine],

              [

  --with-federated-storage-engine

                        Enable the MySQL Storage Engine],

              [federateddb="$withval"],

              [federateddb=no])

  AC_MSG_CHECKING([for MySQL federated storage engine])



  case "$federateddb" in

    yes )

      AC_DEFINE([HAVE_FEDERATED_DB], [1], [Define to enable Federated Handler])

      AC_MSG_RESULT([yes])

      [federateddb=yes]

      ;;

    * )

      AC_MSG_RESULT([no])

      [federateddb=no]

      ;;

  esac



])

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

dnl END OF MYSQL_CHECK_FEDERATED SECTION

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

configure.in

+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ sinclude(config/ac-macros/compiler_flag.m4) 
sinclude(config/ac-macros/ha_archive.m4)

sinclude(config/ac-macros/ha_berkeley.m4)

sinclude(config/ac-macros/ha_example.m4)

sinclude(config/ac-macros/ha_federated.m4)

sinclude(config/ac-macros/ha_innodb.m4)

sinclude(config/ac-macros/ha_isam.m4)

sinclude(config/ac-macros/ha_ndbcluster.m4)
@@ -2420,6 +2421,7 @@ MYSQL_CHECK_EXAMPLEDB 
MYSQL_CHECK_ARCHIVEDB

MYSQL_CHECK_CSVDB

MYSQL_CHECK_NDBCLUSTER

MYSQL_CHECK_FEDERATED



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

sql_server_dirs=

mysql-test/include/have_federated_db.inc

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

disable_query_log;

show variables like "have_federated_db";

enable_query_log;

mysql-test/mysql-test-run.sh

+1 −0
Original line number Diff line number Diff line
@@ -1348,6 +1348,7 @@ run_testcase () 
 result_file="r/$tname.result"

 echo $tname > $CURRENT_TEST

 SKIP_SLAVE=`$EXPR \( $tname : rpl \) = 0`

 SKIP_SLAVE=`$EXPR \( $tname : federated \) = 0`

 if [ -n "$RESULT_EXT" -a \( x$RECORD = x1 -o -f "$result_file$RESULT_EXT" \) ] ; then

   result_file="$result_file$RESULT_EXT"

 fi

mysql-test/r/federated.result

0 → 100644
+517 −0

File added.

Preview size limit exceeded, changes collapsed.