Commit 7e85affd authored by guilhem@mysql.com's avatar guilhem@mysql.com

MySQL-classic did not pass the test suite rpl_rotate_logs.test anymore...

   MySQL-classic did not pass the test suite rpl_rotate_logs.test anymore because a recent 1.1424.2.17 cset introduced an opt_using_transactions
    which prevented binlogs to be rotated if transactions were not enabled. Fix for this. This bug did not affect releases.
parent 611836e4
...@@ -1133,8 +1133,9 @@ bool MYSQL_LOG::write(Log_event* event_info) ...@@ -1133,8 +1133,9 @@ bool MYSQL_LOG::write(Log_event* event_info)
was a MyISAM event! was a MyISAM event!
*/ */
if (file == &log_file && opt_using_transactions if (file == &log_file) // we are writing to the real log (disk)
&& !my_b_tell(&thd->transaction.trans_log)) {
if (opt_using_transactions && !my_b_tell(&thd->transaction.trans_log))
{ {
/* /*
LOAD DATA INFILE in AUTOCOMMIT=1 mode writes to the binlog LOAD DATA INFILE in AUTOCOMMIT=1 mode writes to the binlog
...@@ -1150,7 +1151,8 @@ bool MYSQL_LOG::write(Log_event* event_info) ...@@ -1150,7 +1151,8 @@ bool MYSQL_LOG::write(Log_event* event_info)
file->pos_in_file); file->pos_in_file);
called_handler_commit=1; called_handler_commit=1;
} }
}
/* we wrote to the real log, check automatic rotation */
should_rotate= (my_b_tell(file) >= (my_off_t) max_binlog_size); should_rotate= (my_b_tell(file) >= (my_off_t) max_binlog_size);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment