diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2006-05-15 20:35:17 +0200 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2006-05-15 20:35:17 +0200 |
| commit | 603740fb4ec56e7ac44ec60064bd06b321887b75 (patch) | |
| tree | 2c3932e36efa9dcdd5ae15307bb4bbe0065ea4ad /sql/set_var.cc | |
| parent | 28fcf51af1f205ace3cddb7fc8c5a615dda4e06f (diff) | |
| parent | 5a5edd8a63db12b45554de93699ff2516c3fd160 (diff) | |
| download | mariadb-git-603740fb4ec56e7ac44ec60064bd06b321887b75.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
mysql-test/t/disabled.def:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
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 57eeeed46e1..588c686e265 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -1270,12 +1270,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 */ @@ -1299,7 +1301,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) |