summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authortomas@poseidon.ndb.mysql.com <>2006-05-15 20:35:17 +0200
committertomas@poseidon.ndb.mysql.com <>2006-05-15 20:35:17 +0200
commit5971c0872bbfb3254a78da1fe58b589d94e995e9 (patch)
tree2c3932e36efa9dcdd5ae15307bb4bbe0065ea4ad /config
parent9c26c629a27d1ac41a2b9cedf31d5f8d2c6327a6 (diff)
parent4f04007ece9db9000fa2ac55a498eb0ce1dd9c11 (diff)
downloadmariadb-git-5971c0872bbfb3254a78da1fe58b589d94e995e9.tar.gz
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
Diffstat (limited to 'config')
-rw-r--r--config/ac-macros/ha_ndbcluster.m42
-rw-r--r--config/ac-macros/replication.m42
2 files changed, 2 insertions, 2 deletions
diff --git a/config/ac-macros/ha_ndbcluster.m4 b/config/ac-macros/ha_ndbcluster.m4
index aee445f8d58..505d000c196 100644
--- a/config/ac-macros/ha_ndbcluster.m4
+++ b/config/ac-macros/ha_ndbcluster.m4
@@ -237,7 +237,7 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [
if test X"$have_ndb_binlog" = Xyes
then
- AC_DEFINE([HAVE_NDB_BINLOG], [1],
+ AC_DEFINE([WITH_NDB_BINLOG], [1],
[Including Ndb Cluster Binlog])
AC_MSG_RESULT([Including Ndb Cluster Binlog])
else
diff --git a/config/ac-macros/replication.m4 b/config/ac-macros/replication.m4
index 3a0c83d6498..babfa000a82 100644
--- a/config/ac-macros/replication.m4
+++ b/config/ac-macros/replication.m4
@@ -15,7 +15,7 @@ AC_DEFUN([MYSQL_CHECK_REPLICATION], [
case "$row_based" in
yes )
- AC_DEFINE([HAVE_ROW_BASED_REPLICATION], [1], [Define to have row-based replication])
+ AC_DEFINE([WITH_ROW_BASED_REPLICATION], [1], [Define to have row-based replication])
AC_MSG_RESULT([-- including row-based replication])
[have_row_based=yes]
;;