Commit 9cdaf9c7 authored by unknown's avatar unknown
Browse files

Merge bk@192.168.21.1:mysql-5.1-kt 

into mysql.com:/home/hf/work/mysql-5.1.mrg


mysql-test/mysql-test-run.pl:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
parents ac9124ed ac0f62c8

config/ac-macros/ha_ndbcluster.m4

+1 −1
Original line number Diff line number Diff line
@@ -237,7 +237,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

config/ac-macros/replication.m4

+1 −1
Original line number Diff line number Diff line
@@ -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]

    ;;

include/my_global.h

+9 −0
Original line number Diff line number Diff line
@@ -78,6 +78,15 @@ 
#endif

#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

#endif /* !EMBEDDED_LIBRARY */



/* Some defines to avoid ifdefs in the code */

#ifndef NETWARE_YIELD

#define NETWARE_YIELD

sql/log.cc

+10 −0
Original line number Diff line number Diff line
@@ -1090,12 +1090,16 @@ binlog_end_trans(THD *thd, binlog_trx_data *trx_data, Log_event *end_ev) 
      were, we would have to ensure that we're not ending a statement

      inside a stored function.

     */

#ifdef HAVE_ROW_BASED_REPLICATION

    thd->binlog_flush_pending_rows_event(TRUE);

#endif

    error= mysql_bin_log.write(thd, trans_log, end_ev);

  }

  else

  {

#ifdef HAVE_ROW_BASED_REPLICATION

    thd->binlog_delete_pending_rows_event();

#endif

  }



  /*
@@ -2620,6 +2624,7 @@ bool MYSQL_LOG::is_query_in_union(THD *thd, query_id_t query_id_param) 
}





#ifdef HAVE_ROW_BASED_REPLICATION

/*

  These functions are placed in this file since they need access to

  binlog_hton, which has internal linkage.
@@ -2797,6 +2802,7 @@ int MYSQL_LOG::flush_and_set_pending_rows_event(THD *thd, Rows_log_event* event) 


  DBUG_RETURN(error);

}

#endif /*HAVE_ROW_BASED_REPLICATION*/



/*

  Write an event to the binary log
@@ -2831,7 +2837,9 @@ bool MYSQL_LOG::write(Log_event *event_info) 
  */

  bool const end_stmt=

    thd->prelocked_mode && thd->lex->requires_prelocking();

#ifdef HAVE_ROW_BASED_REPLICATION

  thd->binlog_flush_pending_rows_event(end_stmt);

#endif /*HAVE_ROW_BASED_REPLICATION*/



  pthread_mutex_lock(&LOCK_log);
@@ -2873,8 +2881,10 @@ bool MYSQL_LOG::write(Log_event *event_info) 
    */

    if (opt_using_transactions && thd)

    {

#ifdef HAVE_ROW_BASED_REPLICATION

      if (thd->binlog_setup_trx_data())

        goto err;

#endif /*HAVE_ROW_BASED_REPLICATION*/



      binlog_trx_data *const trx_data=

        (binlog_trx_data*) thd->ha_data[binlog_hton.slot];

sql/mysqld.cc

+1 −1
Original line number Diff line number Diff line
@@ -3092,7 +3092,7 @@ with --log-bin instead."); 
  }

  if (global_system_variables.binlog_format == BINLOG_FORMAT_UNSPEC)

  {

#ifdef HAVE_NDB_BINLOG

#if defined(HAVE_NDB_BINLOG) && defined(HAVE_ROW_BASED_REPLICATION)

    if (opt_bin_log && have_ndbcluster == SHOW_OPTION_YES)

      global_system_variables.binlog_format= BINLOG_FORMAT_ROW;

    else