From: Mattias Jonsson Date: January 28 2011 5:22pm Subject: bzr push into mysql-trunk branch (mattias.jonsson:3569) WL#5217 List-Archive: http://lists.mysql.com/commits/129901 Message-Id: <201101281722.p0SHMQW6032487@acsinet15.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3569 Mattias Jonsson 2011-01-28 [merge] Merge or WL#5217 into a recent mysql-trunk added: mysql-test/collections/mysql-trunk-wl5217.push mysql-test/r/partition_explicit_prune.result mysql-test/t/partition_explicit_prune.test modified: include/my_base.h mysql-test/r/partition_exchange.result mysql-test/suite/parts/r/partition_exch_qa_13.result mysql-test/suite/parts/r/partition_exch_qa_2.result mysql-test/suite/parts/r/partition_mgm_lc0_archive.result mysql-test/suite/parts/r/partition_mgm_lc0_innodb.result mysql-test/suite/parts/r/partition_mgm_lc0_memory.result mysql-test/suite/parts/r/partition_mgm_lc0_myisam.result mysql-test/suite/parts/r/partition_mgm_lc1_archive.result mysql-test/suite/parts/r/partition_mgm_lc1_innodb.result mysql-test/suite/parts/r/partition_mgm_lc1_memory.result mysql-test/suite/parts/r/partition_mgm_lc1_myisam.result mysql-test/suite/parts/r/partition_mgm_lc2_archive.result mysql-test/suite/parts/r/partition_mgm_lc2_innodb.result mysql-test/suite/parts/r/partition_mgm_lc2_memory.result mysql-test/suite/parts/r/partition_mgm_lc2_myisam.result mysql-test/suite/parts/r/partition_repair_myisam.result mysql-test/suite/parts/t/partition_debug_myisam.test mysql-test/suite/parts/t/partition_repair_myisam.test mysys/hash.c mysys/my_handler.c mysys/my_handler_errors.h sql/ha_partition.cc sql/ha_partition.h sql/handler.cc sql/handler.h sql/mysqld.cc sql/opt_range.cc sql/partition_info.cc sql/partition_info.h sql/share/errmsg-utf8.txt sql/sql_base.cc sql/sql_class.h sql/sql_lex.cc sql/sql_lex.h sql/sql_parse.cc sql/sql_partition.cc sql/sql_yacc.yy sql/table.cc sql/table.h Diff too large for email (557544 lines, the limit is 10000). No bundle (reason: useless for push emails).