bzr push into mysql-trunk branch (mattias.jonsson:3914 to 3915) WL#4305

[Mattias Jonsson]

 3915 Mattias Jonsson	2012-02-16
      WL#4305 merge fix of ha_archive::optimize(), removed duplicate mutex unlocked.

    modified:
      storage/archive/ha_archive.cc
 3914 Mattias Jonsson	2012-02-16 [merge]
      WL#4305: storage-engine private data area per physical table
      
      Approved patch merged with updated -trunk.

    removed:
      mysql-test/suite/parts/t/partition_debug-master.opt
      mysql-test/suite/parts/t/partition_debug_myisam-master.opt
    modified:
      mysql-test/suite/parts/r/partition_debug_innodb.result
      mysql-test/suite/parts/r/partition_debug_myisam.result
      mysql-test/suite/parts/t/partition_debug_innodb-master.opt
      mysql-test/suite/perfschema/r/dml_setup_instruments.result
      sql/ha_partition.cc
      sql/ha_partition.h
      sql/handler.cc
      sql/handler.h
      sql/mysqld.cc
      sql/mysqld.h
      sql/partition_info.cc
      sql/sql_base.cc
      sql/sql_partition.cc
      sql/sql_partition.h
      sql/sql_partition_admin.cc
      sql/sql_table.cc
      sql/sql_tmp_table.cc
      sql/table.cc
      sql/table.h
      storage/archive/azio.c
      storage/archive/ha_archive.cc
      storage/archive/ha_archive.h
      storage/example/ha_example.cc
      storage/example/ha_example.h
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/handler/ha_innodb.h
      storage/myisam/ha_myisam.cc
=== modified file 'storage/archive/ha_archive.cc'
--- a/storage/archive/ha_archive.cc	revid:mattias.jonsson@stripped
+++ b/storage/archive/ha_archive.cc	revid:mattias.jonsson@stripped
@@ -1580,14 +1580,12 @@ int ha_archive::optimize(THD* thd, HA_CH
   share->in_optimize= false;
   mysql_mutex_unlock(&share->mutex);
 
-  mysql_mutex_unlock(&share->mutex);
   DBUG_RETURN(rc);
 error:
   DBUG_PRINT("ha_archive", ("Failed to recover, error was %d", rc));
   azclose(&writer);
-  mysql_mutex_unlock(&share->mutex);
 
-  DBUG_RETURN(rc); 
+  DBUG_RETURN(rc);
 }
 
 /* 

No bundle (reason: useless for push emails).