diff options
| author | unknown <holyfoot@mysql.com> | 2006-04-27 15:07:36 +0500 |
|---|---|---|
| committer | unknown <holyfoot@mysql.com> | 2006-04-27 15:07:36 +0500 |
| commit | eae76a32b2e8798610b4719a5f67956625291257 (patch) | |
| tree | f7ccd3b75989849bfd9dcff7f3c249dc33055fa3 /config | |
| parent | 3ada0dd96f3c5d32a4f5a39cefb75bfd321029cd (diff) | |
| parent | ca3277a87cf158d6e51b62cb8e0fb222e6cf883e (diff) | |
| download | mariadb-git-eae76a32b2e8798610b4719a5f67956625291257.tar.gz | |
Merge bk@192.168.21.1:mysql-5.1-new
into mysql.com:/home/hf/work/mysql-5.1.18518
include/my_global.h:
Auto merged
sql/log.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'config')
| -rw-r--r-- | config/ac-macros/ha_ndbcluster.m4 | 2 | ||||
| -rw-r--r-- | config/ac-macros/replication.m4 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/ac-macros/ha_ndbcluster.m4 b/config/ac-macros/ha_ndbcluster.m4 index 8e839d8fee9..ecb8808bfa0 100644 --- a/config/ac-macros/ha_ndbcluster.m4 +++ b/config/ac-macros/ha_ndbcluster.m4 @@ -238,7 +238,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] ;; |