From: kevin.lewis
Date: April 6 2012 3:56pm
Subject: bzr push into mysql-trunk-wl5522 branch (kevin.lewis:3859 to 3860)
List-Archive: http://lists.mysql.com/commits/143415
Message-Id: <20120406155630.2B0AA1FA8B55@dhcp-adc-twvpn-2-vpnpool-10-154-44-40.vpn.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3860 kevin.lewis@stripped	2012-04-06
      Adjust an exit label to prevent an extremely unlikely memory leak on an error in CREATE TABLE.

    modified:
      storage/innobase/handler/ha_innodb.cc
 3859 kevin.lewis@stripped	2012-04-06 [merge]
      Commit worklog 5980 to the april labs release.

    added:
      mysql-test/r/partition_innodb_tablespace.result
      mysql-test/suite/innodb/r/innodb-tablespace.result
      mysql-test/suite/innodb/t/innodb-tablespace.test
      mysql-test/t/partition_innodb_tablespace.test
    modified:
      include/my_base.h
      mysql-test/r/mysqlshow.result
      mysql-test/suite/innodb/r/innodb-restart.result
      mysql-test/suite/innodb/r/innodb-system-table-view.result
      mysql-test/suite/innodb/r/innodb_16k.result
      mysql-test/suite/innodb/r/innodb_4k.result
      mysql-test/suite/innodb/r/innodb_8k.result
      mysql-test/suite/innodb/t/innodb-restart.test
      mysql-test/suite/innodb/t/innodb-system-table-view.test
      mysql-test/suite/innodb/t/innodb_16k.test
      mysql-test/suite/innodb/t/innodb_4k.test
      mysql-test/suite/innodb/t/innodb_8k.test
      mysql-test/suite/parts/r/partition_basic_symlink_innodb.result
      mysql-test/suite/parts/t/partition_basic_symlink_innodb.test
      mysys/my_handler_errors.h
      sql/handler.cc
      storage/innobase/dict/dict0boot.cc
      storage/innobase/dict/dict0crea.cc
      storage/innobase/dict/dict0dict.cc
      storage/innobase/dict/dict0load.cc
      storage/innobase/fil/fil0fil.cc
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/handler/ha_innodb.h
      storage/innobase/handler/handler0alter.cc
      storage/innobase/handler/i_s.cc
      storage/innobase/handler/i_s.h
      storage/innobase/include/db0err.h
      storage/innobase/include/dict0boot.h
      storage/innobase/include/dict0crea.h
      storage/innobase/include/dict0dict.h
      storage/innobase/include/dict0dict.ic
      storage/innobase/include/dict0load.h
      storage/innobase/include/dict0mem.h
      storage/innobase/include/fil0fil.h
      storage/innobase/include/fsp0fsp.ic
      storage/innobase/include/mtr0mtr.h
      storage/innobase/include/os0file.h
      storage/innobase/include/row0merge.h
      storage/innobase/os/os0file.cc
      storage/innobase/row/row0import.cc
      storage/innobase/row/row0merge.cc
      storage/innobase/row/row0mysql.cc
      storage/innobase/srv/srv0start.cc
      storage/innobase/ut/ut0ut.cc
=== modified file 'storage/innobase/handler/ha_innodb.cc'
--- a/storage/innobase/handler/ha_innodb.cc	revid:kevin.lewis@stripped
+++ b/storage/innobase/handler/ha_innodb.cc	revid:kevin.lewis@stripped
@@ -9456,14 +9456,13 @@ cleanup:
 cleanup2:
 	trx_free_for_mysql(trx);
 
+cleanup3:
 	if (remote_path) {
 		mem_free(remote_path);
 	}
 	if (temp_path) {
 		mem_free(temp_path);
 	}
-
-cleanup3:
 	mem_free(norm_name);
 
 	DBUG_RETURN(error);

No bundle (reason: useless for push emails).