Commit 39b6d186 authored by unknown's avatar unknown
Browse files

After merge fixes

parent 883b2229

sql/log.cc

+0 −2
Original line number Diff line number Diff line
@@ -2632,7 +2632,6 @@ 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.
@@ -2847,7 +2846,6 @@ bool MYSQL_LOG::write(Log_event *event_info) 
#ifdef HAVE_ROW_BASED_REPLICATION

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

sql/set_var.cc

+4 −5
Original line number Diff line number Diff line
@@ -1283,7 +1283,6 @@ bool sys_var_thd_binlog_format::is_readonly() const 
    my_error(ER_TEMP_TABLE_PREVENTS_SWITCH_OUT_OF_RBR, MYF(0));

    return 1;

  }

#endif /*HAVE_ROW_BASED_REPLICATION*/

  /*

    if in a stored function, it's too late to change mode

  */
@@ -1301,19 +1300,19 @@ bool sys_var_thd_binlog_format::is_readonly() const 
    my_error(ER_NDB_CANT_SWITCH_BINLOG_FORMAT, MYF(0));

    return 1;

  }

#endif

#endif /* HAVE_NDB_BINLOG */

#endif /* HAVE_ROW_BASED_REPLICATION */

  return sys_var_thd_enum::is_readonly();

#endif

}



#ifdef HAVE_ROW_BASED_REPLICATION



void fix_binlog_format_after_update(THD *thd, enum_var_type type)

{

#ifdef HAVE_ROW_BASED_REPLICATION

  thd->reset_current_stmt_binlog_row_based();

#endif /*HAVE_ROW_BASED_REPLICATION*/

}

#endif





static void fix_max_binlog_size(THD *thd, enum_var_type type)

{

sql/sql_class.h

+2 −1
Original line number Diff line number Diff line
@@ -942,11 +942,12 @@ class THD :public Statement, 
  void binlog_delete_pending_rows_event();



private:

#ifdef HAVE_ROW_BASED_REPLICATION

  uint binlog_table_maps; // Number of table maps currently in the binlog

#endif /* HAVE_ROW_BASED_REPLICATION */



public:



#endif /* HAVE_ROW_BASED_REPLICATION */

#endif /* MYSQL_CLIENT */



#ifndef MYSQL_CLIENT