From 9af0f156a5ceb6ad7b7ae9e43282f06973bcf238 Mon Sep 17 00:00:00 2001
From: "msvensson@neptunus.(none)" <>
Date: Wed, 24 Aug 2005 10:41:44 +0200
Subject: [PATCH 1/2] Improve default error message for optimize/repair table

---
 sql/sql_table.cc | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 8874a70327e..35734bcc31b 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -2388,11 +2388,16 @@ send_result_message:
     }
 
     default:				// Probably HA_ADMIN_INTERNAL_ERROR
-      protocol->store("error", 5, system_charset_info);
-      protocol->store("Unknown - internal error during operation", 41
-		      , system_charset_info);
-      fatal_error=1;
-      break;
+      {
+        char buf[ERRMSGSIZE+20];
+        uint length=my_snprintf(buf, ERRMSGSIZE,
+                                "Unknown - internal error %d during operation",
+                                result_code);
+        protocol->store("error", 5, system_charset_info);
+        protocol->store(buf, length, system_charset_info);
+        fatal_error=1;
+        break;
+      }
     }
     if (fatal_error)
       table->table->s->version=0;               // Force close of table

From 5de225926388c11f21ebcb92db9b7433b9931175 Mon Sep 17 00:00:00 2001
From: "msvensson@neptunus.(none)" <>
Date: Mon, 29 Aug 2005 14:04:15 +0200
Subject: [PATCH 2/2] Bug #12527  	yassl causes errors in "repair" and
 "optimize"  - Use constant directly to check that enough number of bytes have
 been written as header of the archive.

---
 sql/examples/ha_archive.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/examples/ha_archive.cc b/sql/examples/ha_archive.cc
index 10712c2e3be..d4e3b961223 100644
--- a/sql/examples/ha_archive.cc
+++ b/sql/examples/ha_archive.cc
@@ -225,7 +225,7 @@ int ha_archive::write_data_header(gzFile file_to_write)
   data_buffer[1]= (uchar)ARCHIVE_VERSION;
 
   if (gzwrite(file_to_write, &data_buffer, DATA_BUFFER_SIZE) != 
-      sizeof(DATA_BUFFER_SIZE))
+      DATA_BUFFER_SIZE)
     goto error;
   DBUG_PRINT("ha_archive::write_data_header", ("Check %u", (uint)data_buffer[0]));
   DBUG_PRINT("ha_archive::write_data_header", ("Version %u", (uint)data_buffer[1]));