From 3f16931527ef007117095d00bc9bb3ce56df5d63 Mon Sep 17 00:00:00 2001
From: "thek@kpdesk.mysql.com" <>
Date: Thu, 2 Nov 2006 13:33:26 +0100
Subject: [PATCH 1/4] Bug#22828 complementary patch: - 'false' not defined in
 C, use FALSE instead.

---
 mysys/my_lock.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mysys/my_lock.c b/mysys/my_lock.c
index c9641f46f5c..b8307f366c0 100644
--- a/mysys/my_lock.c
+++ b/mysys/my_lock.c
@@ -111,7 +111,7 @@ int my_lock(File fd, int locktype, my_off_t start, my_off_t length,
 #elif defined(HAVE_LOCKING)
   /* Windows */
   {
-    my_bool error= false;
+    my_bool error= FALSE;
     pthread_mutex_lock(&my_file_info[fd].mutex);
     if (MyFlags & MY_SEEK_NOT_DONE) 
     {

From 27f3bb10654927e50f362eea0364aa77559f63ae Mon Sep 17 00:00:00 2001
From: "kent/mysqldev@mysql.com/production.mysql.com" <>
Date: Thu, 2 Nov 2006 21:58:42 +0100
Subject: [PATCH 2/4] configure.in:   Raise version number to 4.1.23

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

diff --git a/configure.in b/configure.in
index 6cccb1bb90e..eb1d601cf95 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.22)
+AM_INIT_AUTOMAKE(mysql, 4.1.23)
 AM_CONFIG_HEADER(config.h)
 
 PROTOCOL_VERSION=10
@@ -17,7 +17,7 @@ SHARED_LIB_VERSION=$SHARED_LIB_MAJOR_VERSION:0:0
 # ndb version
 NDB_VERSION_MAJOR=4
 NDB_VERSION_MINOR=1
-NDB_VERSION_BUILD=22
+NDB_VERSION_BUILD=23
 NDB_VERSION_STATUS=""
 
 # Set all version vars based on $VERSION. How do we do this more elegant ?

From e235c8c421ebabc39009c08a637a0c3f3b3486c4 Mon Sep 17 00:00:00 2001
From: "cmiller@zippy.cornsilk.net" <>
Date: Thu, 2 Nov 2006 18:27:52 -0500
Subject: [PATCH 3/4] Fix merge collision.

---
 mysys/mf_iocache.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mysys/mf_iocache.c b/mysys/mf_iocache.c
index 109d9fabda3..b17df3da260 100644
--- a/mysys/mf_iocache.c
+++ b/mysys/mf_iocache.c
@@ -963,13 +963,13 @@ int _my_b_read_r(register IO_CACHE *cache, byte *Buffer, uint Count)
           "seek_not_done" to indicate this to other functions operating
           on the IO_CACHE.
         */
-        if (info->seek_not_done)
+        if (cache->seek_not_done)
         {
-          if (my_seek(info->file,pos_in_file,MY_SEEK_SET,MYF(0))
+          if (my_seek(cache->file,pos_in_file,MY_SEEK_SET,MYF(0))
               == MY_FILEPOS_ERROR)
           {
-            info->error= -1;
-            unlock_io_cache(info);
+            cache->error= -1;
+            unlock_io_cache(cache);
             DBUG_RETURN(1);
           }
         }

From 570f603988f932597e3258a42e4b5cc2b208abd1 Mon Sep 17 00:00:00 2001
From: "msvensson@neptunus.(none)" <>
Date: Fri, 3 Nov 2006 15:26:42 +0100
Subject: [PATCH 4/4] Don't warn about "Found non pid file" for elements that
 are not files.

---
 mysql-test/lib/mtr_process.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mysql-test/lib/mtr_process.pl b/mysql-test/lib/mtr_process.pl
index 048c336f8a3..9d0c1f601ba 100644
--- a/mysql-test/lib/mtr_process.pl
+++ b/mysql-test/lib/mtr_process.pl
@@ -441,7 +441,6 @@ sub mtr_kill_leftovers () {
       # Only read pid from files that end with .pid
       if ( $elem =~ /.*[.]pid$/)
       {
-
 	my $pidfile= "$rundir/$elem";
 
 	if ( -f $pidfile )
@@ -465,7 +464,8 @@ sub mtr_kill_leftovers () {
       }
       else
       {
-	mtr_warning("Found non pid file $elem in $rundir");
+	mtr_warning("Found non pid file $elem in $rundir")
+	  if -f "$rundir/$elem";
 	next;
       }
     }