From 3cf4d70ed36bead6450490bc06f9c8a09868b93f Mon Sep 17 00:00:00 2001
From: unknown <kent/mysqldev@mysql.com/production.mysql.com>
Date: Tue, 18 Mar 2008 00:57:57 +0100
Subject: [PATCH 1/2] Raise version number after cloning 4.1.24

---
 configure.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.in b/configure.in
index 01b5734a3b0..66825e5282b 100644
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ AC_INIT(sql/mysqld.cc)
 AC_CANONICAL_SYSTEM
 # The Docs Makefile.am parses this line!
 # remember to also change ndb version below and update version.c in ndb
-AM_INIT_AUTOMAKE(mysql, 4.1.24)
+AM_INIT_AUTOMAKE(mysql, 4.1.25)
 AM_CONFIG_HEADER(config.h)
 
 PROTOCOL_VERSION=10
@@ -21,7 +21,7 @@ NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_MAJOR_VERSION:0:0
 # ndb version
 NDB_VERSION_MAJOR=4
 NDB_VERSION_MINOR=1
-NDB_VERSION_BUILD=24
+NDB_VERSION_BUILD=25
 NDB_VERSION_STATUS=""
 
 # Set all version vars based on $VERSION. How do we do this more elegant ?

From 7343db297a1f1ab08812c9b4471306535551ddec Mon Sep 17 00:00:00 2001
From: unknown <svoj@mysql.com/april.(none)>
Date: Tue, 18 Mar 2008 16:38:12 +0400
Subject: [PATCH 2/2] Make gcov happy.

---
 sql/log_event.cc     | 2 +-
 sql/repl_failsafe.cc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sql/log_event.cc b/sql/log_event.cc
index 8e14a873fc6..05dccd782ad 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -406,7 +406,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 f1826678c9f..7f98dd2d64a 100644
--- a/sql/repl_failsafe.cc
+++ b/sql/repl_failsafe.cc
@@ -191,7 +191,7 @@ int register_slave(THD* thd, uchar* packet, uint packet_length)
 
 err:
   my_free((gptr) 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;
 }