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

into  mysql.com:/home/svoj/devel/mysql/cov/mysql-5.1-engines


sql/log_event.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

2 files changed, 2 insertions, 2 deletions

diff --git a/sql/log_event.cc b/sql/log_event.cc
index 911d9ec8d88..680f6dbc6f1 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -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));
 
diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc
index 10f32aa5827..d7e783f534f 100644
--- a/sql/repl_failsafe.cc
+++ b/sql/repl_failsafe.cc
@@ -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;
 }