From: Mattias Jonsson
Date: October 5 2010 10:21am
Subject: bzr commit into mysql-next-mr-bugfixing branch (mattias.jonsson:3315)
List-Archive: http://lists.mysql.com/commits/119974
Message-Id: <201010051022.o95AMqZG004881@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4435078247349788960=="

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

#At file:///Users/mattiasj/mysql-bzr/topush-next-mr-bugfixing/ based on revid:tor.didriksen@stripped

 3315 Mattias Jonsson	2010-10-05 [merge]
      merge

    modified:
      mysql-test/r/not_partition.result
      sql/sql_partition_admin.h
=== modified file 'mysql-test/r/not_partition.result'
--- a/mysql-test/r/not_partition.result	2010-08-16 12:53:30 +0000
+++ b/mysql-test/r/not_partition.result	2010-10-05 08:55:57 +0000
@@ -3,7 +3,7 @@ FLUSH TABLES;
 SELECT * FROM t1;
 ERROR 42000: Unknown storage engine 'partition'
 TRUNCATE TABLE t1;
-ERROR 42000: Unknown storage engine 'partition'
+ERROR 42S02: Table 'test.t1' doesn't exist
 ANALYZE TABLE t1;
 Table	Op	Msg_type	Msg_text
 test.t1	analyze	Error	Unknown storage engine 'partition'
@@ -50,7 +50,7 @@ ERROR HY000: The 'partitioning' feature 
 ALTER TABLE t1 PARTITION BY KEY(joined) PARTITIONS 2;
 ERROR HY000: The 'partitioning' feature is disabled; you need MySQL built with '--with-plugin-partition' to have it working
 drop table t1;
-ERROR 42S02: Unknown table 't1'
+ERROR 42S02: Unknown table 'test.t1'
 CREATE TABLE t1 (
 firstname VARCHAR(25) NOT NULL,
 lastname VARCHAR(25) NOT NULL,
@@ -67,7 +67,7 @@ PARTITION p4 VALUES LESS THAN MAXVALUE
 );
 ERROR HY000: The 'partitioning' feature is disabled; you need MySQL built with '--with-plugin-partition' to have it working
 drop table t1;
-ERROR 42S02: Unknown table 't1'
+ERROR 42S02: Unknown table 'test.t1'
 CREATE TABLE t1 (id INT, purchased DATE)
 PARTITION BY RANGE( YEAR(purchased) )
 SUBPARTITION BY HASH( TO_DAYS(purchased) )
@@ -78,7 +78,7 @@ PARTITION p2 VALUES LESS THAN MAXVALUE
 );
 ERROR HY000: The 'partitioning' feature is disabled; you need MySQL built with '--with-plugin-partition' to have it working
 drop table t1;
-ERROR 42S02: Unknown table 't1'
+ERROR 42S02: Unknown table 'test.t1'
 create table t1 (a varchar(10) charset latin1 collate latin1_bin);
 insert into t1 values (''),(' '),('a'),('a '),('a  ');
 explain partitions select * from t1 where a='a ' OR a='a';

=== modified file 'sql/sql_partition_admin.h'
--- a/sql/sql_partition_admin.h	2010-08-24 10:52:32 +0000
+++ b/sql/sql_partition_admin.h	2010-10-05 08:55:57 +0000
@@ -31,6 +31,12 @@ public:
   ~Sql_cmd_partition_unsupported()
   {}
 
+  /* Override SQLCOM_*, since it is an ALTER command */
+  virtual enum_sql_command sql_command_code() const
+  {
+    return SQLCOM_ALTER_TABLE;
+  }
+
   bool execute(THD *thd);
 };
 
@@ -150,6 +156,7 @@ public:
 
   bool execute(THD *thd);
 
+  /* Override SQLCOM_ANALYZE, since it is an ALTER command */
   virtual enum_sql_command sql_command_code() const
   {
     return SQLCOM_ALTER_TABLE;
@@ -175,6 +182,7 @@ public:
 
   bool execute(THD *thd);
 
+  /* Override SQLCOM_CHECK, since it is an ALTER command */
   virtual enum_sql_command sql_command_code() const
   {
     return SQLCOM_ALTER_TABLE;
@@ -200,6 +208,7 @@ public:
 
   bool execute(THD *thd);
 
+  /* Override SQLCOM_OPTIMIZE, since it is an ALTER command */
   virtual enum_sql_command sql_command_code() const
   {
     return SQLCOM_ALTER_TABLE;
@@ -225,6 +234,7 @@ public:
 
   bool execute(THD *thd);
 
+  /* Override SQLCOM_REPAIR, since it is an ALTER command */
   virtual enum_sql_command sql_command_code() const
   {
     return SQLCOM_ALTER_TABLE;
@@ -249,6 +259,7 @@ public:
 
   bool execute(THD *thd);
 
+  /* Override SQLCOM_TRUNCATE, since it is an ALTER command */
   virtual enum_sql_command sql_command_code() const
   {
     return SQLCOM_ALTER_TABLE;


--===============4435078247349788960==
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\
#   hjror0jox0sxkjo2
# target_branch: file:///Users/mattiasj/mysql-bzr/topush-next-mr-\
#   bugfixing/
# testament_sha1: f5ff98f68f0c7a704b03afb82e64dcdf514e828b
# timestamp: 2010-10-05 12:21:13 +0200
# source_branch: file:///Users/mattiasj/mysql-bzr/topush-trunk-\
#   bugfixing/
# base_revision_id: tor.didriksen@stripped\
#   edejt8htrg41zwl7
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWXQyvkAA+bfgEAQWP///3p/
/jC////6YAgvvNpb7GqoE03dNroDu7sV2HbnhJKCp+U8BGTTIaCZTyn6U9Q0NHkmmhoaaA9QxMmj
RiGJpgIGBNMEYJiaaaADA4aaZGIwmmAhgE0wjBMTIaZGhoBJCJkgwJBGQPSAAAaBoaA0xARSEU9M
ponp5KenqnijT0mEeoNBoAAADQSSBNAaQZE9AhG0jU0AB6gAGjTQ4u85oq6s5hZgil8Web7YweIL
bYubZESQaHQliugad8IpWMg5NdJyVUucVUz4jonOjpwiX1Q/fNREbg9suQUxcByFwyBmZhW8qFqk
VJj4tsksIzydO02csypJ4iCyntBohtM5QVzcaVYtbRJ9YHMbRbIZG0O+2mAVdIu/oN0GnwkiYbw/
w7rkMueATr4p5bhvI4a3VUnEHC/Z5VHY5SDpC+IPOWmhL+OmvgQI1fGhz3EiK4JpAxDDaOBtF93x
Pw4/d2N0trwlC4LxSQ701bkiMff3rzBiIii9OBpkjuV6gzLaZVDDRjlUdE+eRAqlI6iC56ejEMxa
APjUOdKSv51CvZXsgZ3CB1sjIkAt5MjBycCQ4hMzBRMt/lB2bG4RVuFFZ/egY52jUPHCQpw1JkYq
SeE8YKvD1VX6ER5mFa/0K1tQmkOFLC97bgdeSEKi83IRSYQWajC21bw5Z+Ju0VIkhrrDDZOFjyvA
LxesVF/ZK83lIsIyuUn+zlRVQ7KssWDAtMB+zJ6wMVx+M6M+pv3yslZvQsBhCyztB6OneHMd3rF8
gzY8KWJ7tzSxvvrMN9k2DftkkwEPd2Qy4uMLevjv3NizMGplUqZmwhWMtzXHYpSOwNW17snwYfbv
O6m9Ld1SvF0sPBPlsVS9KwsDjRasXVTVFiaDHSJJYWv6PmhhhlxGoKYbLBjSPPPhsLRx+i5XpGDy
TYYSYuk6RFgrtHYTIv4Hp7pI46jhroCokP861MgkY1Y8t1VSiRoh7zGAmvNbtH9Zpsa9pEr20IFl
tikbzBPE+EVY19xXc2oxxneTruvJImilxOG8fyWtZU2Uwo+9Ic0T0rauWXUbs1bbrtZKZqVCpYbs
sBjdqC9jWo0IVjOFhNuKwW7L/UjokX7THU4o9YTkaU0dtZTRY5IaaxbO7XMLmtJis2GA7Vb0T8qr
hhWFjld2JzEYMG0wbjF5cxblKhZpKg03bAYvpCgJyLiGguLBrCkCtmEwvqQKg5aSeAex6pVtIJ5H
b0hnLrzOS2mYnAR2joOYq5IVP1+bh8n4j57+1tYwwzJm+2UqUj9JdJqev545C0g2ptXNcS50vFMD
m50siOiiWWsNAsq/FJgcWiywIC5toVSws1ZpZvjWypH33bBSbej180wbx52jkDIehvPzcHSGDwHD
0eU2YXj1Wb97c5ld193agVXVciwld6p7AhSs7aV14md0l5MbCwT1unTgA2nogQrqgvqJHZIEMnnz
+xsSprqj9tlrO8aQhOSue1pG8EctDSE5ywcjQttXdgrqOkWusjdNGuFwZAtgRIE8JwLT6Oog7L3B
d3FDsTTQ55b9DPZkw41WolC7jcLORPSoT1A9E+OBr6CwfY18WYrJtzrvI1uULNlE1c7ldTBvaGHL
oDEWjh2oTH3+UEJa61l3+nu43lT3aE7sq/Kydg0xrO63YbSsFB2HvCqXhuzh6M2js8CtmNrnSDF9
F5oxcllecDmXqyu0p2uIVe0esDQNA6f8Jwu1rw0wNulcxTrOh0kExMWiem1JgOCntCoVRPsWzXYt
RA0DI51Hh3RI+o4Wnax3jguwDPX7zx8RjM76Eh4QBs08XIataJ3fmPZA8c0a1TZRuvTI4jOAZ2MO
p1DYqlJd3gsxJ4aHsWx4IbYeVoyTxcE8iaPDbFMuxhMohENERVBaJYWQuj6E46eXM3lZfMZDAyGG
XLOgmApY9LepIUBqLXWU+DWGgg3heGRXJxapcmVLCFqzMtKgmCMCgCgiqTwv5FaniU08oXBwIMDu
sMajUbZpIcm8Y8O1UnJx+nfEbUX8p6kw4MO/EY3EIxDBbyNukxvBeqsrB4Yd4Tg6UbWKhVbyC0XC
Q9DCGUE4BtJjuGELJYGhS1lRCuqRQo+52OFHPxuL3etkRN1S6Fga7+sfQJWZ+FtrdHI0QS2hCkCE
LiTk9RcITseaN2TIOpBks02sh7y8yMGzBPVgVuWJRHDoMMJvIR4OHnKQcLjwxUAh0PEzsJV9hxU3
7XY35g+EKZdeW7ZEnCTR4pBIJUhwANxRCIxagZr6iweDMo1LkFYLVMiyb5K57SvkGFyWq0cOQnXW
uFrUCAmSCFuYWzLeC8rpscRig5bBWXgQLlsZNd5IkCOpo1tt46y5SlBnPjWF2YIZnAVJMKI7xDgr
sxtWVnuycKBDXUmV58IVogcgrlopkySKphROMVAgSm83FwbsrQYsOHBeuC20EXmwO/RChCwkGCTi
2pnmE+dAIdwetIZYo81i2cdRtvKBTTuuqfhJTn2Vp+pTIPxGvTgBvqTvcFKuWEo3OiA1a6Nrg5ol
eECWBZBwMODyTUu53r7bG58M246RTBv0W+cEkEwC4XckU4UJBl0Mr5A=


--===============4435078247349788960==--