bzr commit into mysql-trunk branch (mattias.jonsson:3570) WL#5217

[Mattias Jonsson]

#At file:///Users/mattiasj/mysql-bzr/merge-trunk-wl5217_3/ based on revid:mattias.jonsson@stripped

 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
=== 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;


Attachment: [text/bzr-bundle] bzr/[e-mail]