From e286515667d3cd3028092ef5c1277dff75d2ee21 Mon Sep 17 00:00:00 2001
From: "jimw@mysql.com" <>
Date: Thu, 31 Mar 2005 11:43:39 -0800
Subject: [PATCH 1/2] Fix segmentation fault in mysqlcheck when the last table
 checked with --auto-repair mode returned an error (such as being a merge
 table). (Bug #9492)

---
 client/mysqlcheck.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/mysqlcheck.c b/client/mysqlcheck.c
index 8764611adf4..b5a80782948 100644
--- a/client/mysqlcheck.c
+++ b/client/mysqlcheck.c
@@ -537,6 +537,7 @@ static void print_result()
   my_bool found_error=0;
 
   res = mysql_use_result(sock);
+
   prev[0] = '\0';
   for (i = 0; (row = mysql_fetch_row(res)); i++)
   {
@@ -565,7 +566,7 @@ static void print_result()
     putchar('\n');
   }
   if (found_error && opt_auto_repair && what_to_do != DO_REPAIR &&
-      (!opt_fast || strcmp(row[3],"OK")))
+      !opt_fast)
     insert_dynamic(&tables4repair, prev);
   mysql_free_result(res);
 }

From 6ed11e3bb3fe3f720433965b4ebf02eddaf18258 Mon Sep 17 00:00:00 2001
From: "jani@ua141d10.elisa.omakaista.fi" <>
Date: Tue, 5 Apr 2005 13:15:04 +0300
Subject: [PATCH 2/2] A fix for Netware.

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

diff --git a/mysys/my_rename.c b/mysys/my_rename.c
index d4f99e83247..b5d813ad787 100644
--- a/mysys/my_rename.c
+++ b/mysys/my_rename.c
@@ -45,7 +45,7 @@ int my_rename(const char *from, const char *to, myf MyFlags)
   }
 #endif
 #if defined(HAVE_RENAME)
-#ifdef __WIN__
+#if defined(__WIN__) || defined(__NETWARE__)
   /*
     On windows we can't rename over an existing file:
     Remove any conflicting files: