Commit 26b6dc42 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl 

into  mysql.com:/home/bk/MERGE/mysql-5.1-merge


client/mysqlbinlog.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
config/ac-macros/ha_ndbcluster.m4:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/rpl_timezone.result:
  Auto merged
mysql-test/t/disabled.def:
  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/mysqld.cc:
  Auto merged
sql/rpl_injector.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp_head.cc:
  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_parse.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/t/mysqldump.test:
  Manual merge
sql/log_event.cc:
  manual merge
parents e54bbaa3 b8ff601e

client/mysqlbinlog.cc

+27 −11
Original line number Diff line number Diff line
@@ -95,8 +95,10 @@ static bool stop_passed= 0; 
*/

Format_description_log_event* description_event; 



static int dump_local_log_entries(const char* logname);

static int dump_remote_log_entries(const char* logname);

static int dump_local_log_entries(PRINT_EVENT_INFO *print_event_info,

                                  const char* logname);

static int dump_remote_log_entries(PRINT_EVENT_INFO *print_event_info,

                                   const char* logname);

static int dump_log_entries(const char* logname);

static int dump_remote_file(NET* net, const char* fname);

static void die(const char* fmt, ...);
@@ -1002,8 +1004,22 @@ static MYSQL* safe_connect() 


static int dump_log_entries(const char* logname)

{

  return (remote_opt ? dump_remote_log_entries(logname) :

          dump_local_log_entries(logname));

  int rc;

  PRINT_EVENT_INFO print_event_info;

  /*

     Set safe delimiter, to dump things

     like CREATE PROCEDURE safely

  */

  fprintf(result_file, "DELIMITER /*!*/;\n");

  strcpy(print_event_info.delimiter, "/*!*/;");



  rc= (remote_opt ? dump_remote_log_entries(&print_event_info, logname) :

       dump_local_log_entries(&print_event_info, logname));



  /* Set delimiter back to semicolon */

  fprintf(result_file, "DELIMITER ;\n");

  strcpy(print_event_info.delimiter, ";");

  return rc;

}
@@ -1068,11 +1084,11 @@ static int check_master_version(MYSQL* mysql, 
}





static int dump_remote_log_entries(const char* logname)

static int dump_remote_log_entries(PRINT_EVENT_INFO *print_event_info,

                                   const char* logname)



{

  char buf[128];

  PRINT_EVENT_INFO print_event_info;

  ulong len;

  uint logname_len;

  NET* net;
@@ -1195,7 +1211,7 @@ could be out of memory"); 
          len= 1; // fake Rotate, so don't increment old_off

        }

      }

      if ((error= process_event(&print_event_info, ev, old_off)))

      if ((error= process_event(print_event_info, ev, old_off)))

      {

	error= ((error < 0) ? 0 : 1);

        goto err;
@@ -1214,7 +1230,7 @@ could be out of memory"); 
        goto err;

      }

      

      if ((error= process_event(&print_event_info, ev, old_off)))

      if ((error= process_event(print_event_info, ev, old_off)))

      {

 	my_close(file,MYF(MY_WME));

	error= ((error < 0) ? 0 : 1);
@@ -1340,11 +1356,11 @@ at offset %lu ; this could be a log format error or read error", 
}





static int dump_local_log_entries(const char* logname)

static int dump_local_log_entries(PRINT_EVENT_INFO *print_event_info,

                                  const char* logname)

{

  File fd = -1;

  IO_CACHE cache,*file= &cache;

  PRINT_EVENT_INFO print_event_info;

  byte tmp_buff[BIN_LOG_HEADER_SIZE];

  int error= 0;
@@ -1431,7 +1447,7 @@ static int dump_local_log_entries(const char* logname) 
      // file->error == 0 means EOF, that's OK, we break in this case

      break;

    }

    if ((error= process_event(&print_event_info, ev, old_off)))

    if ((error= process_event(print_event_info, ev, old_off)))

    {

      if (error < 0)

        error= 0;

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 −2
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ sinclude(config/ac-macros/ha_ndbcluster.m4) 
sinclude(config/ac-macros/large_file.m4)

sinclude(config/ac-macros/misc.m4)

sinclude(config/ac-macros/readline.m4)

sinclude(config/ac-macros/replication.m4)

sinclude(config/ac-macros/ssl.m4)

sinclude(config/ac-macros/zlib.m4)
@@ -2156,7 +2155,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