From: Mattias Jonsson
Date: January 31 2011 9:40pm
Subject: bzr push into mysql-trunk branch (mattias.jonsson:3569 to 3570) WL#5217
List-Archive: http://lists.mysql.com/commits/130092
Message-Id: <201101312141.p0VLfKNu029402@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3570 Mattias Jonsson	2011-01-31
      WL#5217: Add explicit partition selection
      
      Fix of test to also work with --embedded-server
      
      Problem was that embedded uses a different
      default_storage_engine.

    modified:
      mysql-test/r/partition_explicit_prune.result
      mysql-test/t/partition_explicit_prune.test
 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
=== modified file 'mysql-test/r/partition_explicit_prune.result'
--- a/mysql-test/r/partition_explicit_prune.result	2011-01-26 15:48:12 +0000
+++ b/mysql-test/r/partition_explicit_prune.result	2011-01-31 13:51:59 +0000
@@ -1098,7 +1098,6 @@ HANDLER_WRITE	17
 SELECT * FROM t3 PARTITION (pNeg);
 ERROR HY000: PARTITION () clause on non partitioned table
 DROP TABLE t1, t2, t3;
-SET @@default_storage_engine = @old_default_storage_engine;
 # Test from superseeded WL# 2682
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 CREATE TABLE `t1` (
@@ -1433,3 +1432,4 @@ explain partitions select * from t1 part
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1		ALL	NULL	NULL	NULL	NULL	0	Using where
 drop table t1;
+SET @@default_storage_engine = @old_default_storage_engine;

=== modified file 'mysql-test/t/partition_explicit_prune.test'
--- a/mysql-test/t/partition_explicit_prune.test	2011-01-26 15:48:12 +0000
+++ b/mysql-test/t/partition_explicit_prune.test	2011-01-31 13:51:59 +0000
@@ -496,7 +496,6 @@ eval $get_handler_status_counts;
 SELECT * FROM t3 PARTITION (pNeg);
 
 DROP TABLE t1, t2, t3;
-SET @@default_storage_engine = @old_default_storage_engine;
 #
 --echo # Test from superseeded WL# 2682
 # Partition select tests.
@@ -648,3 +647,4 @@ explain partitions select * from t1 part
 explain partitions select * from t1 partition (p2) where a=1;
 
 drop table t1;
+SET @@default_storage_engine = @old_default_storage_engine;

No bundle (reason: useless for push emails).