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

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

Merge mysql.com:/home/svoj/devel/mysql/cov/mysql-5.0-engines
into mysql.com:/home/svoj/devel/mysql/cov/mysql-5.1-engines
65992efc · svoj@april.(none) · 7586a4c6 · 70ca2ae2 · 65992efc · 65992efc
Commit 65992efc authored Mar 18, 2008 by svoj@april.(none)
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

sql/log_event.cc sql/log_event.cc +1 -1

sql/repl_failsafe.cc sql/repl_failsafe.cc +1 -1

No files found.
--- 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));

--- 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;
 }