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/set_var.cc | |
| 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/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 16a0c752639..8ff6b5b98c8 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -1260,12 +1260,14 @@ bool sys_var_thd_binlog_format::is_readonly() const And this test will also prevent switching from RBR to RBR (a no-op which should not happen too often). */ +#ifdef HAVE_ROW_BASED_REPLICATION if ((thd->variables.binlog_format == BINLOG_FORMAT_ROW) && thd->temporary_tables) { 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 */ @@ -1289,7 +1291,9 @@ bool sys_var_thd_binlog_format::is_readonly() const 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*/ } static void fix_max_binlog_size(THD *thd, enum_var_type type) |