diff options
author | unknown <holyfoot@deer.(none)> | 2006-04-24 19:39:33 +0500 |
---|---|---|
committer | unknown <holyfoot@deer.(none)> | 2006-04-24 19:39:33 +0500 |
commit | 7e52383d610938219db32c441a5edb821b168887 (patch) | |
tree | ed759318ab461c4a6a165ba80fddc82d5b280e8b /config/ac-macros | |
parent | c2e4ef092bb4c0bf1165e97a0e4c4aac4bb42a22 (diff) | |
download | mariadb-git-7e52383d610938219db32c441a5edb821b168887.tar.gz |
bug #18518 (embedded server crashes starting)
The problem is that now server works properly only with the
row-based replication
config/ac-macros/ha_ndbcluster.m4:
WITH_NDB_BINLOG instead of HAVE_NDB_BINLOG in config.h
config/ac-macros/replication.m4:
WITH_ROW_BASED_REPLICATION instead of HAVE_ROW_BASED_REPLICATION in
config.h
sql/log.cc:
some #ifdef HAVE_ROW_BASED_REPLICATION added
sql/mysqld.cc:
some #ifdef HAVE_ROW_BASED_REPLICATION added
sql/set_var.cc:
some #ifdef HAVE_ROW_BASED_REPLICATION added
sql/sql_base.cc:
some #ifdef HAVE_ROW_BASED_REPLICATION added
sql/sql_class.cc:
some #ifdef HAVE_ROW_BASED_REPLICATION added
sql/sql_class.h:
some #ifdef HAVE_ROW_BASED_REPLICATION added
sql/sql_parse.cc:
some #ifdef HAVE_ROW_BASED_REPLICATION added
Diffstat (limited to 'config/ac-macros')
-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] ;; |