mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +03:00
merging 5.1 main -> 5.1-rep+2 -> 5.1-rep+3; binlog_unsafe , rpl_mysql_upgrade fail and are under treatment
This commit is contained in:
@ -776,7 +776,7 @@ impossible position";
|
||||
*/
|
||||
{
|
||||
log.error=0;
|
||||
bool read_packet = 0, fatal_error = 0;
|
||||
bool read_packet = 0;
|
||||
|
||||
#ifndef DBUG_OFF
|
||||
if (max_binlog_dump_events && !left_events--)
|
||||
@ -803,7 +803,7 @@ impossible position";
|
||||
*/
|
||||
|
||||
pthread_mutex_lock(log_lock);
|
||||
switch (Log_event::read_log_event(&log, packet, (pthread_mutex_t*)0)) {
|
||||
switch (error= Log_event::read_log_event(&log, packet, (pthread_mutex_t*) 0)) {
|
||||
case 0:
|
||||
/* we read successfully, so we'll need to send it to the slave */
|
||||
pthread_mutex_unlock(log_lock);
|
||||
@ -872,8 +872,8 @@ impossible position";
|
||||
|
||||
default:
|
||||
pthread_mutex_unlock(log_lock);
|
||||
fatal_error = 1;
|
||||
break;
|
||||
test_for_non_eof_log_read_errors(error, &errmsg);
|
||||
goto err;
|
||||
}
|
||||
|
||||
if (read_packet)
|
||||
@ -913,12 +913,6 @@ impossible position";
|
||||
}
|
||||
}
|
||||
|
||||
if (fatal_error)
|
||||
{
|
||||
errmsg = "error reading log entry";
|
||||
my_errno= ER_MASTER_FATAL_ERROR_READING_BINLOG;
|
||||
goto err;
|
||||
}
|
||||
log.error=0;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user