diff options
| author | lars/lthalmann@dl145j.mysql.com <> | 2007-01-12 12:31:44 +0100 |
|---|---|---|
| committer | lars/lthalmann@dl145j.mysql.com <> | 2007-01-12 12:31:44 +0100 |
| commit | 1e356251a0838095863e0ed069ec4135752f5123 (patch) | |
| tree | 8f05ed2f7b6984f4ca7df8e1eafad42a9d4235e2 /config | |
| parent | ebb4885357428d10aaa1628f860e1457de80d91b (diff) | |
| parent | baf42721521eaa1258f5c26311ac6ccf860369fd (diff) | |
| download | mariadb-git-1e356251a0838095863e0ed069ec4135752f5123.tar.gz | |
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
Diffstat (limited to 'config')
| -rw-r--r-- | config/ac-macros/ha_ndbcluster.m4 | 5 | ||||
| -rw-r--r-- | config/ac-macros/replication.m4 | 30 |
2 files changed, 1 insertions, 34 deletions
diff --git a/config/ac-macros/ha_ndbcluster.m4 b/config/ac-macros/ha_ndbcluster.m4 index 26cb0394583..86bd16487eb 100644 --- a/config/ac-macros/ha_ndbcluster.m4 +++ b/config/ac-macros/ha_ndbcluster.m4 @@ -229,10 +229,7 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [ if test X"$ndb_binlog" = Xdefault || test X"$ndb_binlog" = Xyes then - if test X"$have_row_based" = Xyes - then - have_ndb_binlog="yes" - fi + have_ndb_binlog="yes" fi if test X"$have_ndb_binlog" = Xyes diff --git a/config/ac-macros/replication.m4 b/config/ac-macros/replication.m4 deleted file mode 100644 index babfa000a82..00000000000 --- a/config/ac-macros/replication.m4 +++ /dev/null @@ -1,30 +0,0 @@ -dnl This file contains configuration parameters for replication. - -dnl --------------------------------------------------------------------------- -dnl Macro: MYSQL_CHECK_REPLICATION -dnl Sets HAVE_ROW_BASED_REPLICATION if --with-row-based-replication is used -dnl --------------------------------------------------------------------------- - -AC_DEFUN([MYSQL_CHECK_REPLICATION], [ - AC_ARG_WITH([row-based-replication], - AC_HELP_STRING([--without-row-based-replication], - [Don't include row-based replication]), - [row_based="$withval"], - [row_based=yes]) - AC_MSG_CHECKING([for row-based replication]) - - case "$row_based" in - yes ) - AC_DEFINE([WITH_ROW_BASED_REPLICATION], [1], [Define to have row-based replication]) - AC_MSG_RESULT([-- including row-based replication]) - [have_row_based=yes] - ;; - * ) - AC_MSG_RESULT([-- not including row-based replication]) - [have_row_based=no] - ;; - esac -]) -dnl --------------------------------------------------------------------------- -dnl END OF MYSQL_CHECK_REPLICATION -dnl --------------------------------------------------------------------------- |