diff options
| author | unknown <aelkin/elkin@dsl-hkibras1-ff1dc300-249.dhcp.inet.fi> | 2007-03-20 10:50:10 +0200 |
|---|---|---|
| committer | unknown <aelkin/elkin@dsl-hkibras1-ff1dc300-249.dhcp.inet.fi> | 2007-03-20 10:50:10 +0200 |
| commit | 0e0ca2a61c6c1d30dfc1589f1a139c5579f79dad (patch) | |
| tree | f0cf9fb9f73d42b8688ad9cc52db9de3402cd4db /sql/log.h | |
| parent | 8a140cb72eecc8295f847a829ac3c692f0b0ddfd (diff) | |
| download | mariadb-git-0e0ca2a61c6c1d30dfc1589f1a139c5579f79dad.tar.gz | |
Bug #26079 max_binlog_size + innodb = not make new binlog and hang server
There was hanging at binlog_commit by a thread executing autocommit query.
The hang appeared to be due to an overly condtion for early return
from binlog_commit introduced by bug#20265 fix.
Fixed with reverting the logic back to 5.0 version.
mysql-test/extra/binlog_tests/binlog.test:
added a regression test
mysql-test/r/binlog_row_binlog.result:
results changed
mysql-test/r/binlog_stm_binlog.result:
results changed
sql/log.cc:
Removing `all' conjuction arg from early return condition.
There is nothing to execute by transaction if trx_data is empty.
The work for rotate_and_purge is delayed till TC_LOG::unlog
(same as in 5.0 code)
sql/log.h:
singed because there are assert on positiveness
Diffstat (limited to 'sql/log.h')
| -rw-r--r-- | sql/log.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/log.h b/sql/log.h index 970823dcd4a..ed0c3557d08 100644 --- a/sql/log.h +++ b/sql/log.h @@ -238,7 +238,7 @@ class MYSQL_BIN_LOG: public TC_LOG, private MYSQL_LOG fix_max_relay_log_size). */ ulong max_size; - ulong prepared_xids; /* for tc log - number of xids to remember */ + long prepared_xids; /* for tc log - number of xids to remember */ // current file sequence number for load data infile binary logging uint file_id; uint open_count; // For replication |