Commit f88f71a2 authored by unknown's avatar unknown
Browse files

Merge suse.vabb.com:/home/Chuck/development/mysql-5.1-new-rpl 

into  suse.vabb.com:/home/Chuck/development/mysql-5.1_WL_3618


sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/table.cc:
  Auto merged
parents fd069454 85a8f7c7

config/ac-macros/ha_ndbcluster.m4

+1 −4
Original line number Diff line number Diff line
@@ -228,12 +228,9 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [ 
  have_ndb_binlog="no"

  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

  fi



  if test X"$have_ndb_binlog" = Xyes

  then

config/ac-macros/replication.m4

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
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 ---------------------------------------------------------------------------

configure.in

+0 −1
Original line number Diff line number Diff line
@@ -2154,7 +2154,6 @@ AC_MSG_RESULT("$netinet_inc") 


MYSQL_CHECK_BIG_TABLES

MYSQL_CHECK_MAX_INDEXES

MYSQL_CHECK_REPLICATION

MYSQL_CHECK_VIO

MYSQL_CHECK_SSL

include/config-win.h

+0 −1
Original line number Diff line number Diff line
@@ -436,7 +436,6 @@ inline double ulonglong2double(ulonglong value) 


#define HAVE_SPATIAL 1

#define HAVE_RTREE_KEYS 1

#define HAVE_ROW_BASED_REPLICATION 1



#define HAVE_OPENSSL 1

#define HAVE_YASSL 1

include/my_global.h

+0 −3
Original line number Diff line number Diff line
@@ -79,9 +79,6 @@ 
#endif /* _WIN32... */



#ifndef EMBEDDED_LIBRARY

#ifdef WITH_ROW_BASED_REPLICATION

#define HAVE_ROW_BASED_REPLICATION 1

#endif

#ifdef WITH_NDB_BINLOG

#define HAVE_NDB_BINLOG 1

#endif