Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge


client/mysqlbinlog.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
configure.in:
  Auto merged
include/config-win.h:
  Auto merged
include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
libmysqld/CMakeLists.txt:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/rpl_row_tabledefs_2myisam.result:
  Auto merged
mysql-test/r/rpl_row_tabledefs_3innodb.result:
  Auto merged
mysql-test/r/rpl_sp.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysys/my_thr_init.c:
  Auto merged
sql/CMakeLists.txt:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log.h:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/rpl_injector.cc:
  Auto merged
sql/rpl_injector.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_locale.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.cc:
  Auto merged
unittest/mysys/my_atomic-t.c:
  Auto merged
sql/log_event.cc:
  Manual merge main->rpl
sql/mysqld.cc:
  Manual merge main->rpl

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 ---------------------------------------------------------------------------