bzr commit into mysql-next-mr-bugfixing branch (mattias.jonsson:3315)

[Mattias Jonsson]

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


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