From: Mattias Jonsson
Date: January 31 2011 1:52pm
Subject: bzr commit into mysql-trunk branch (mattias.jonsson:3570) WL#5217
List-Archive: http://lists.mysql.com/commits/130046
Message-Id: <201101311353.p0VDrhRG026603@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0092075349021173336=="

--===============0092075349021173336==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

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


--===============0092075349021173336==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/mattias.jonsson@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: mattias.jonsson@stripped\
#   j9eeuvtu407mm4aj
# target_branch: file:///Users/mattiasj/mysql-bzr/merge-trunk-\
#   wl5217_3/
# testament_sha1: aa4c41bd9dfba693b46b4f924fc281dfab0f6af5
# timestamp: 2011-01-31 14:52:15 +0100
# source_branch: file:///Users/mattiasj/mysql-bzr/merge-trunk-wl5217/
# base_revision_id: mattias.jonsson@stripped\
#   0add8xq2zdk0qfql
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbxgHTgAAhNfgAAQWGP//3MW
TIC////wUASteaDqzO7NUr2XucJJCEyaaMqfkZTwmqbU8UNNM1M0IaaCURGmTInqnlPU00NABjUY
mg0ACU0gQp7VNHqaGg0bUAAAGhoDapEMR6gaAMgBpoDQAACSQmQ1GEyMhqaZNTaakHigDMkVn69K
tly86quht3PU5TK4eMrGiYXtOR2wktiH3Q6WHeXiSEjL6MVjRJa7vV3LlCD08jtMTRpM3jXzsPb9
f8j/b3EjKjq4J4Se02qm/OvQXYx5npZuQ9kHTji2paQLkLu7c1xyAxObcdPIM9NtNCS4CTfQZi8s
rgbSmgBmU+DmHNagGEGdZiBVmOCMViom+ROWDTvYxRJXEc9GkCY0IDSbvLa02AuCoEp6waDyoJER
lW3TDC+AEgWMA9l9rLqCm4B63BcmP0yXh4UWFh11FhAMTDKZ+DgRGQHHYk845bXgTtHBfscjGOw0
lhoafCngaWawGJHCqwdDeoguGe2qcy0lT9/ioJTtZfIFIZGQRNxm+QRWEOcdhto2q+nFt67AXlY+
mq0k8LAOYe7Z2RKM7A8nQkjmYBYMMZtvarYE1aE5UzMMLZUuyUGjIkZLCwnEDHqSKLS6sMDEcpFE
cZxHl9V865awdWZbwP+J4DoFSKxKqnsjaX0KI6Tim4eReijwHldtkBWOrIUHio3igYgbGSylWWS+
FtsVJxo0izuCmpNRidFeeDZW3IFp1GEBBvepnsPcRQZldYkky+X1D4fjk9RHY6ylFStHJMvX2cIn
p0GgKk3cCnl0kOOfr5iUeStm+AjkB6XbDZRsmIj6sJccegOPlhKtFfGxzd8DtrOBEPNBF5Y70raO
wuOzUS/UliIBl3Ybg5FURNYiPi17C4Wc4l9fUZbA8weGlskqQxO03LaWlJ99ieVDH1NXuUdV29Ft
u5ZhgYHuwk5MWQHQ8OnkQg8rjIygVGo8ijv5J1aJjI7an+OZ9DQYtqNnCMylaPICCIyqX8zfNsPV
x9NWPlmjuD4TA2vC+/D7aurHWERNWrQGRZrKEUddOmR4qtK3iwd7A+DsWmRy3vPvzTddubMIjRjl
byLxOlmI6EQK3hpekm5qc9ENRzDcJxfejujX8br3yNgMNUTLkYL2iufzSYZJZVgO/ISz9TVv35p/
bgjvZUGxDkW0wDzPEmEmKRiDuPJVXc/wPcBGT3X79NCFeA25Yo8zqmHc5Fg8wKuwFdFC/XmQkySP
Mi8DAYg1aIwgA6E5iTDRXhihVKZRAPz2CYgYY/syB9PIIEjPSsnrXhgW0GzcwwNeQUnqptsnAdWR
LVedFAzpWszvxncZA2wBdrokuap4bVEpdAfFT7IplG8ig9QcwB23grPUKLct1wcarQmKRqUkbQI1
KqcoDAgE1h2UMC+y1QBDlJdknJk+MKMOPXZzNIcFN7N0Ul11naSeqJTEalFsYuCVaSsAmBhpymoo
qTnaqQwAmo3dswoR6OAuDiVn14M0H3hhOFa/ZMjEoXMLTeYFnip1PNZ/xdyRThQkLxgHTgA=


--===============0092075349021173336==--