diff options
| author | unknown <holyfoot@mysql.com> | 2006-04-27 15:07:36 +0500 |
|---|---|---|
| committer | unknown <holyfoot@mysql.com> | 2006-04-27 15:07:36 +0500 |
| commit | eae76a32b2e8798610b4719a5f67956625291257 (patch) | |
| tree | f7ccd3b75989849bfd9dcff7f3c249dc33055fa3 /sql/sql_class.h | |
| parent | 3ada0dd96f3c5d32a4f5a39cefb75bfd321029cd (diff) | |
| parent | ca3277a87cf158d6e51b62cb8e0fb222e6cf883e (diff) | |
| download | mariadb-git-eae76a32b2e8798610b4719a5f67956625291257.tar.gz | |
Merge bk@192.168.21.1:mysql-5.1-new
into mysql.com:/home/hf/work/mysql-5.1.18518
include/my_global.h:
Auto merged
sql/log.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index fdb70b6c991..7d30800aeb4 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1381,6 +1381,7 @@ public: void restore_sub_statement_state(Sub_statement_state *backup); void set_n_backup_active_arena(Query_arena *set, Query_arena *backup); void restore_active_arena(Query_arena *set, Query_arena *backup); +#ifdef HAVE_ROW_BASED_REPLICATION inline void set_current_stmt_binlog_row_based_if_mixed() { if (variables.binlog_format == BINLOG_FORMAT_MIXED) @@ -1394,6 +1395,7 @@ public: { current_stmt_binlog_row_based= test(variables.binlog_format == BINLOG_FORMAT_ROW); } +#endif /*HAVE_ROW_BASED_REPLICATION*/ }; |