From: Mattias Jonsson
Date: October 1 2010 12:17pm
Subject: bzr commit into mysql-5.5-bugteam branch (mattias.jonsson:3213) Bug#51851
List-Archive: http://lists.mysql.com/commits/119653
X-Bug: 51851
Message-Id: <201010011218.o919C19X020300@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6578122723540171547=="

--===============6578122723540171547==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///Users/mattiasj/mysql-bzr/topush-5.5-bugteam/ based on revid:jon.hauglid@stripped

 3213 Mattias Jonsson	2010-10-01 [merge]
      Manual merge of bug#51851 from mysql-5.1-bugteam into mysql-5.5-bugteam

    modified:
      mysql-test/t/partition_binlog_stmt.test
      sql/table.cc
=== modified file 'mysql-test/t/partition_binlog_stmt.test'
--- a/mysql-test/t/partition_binlog_stmt.test	2010-03-30 20:52:45 +0000
+++ b/mysql-test/t/partition_binlog_stmt.test	2010-10-01 12:16:00 +0000
@@ -8,10 +8,8 @@ DROP TABLE IF EXISTS t1;
 --echo #
 --echo # Bug#51851: Server with SBR locks mutex twice on LOAD DATA into
 --echo #            partitioned MyISAM table
-perl;
-open( INIT, ">init_file.txt");
-print INIT "abcd\n";
-close( INIT );
+--write_file init_file.txt
+abcd
 EOF
 
 CREATE TABLE t1

=== modified file 'sql/table.cc'
--- a/sql/table.cc	2010-09-30 13:29:12 +0000
+++ b/sql/table.cc	2010-10-01 12:16:00 +0000
@@ -426,6 +426,18 @@ void TABLE_SHARE::destroy()
       info_it->flags= 0;
     }
   }
+  if (ha_data_destroy)
+  {
+    ha_data_destroy(ha_data);
+    ha_data_destroy= NULL;
+  }
+#ifdef WITH_PARTITION_STORAGE_ENGINE
+  if (ha_part_data_destroy)
+  {
+    ha_part_data_destroy(ha_part_data);
+    ha_part_data_destroy= NULL;
+  }
+#endif /* WITH_PARTITION_STORAGE_ENGINE */
   /*
     Make a copy since the share is allocated in its own root,
     and free_root() updates its argument after freeing the memory.
@@ -1704,11 +1716,17 @@ static int open_binary_frm(THD *thd, TAB
   delete handler_file;
   my_hash_free(&share->name_hash);
   if (share->ha_data_destroy)
+  {
     share->ha_data_destroy(share->ha_data);
+    share->ha_data_destroy= NULL;
+  }
 #ifdef WITH_PARTITION_STORAGE_ENGINE
   if (share->ha_part_data_destroy)
+  {
     share->ha_part_data_destroy(share->ha_part_data);
-#endif
+    share->ha_data_destroy= NULL;
+  }
+#endif /* WITH_PARTITION_STORAGE_ENGINE */
 
   open_table_error(share, error, share->open_errno, errarg);
   DBUG_RETURN(error);


--===============6578122723540171547==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/mattias.jonsson@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: mattias.jonsson@stripped\
#   hbm9uphik900sw2x
# target_branch: file:///Users/mattiasj/mysql-bzr/topush-5.5-bugteam/
# testament_sha1: 08a8a21059f11812449b08d6d12553582308566a
# timestamp: 2010-10-01 14:18:18 +0200
# source_branch: file:///Users/mattiasj/mysql-bzr/topush-51-bugteam/
# base_revision_id: jon.hauglid@stripped\
#   7va5au88bx8lb9hj
# 
# Begin bundle
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


--===============6578122723540171547==--