diff options
| author | unknown <aelkin/elkin@dsl-hkibras1-ff1dc300-249.dhcp.inet.fi> | 2007-03-21 13:14:12 +0200 |
|---|---|---|
| committer | unknown <aelkin/elkin@dsl-hkibras1-ff1dc300-249.dhcp.inet.fi> | 2007-03-21 13:14:12 +0200 |
| commit | 6fb9ef87e37c320833b8e89f1439deac7fe77953 (patch) | |
| tree | da3cb8c9151241064e18799651b84537014b2fce /sql/log.cc | |
| parent | 98ba309d6254f3fb9eb950d804257724eb52ee1e (diff) | |
| parent | 0e0ca2a61c6c1d30dfc1589f1a139c5579f79dad (diff) | |
| download | mariadb-git-6fb9ef87e37c320833b8e89f1439deac7fe77953.tar.gz | |
Merge dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bug26079_binlog_max_innodb
into dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/MAIN/mysql-5.1-new-maint
sql/log.cc:
Auto merged
Diffstat (limited to 'sql/log.cc')
| -rw-r--r-- | sql/log.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/log.cc b/sql/log.cc index 1994660bf5b..0c8fe0a9aed 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -1548,7 +1548,7 @@ static int binlog_commit(handlerton *hton, THD *thd, bool all) (binlog_trx_data*) thd->ha_data[binlog_hton->slot]; DBUG_ASSERT(mysql_bin_log.is_open()); - if (all && trx_data->empty()) + if (trx_data->empty()) { // we're here because trans_log was flushed in MYSQL_BIN_LOG::log_xid() trx_data->reset(); |