1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

After merge fixes

Browse Source
This commit is contained in:
unknown 2006-05-17 15:57:45 +02:00
parent 883b2229a5
commit 39b6d186e8
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/log.cc
View File

@ -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 These functions are placed in this file since they need access to
binlog_hton, which has internal linkage. binlog_hton, which has internal linkage.
@ -2847,7 +2846,6 @@ bool MYSQL_LOG::write(Log_event *event_info)
#ifdef HAVE_ROW_BASED_REPLICATION #ifdef HAVE_ROW_BASED_REPLICATION
bool const end_stmt= bool const end_stmt=
thd->prelocked_mode && thd->lex->requires_prelocking(); thd->prelocked_mode && thd->lex->requires_prelocking();
#ifdef HAVE_ROW_BASED_REPLICATION
thd->binlog_flush_pending_rows_event(end_stmt); thd->binlog_flush_pending_rows_event(end_stmt);
#endif /*HAVE_ROW_BASED_REPLICATION*/ #endif /*HAVE_ROW_BASED_REPLICATION*/

9
sql/set_var.cc
View File

@ -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)); my_error(ER_TEMP_TABLE_PREVENTS_SWITCH_OUT_OF_RBR, MYF(0));
return 1; return 1;
} }
#endif /*HAVE_ROW_BASED_REPLICATION*/
/* /*
if in a stored function, it's too late to change mode 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)); my_error(ER_NDB_CANT_SWITCH_BINLOG_FORMAT, MYF(0));
return 1; return 1;
} }
#endif #endif /* HAVE_NDB_BINLOG */
#endif /* HAVE_ROW_BASED_REPLICATION */
return sys_var_thd_enum::is_readonly(); 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) void fix_binlog_format_after_update(THD *thd, enum_var_type type)
{ {
#ifdef HAVE_ROW_BASED_REPLICATION #ifdef HAVE_ROW_BASED_REPLICATION
thd->reset_current_stmt_binlog_row_based(); thd->reset_current_stmt_binlog_row_based();
#endif /*HAVE_ROW_BASED_REPLICATION*/ #endif /*HAVE_ROW_BASED_REPLICATION*/
} }
#endif
static void fix_max_binlog_size(THD *thd, enum_var_type type) static void fix_max_binlog_size(THD *thd, enum_var_type type)
{ {

3
sql/sql_class.h
View File

@ -942,11 +942,12 @@ public:
void binlog_delete_pending_rows_event(); void binlog_delete_pending_rows_event();
private: private:
#ifdef HAVE_ROW_BASED_REPLICATION
uint binlog_table_maps; // Number of table maps currently in the binlog uint binlog_table_maps; // Number of table maps currently in the binlog
#endif /* HAVE_ROW_BASED_REPLICATION */
public: public:
#endif /* HAVE_ROW_BASED_REPLICATION */
#endif /* MYSQL_CLIENT */ #endif /* MYSQL_CLIENT */
#ifndef MYSQL_CLIENT #ifndef MYSQL_CLIENT