From: Mattias Jonsson Date: February 3 2012 12:38pm Subject: bzr push into mysql-trunk branch (mattias.jonsson:3831) WL#4305 List-Archive: http://lists.mysql.com/commits/142738 Message-Id: <201202031237.q13CbpWt005317@acsmt357.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3831 Mattias Jonsson 2012-02-03 [merge] WL#4305 Updated with latest mysql-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 sql/ha_partition.cc sql/ha_partition.h sql/handler.cc sql/handler.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 Diff too large for email (56953 lines, the limit is 10000). No bundle (reason: useless for push emails).