mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
fixed mutex bug ( or lack of it) when reading log entries on COM_BINLOG_DUMP
added error_code to query event, and checking to see if we get the expected error on the slave removed obsolete code from slave.cc sql/log_event.cc: added mutex as an argument to FILE read_log_event functions sql/log_event.h: added error_code for the query event sql/mysqlbinlog.cc: fix for new form of read_log_event sql/slave.cc: removed obsolte code with fetch nx table added check to see if the query runs with the same error on the slave as it did on the master sql/sql_repl.cc: fixed mutex problem around read_log_event
This commit is contained in:
@ -284,7 +284,9 @@ static void dump_remote_log_entries(const char* logname)
|
||||
break; // end of data
|
||||
DBUG_PRINT("info",( "len= %u, net->read_pos[5] = %d\n",
|
||||
len, net->read_pos[5]));
|
||||
Log_event * ev = Log_event::read_log_event((const char*) net->read_pos + 1 , len);
|
||||
Log_event * ev = Log_event::read_log_event(
|
||||
(const char*) net->read_pos + 1 ,
|
||||
len);
|
||||
if(ev)
|
||||
{
|
||||
ev->print(stdout, short_form);
|
||||
@ -315,7 +317,7 @@ static void dump_local_log_entries(const char* logname)
|
||||
|
||||
while(1)
|
||||
{
|
||||
Log_event* ev = Log_event::read_log_event(file);
|
||||
Log_event* ev = Log_event::read_log_event(file, 0);
|
||||
if(!ev)
|
||||
if(!feof(file))
|
||||
die("Could not read entry at offset %ld : Error in log format or \
|
||||
|
Reference in New Issue
Block a user