diff options
| author | unknown <monty@mysql.com> | 2006-06-23 03:21:12 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2006-06-23 03:21:12 +0300 |
| commit | feb578bebd40ba4696d43ee2970c1218074450fc (patch) | |
| tree | c03804e10ed6e2e74f5f2a704bdef6b363a0be97 /sql/sql_class.h | |
| parent | 7ac7f14952e3fb35eb66a5599ba89025679a3b83 (diff) | |
| download | mariadb-git-feb578bebd40ba4696d43ee2970c1218074450fc.tar.gz | |
Fixed problem when compiling libmysqld (without replication)
This change allows us to use the stmt_binlog function in the code without ifdefs
(We should avoid having ifdefs in the .cc and .c files)
sql/handler.h:
Removed compiler warnings
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index b8491892330..5222e75f309 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1415,21 +1415,25 @@ 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() { +#ifdef HAVE_ROW_BASED_REPLICATION if (variables.binlog_format == BINLOG_FORMAT_MIXED) current_stmt_binlog_row_based= TRUE; +#endif } inline void set_current_stmt_binlog_row_based() { +#ifdef HAVE_ROW_BASED_REPLICATION current_stmt_binlog_row_based= TRUE; +#endif } inline void clear_current_stmt_binlog_row_based() { +#ifdef HAVE_ROW_BASED_REPLICATION current_stmt_binlog_row_based= FALSE; - } #endif + } inline void reset_current_stmt_binlog_row_based() { #ifdef HAVE_ROW_BASED_REPLICATION |