Merge bk-internal.mysql.com:/home/bk/mysql-5.0

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

sql/examples/ha_archive.cc

@@ -258,7 +258,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]));

sql/sql_table.cc

@@ -2388,12 +2388,17 @@ send_result_message:
     }
 
     default:				// Probably HA_ADMIN_INTERNAL_ERROR
+      {
+        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("Unknown - internal error during operation", 41
-		      , 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
     else if (open_for_modify)