Commit 65992efc authored by svoj@april.(none)'s avatar svoj@april.(none)
Browse files

Merge mysql.com:/home/svoj/devel/mysql/cov/mysql-5.0-engines 

into  mysql.com:/home/svoj/devel/mysql/cov/mysql-5.1-engines
parents 7586a4c6 70ca2ae2

sql/log_event.cc

+1 −1
Original line number Diff line number Diff line
@@ -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));

sql/repl_failsafe.cc

+1 −1
Original line number Diff line number Diff line
@@ -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;

}