Merge stella.local:/home2/mydev/mysql-5.0-axmrg
into stella.local:/home2/mydev/mysql-5.1-axmrg configure.in: Auto merged sql/log_event.cc: Auto merged sql/repl_failsafe.cc: Auto merged
This commit is contained in:
commit
eb9f258e18
@ -636,7 +636,7 @@ Log_event::Log_event(const char* buf,
|
||||
binlog, so which will cause problems if the user uses this value
|
||||
in CHANGE MASTER).
|
||||
*/
|
||||
log_pos+= data_written;
|
||||
log_pos+= data_written; /* purecov: inspected */
|
||||
}
|
||||
DBUG_PRINT("info", ("log_pos: %lu", (ulong) log_pos));
|
||||
|
||||
|
@ -201,7 +201,7 @@ int register_slave(THD* thd, uchar* packet, uint packet_length)
|
||||
|
||||
err:
|
||||
my_free(si, MYF(MY_WME));
|
||||
my_message(ER_UNKNOWN_ERROR, errmsg, MYF(0));
|
||||
my_message(ER_UNKNOWN_ERROR, errmsg, MYF(0)); /* purecov: inspected */
|
||||
err2:
|
||||
return 1;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user