diff options
| author | unknown <lars@mysql.com> | 2006-05-17 15:57:45 +0200 |
|---|---|---|
| committer | unknown <lars@mysql.com> | 2006-05-17 15:57:45 +0200 |
| commit | 39b6d186e8933a1e6e5544194e66138f78e14b11 (patch) | |
| tree | bc3503cd201f62ba9bb3a91d37ba42195ef4e52a /sql | |
| parent | 883b2229a52ab3321322f517fb27c371c5f72f3b (diff) | |
| download | mariadb-git-39b6d186e8933a1e6e5544194e66138f78e14b11.tar.gz | |
After merge fixes
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/log.cc | 2 | ||||
| -rw-r--r-- | sql/set_var.cc | 9 | ||||
| -rw-r--r-- | sql/sql_class.h | 3 |
3 files changed, 6 insertions, 8 deletions
diff --git a/sql/log.cc b/sql/log.cc index 5546f47004d..aabed8fa246 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -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*/ diff --git a/sql/set_var.cc b/sql/set_var.cc index 26fb42166b1..971c32eb77a 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -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) { diff --git a/sql/sql_class.h b/sql/sql_class.h index d9118cc7607..0135763b3b2 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -942,11 +942,12 @@ public: 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 |