Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-new

into  xiphis.org:/home/antony/work2/p4-bug15976

sql/ha_archive.cc

@@ -591,8 +591,6 @@ int ha_archive::create(const char *name, TABLE *table_arg,
     goto error2;
   }
 
-  my_close(create_file, MYF(0));
-
   DBUG_RETURN(0);
 
 error3:

sql/mysqld.cc

@@ -1152,6 +1152,7 @@ void clean_up(bool print_message)
   lex_free();				/* Free some memory */
   set_var_free();
   free_charsets();
+  (void) ha_panic(HA_PANIC_CLOSE);	/* close all tables and logs */
   if (!opt_noacl)
   {
 #ifdef HAVE_DLOPEN
@@ -1159,7 +1160,6 @@ void clean_up(bool print_message)
 #endif
     plugin_free();
   }
-  (void) ha_panic(HA_PANIC_CLOSE);	/* close all tables and logs */
   if (tc_log)
     tc_log->close();
   xid_cache_free();

storage/archive/azio.c

@@ -267,7 +267,7 @@ int destroy (s)
       err = inflateEnd(&(s->stream));
     }
   }
-  if (s->file < 0 && my_close(s->file, MYF(0))) 
+  if (s->file > 0 && my_close(s->file, MYF(0))) 
   {
 #ifdef ESPIPE
     if (errno != ESPIPE) /* fclose is broken for pipes in HP/UX */