← Back to branch summary

~vadim-tk/percona-server/percona-galera-bzr

« back to all changes in this revision

Viewing changes to sql/sql_update.cc

  • Committer: root
  • Date: 2011-09-22 04:10:56 UTC
  • mfrom: (3374.23.48 wsrep-5.5)
  • Revision ID: root@r815.office.percona.com-20110922041056-qfpf7n6dui209jtu
Merge from upstream codership-mysql

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/sql_update.cc
872
872
  if ((error < 0) || thd->transaction.stmt.modified_non_trans_table)
873
873
  {
874
874
#ifdef WITH_WSREP
875
 
    if (wsrep_emulate_bin_log || mysql_bin_log.is_open())
 
875
    if (WSREP_EMULATE_BINLOG(thd) || mysql_bin_log.is_open())
876
876
#else
877
877
    if (mysql_bin_log.is_open())
878
878
#endif
1995
1995
      either from the query's list or via a stored routine: bug#13270,23333
1996
1996
    */
1997
1997
#ifdef WITH_WSREP
1998
 
    if (wsrep_emulate_bin_log || mysql_bin_log.is_open())
 
1998
    if (WSREP_EMULATE_BINLOG(thd) || mysql_bin_log.is_open())
1999
1999
#else
2000
2000
    if (mysql_bin_log.is_open())
2001
2001
#endif
2230
2230
  if (local_error == 0 || thd->transaction.stmt.modified_non_trans_table)
2231
2231
  {
2232
2232
#ifdef WITH_WSREP
2233
 
    if (wsrep_emulate_bin_log || mysql_bin_log.is_open())
 
2233
    if (WSREP_EMULATE_BINLOG(thd) || mysql_bin_log.is_open())
2234
2234
#else
2235
2235
    if (mysql_bin_log.is_open())
2236
2236
#endif