diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-05-12 18:50:59 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-05-12 18:50:59 -0400 |
| commit | 6ae27e40985ef8c647ac2271c091f67511fb421f (patch) | |
| tree | 08d1736de665cccf3fbd772e49ee45d307d5e1fd /sql/sql_class.cc | |
| parent | c6c9a69ccee3325cfdd77d0dcd49259a574363b0 (diff) | |
| parent | 014fe12c03a2fdcbd2eb6bab39118de1cee02693 (diff) | |
| download | mariadb-git-6ae27e40985ef8c647ac2271c091f67511fb421f.tar.gz | |
Merge branch '5.5-galera' into 10.0-galera
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index ade63d0b436..bdd187279db 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -6605,16 +6605,6 @@ int THD::binlog_query(THD::enum_binlog_query_type qtype, char const *query_arg, The MYSQL_LOG::write() function will set the STMT_END_F flag and flush the pending rows event if necessary. */ -#ifdef WITH_WSREP - /* - Even though wsrep only supports ROW binary log format, a user can set - binlog format to STATEMENT (wsrep_forced_binlog_format). In which case - the control might reach here even when binary logging (--log-bin) is - not enabled. This is possible because wsrep patch partially enables - binary logging by setting wsrep_emulate_binlog. - */ - if (mysql_bin_log.is_open()) -#endif /* WITH_WSREP */ { Query_log_event qinfo(this, query_arg, query_len, is_trans, direct, suppress_use, errcode); |