diff options
author | holyfoot@mysql.com <> | 2006-04-27 15:07:36 +0500 |
---|---|---|
committer | holyfoot@mysql.com <> | 2006-04-27 15:07:36 +0500 |
commit | 06b57c4871dd2a8bc07d70ae72735c7ffb1c9405 (patch) | |
tree | f7ccd3b75989849bfd9dcff7f3c249dc33055fa3 /sql/sql_class.h | |
parent | 27739485a9a423e05c1146eb99f6ed4c952921b6 (diff) | |
parent | 46e79f6708a28c8a0ac28c67ce58d736a9641ca6 (diff) | |
download | mariadb-git-06b57c4871dd2a8bc07d70ae72735c7ffb1c9405.tar.gz |
Merge bk@192.168.21.1:mysql-5.1-new
into mysql.com:/home/hf/work/mysql-5.1.18518
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*/ }; |