10.0-monty merge

includes:
* remove some remnants of "Bug#14521864: MYSQL 5.1 TO 5.5 BUGS PARTITIONING"
* introduce LOCK_share, now LOCK_ha_data is strictly for engines
* rea_create_table() always creates .par file (even in "frm-only" mode)
* fix a 5.6 bug, temp file leak on dummy ALTER TABLE

1 files changed, 111 insertions, 78 deletions

diff --git a/sql/sql_partition_admin.h b/sql/sql_partition_admin.h
index 479371c3b4d..9c53744d9bc 100644
--- a/sql/sql_partition_admin.h
+++ b/sql/sql_partition_admin.h
@@ -22,214 +22,247 @@
   Stub class that returns a error if the partition storage engine is
   not supported.
 */
-class Partition_statement_unsupported : public Sql_statement
+class Sql_cmd_partition_unsupported : public Sql_cmd
 {
 public:
-  Partition_statement_unsupported(LEX *lex)
-    : Sql_statement(lex)
+  Sql_cmd_partition_unsupported()
   {}
 
-  ~Partition_statement_unsupported()
+  ~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);
 };
 
 
-class Alter_table_analyze_partition_statement :
-  public Partition_statement_unsupported
+class Sql_cmd_alter_table_exchange_partition :
+  public Sql_cmd_partition_unsupported
 {
 public:
-  Alter_table_analyze_partition_statement(LEX *lex)
-    : Partition_statement_unsupported(lex)
+  Sql_cmd_alter_table_exchange_partition()
   {}
 
-  ~Alter_table_analyze_partition_statement()
+  ~Sql_cmd_alter_table_exchange_partition()
   {}
 };
 
 
-class Alter_table_check_partition_statement :
-  public Partition_statement_unsupported
+class  Sql_cmd_alter_table_analyze_partition :
+  public Sql_cmd_partition_unsupported
 {
 public:
-  Alter_table_check_partition_statement(LEX *lex)
-    : Partition_statement_unsupported(lex)
+  Sql_cmd_alter_table_analyze_partition()
   {}
 
-  ~Alter_table_check_partition_statement()
+  ~Sql_cmd_alter_table_analyze_partition()
   {}
 };
 
 
-class Alter_table_optimize_partition_statement :
-  public Partition_statement_unsupported
+class Sql_cmd_alter_table_check_partition :
+  public Sql_cmd_partition_unsupported
 {
 public:
-  Alter_table_optimize_partition_statement(LEX *lex)
-    : Partition_statement_unsupported(lex)
+  Sql_cmd_alter_table_check_partition()
   {}
 
-  ~Alter_table_optimize_partition_statement()
+  ~Sql_cmd_alter_table_check_partition()
   {}
 };
 
 
-class Alter_table_repair_partition_statement :
-  public Partition_statement_unsupported
+class Sql_cmd_alter_table_optimize_partition :
+  public Sql_cmd_partition_unsupported
 {
 public:
-  Alter_table_repair_partition_statement(LEX *lex)
-    : Partition_statement_unsupported(lex)
+  Sql_cmd_alter_table_optimize_partition()
   {}
 
-  ~Alter_table_repair_partition_statement()
+  ~Sql_cmd_alter_table_optimize_partition()
   {}
 };
 
 
-class Alter_table_truncate_partition_statement :
-  public Partition_statement_unsupported
+class Sql_cmd_alter_table_repair_partition :
+  public Sql_cmd_partition_unsupported
 {
 public:
-  Alter_table_truncate_partition_statement(LEX *lex)
-    : Partition_statement_unsupported(lex)
+  Sql_cmd_alter_table_repair_partition()
   {}
 
-  ~Alter_table_truncate_partition_statement()
+  ~Sql_cmd_alter_table_repair_partition()
   {}
 };
 
 
+class Sql_cmd_alter_table_truncate_partition :
+  public Sql_cmd_partition_unsupported
+{
+public:
+  Sql_cmd_alter_table_truncate_partition()
+  {}
+
+  ~Sql_cmd_alter_table_truncate_partition()
+  {}
+};
+
 #else
 
 /**
   Class that represents the ALTER TABLE t1 ANALYZE PARTITION p statement.
 */
-class Alter_table_analyze_partition_statement : public Analyze_table_statement
+class Sql_cmd_alter_table_exchange_partition : public Sql_cmd_common_alter_table
 {
 public:
   /**
-    Constructor, used to represent a ALTER TABLE ANALYZE PARTITION statement.
-    @param lex the LEX structure for this statement.
+    Constructor, used to represent a ALTER TABLE EXCHANGE PARTITION statement.
   */
-  Alter_table_analyze_partition_statement(LEX *lex)
-    : Analyze_table_statement(lex)
+  Sql_cmd_alter_table_exchange_partition()
+    : Sql_cmd_common_alter_table()
   {}
 
-  ~Alter_table_analyze_partition_statement()
+  ~Sql_cmd_alter_table_exchange_partition()
   {}
 
+  bool execute(THD *thd);
+
+private:
+  bool exchange_partition(THD *thd, TABLE_LIST *, Alter_info *);
+};
+
+
+/**
+  Class that represents the ALTER TABLE t1 ANALYZE PARTITION p statement.
+*/
+class Sql_cmd_alter_table_analyze_partition : public Sql_cmd_analyze_table
+{
+public:
   /**
-    Execute a ALTER TABLE ANALYZE PARTITION statement at runtime.
-    @param thd the current thread.
-    @return false on success.
+    Constructor, used to represent a ALTER TABLE ANALYZE PARTITION statement.
   */
+  Sql_cmd_alter_table_analyze_partition()
+    : Sql_cmd_analyze_table()
+  {}
+
+  ~Sql_cmd_alter_table_analyze_partition()
+  {}
+
   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;
+  }
 };
 
 
 /**
   Class that represents the ALTER TABLE t1 CHECK PARTITION p statement.
 */
-class Alter_table_check_partition_statement : public Check_table_statement
+class Sql_cmd_alter_table_check_partition : public Sql_cmd_check_table
 {
 public:
   /**
     Constructor, used to represent a ALTER TABLE CHECK PARTITION statement.
-    @param lex the LEX structure for this statement.
   */
-  Alter_table_check_partition_statement(LEX *lex)
-    : Check_table_statement(lex)
+  Sql_cmd_alter_table_check_partition()
+    : Sql_cmd_check_table()
   {}
 
-  ~Alter_table_check_partition_statement()
+  ~Sql_cmd_alter_table_check_partition()
   {}
 
-  /**
-    Execute a ALTER TABLE CHECK PARTITION statement at runtime.
-    @param thd the current thread.
-    @return false on success.
-  */
   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;
+  }
 };
 
 
 /**
   Class that represents the ALTER TABLE t1 OPTIMIZE PARTITION p statement.
 */
-class Alter_table_optimize_partition_statement : public Optimize_table_statement
+class Sql_cmd_alter_table_optimize_partition : public Sql_cmd_optimize_table
 {
 public:
   /**
     Constructor, used to represent a ALTER TABLE OPTIMIZE PARTITION statement.
-    @param lex the LEX structure for this statement.
   */
-  Alter_table_optimize_partition_statement(LEX *lex)
-    : Optimize_table_statement(lex)
+  Sql_cmd_alter_table_optimize_partition()
+    : Sql_cmd_optimize_table()
   {}
 
-  ~Alter_table_optimize_partition_statement()
+  ~Sql_cmd_alter_table_optimize_partition()
   {}
 
-  /**
-    Execute a ALTER TABLE OPTIMIZE PARTITION statement at runtime.
-    @param thd the current thread.
-    @return false on success.
-  */
   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;
+  }
 };
 
 
 /**
   Class that represents the ALTER TABLE t1 REPAIR PARTITION p statement.
 */
-class Alter_table_repair_partition_statement : public Repair_table_statement
+class Sql_cmd_alter_table_repair_partition : public Sql_cmd_repair_table
 {
 public:
   /**
     Constructor, used to represent a ALTER TABLE REPAIR PARTITION statement.
-    @param lex the LEX structure for this statement.
   */
-  Alter_table_repair_partition_statement(LEX *lex)
-    : Repair_table_statement(lex)
+  Sql_cmd_alter_table_repair_partition()
+    : Sql_cmd_repair_table()
   {}
 
-  ~Alter_table_repair_partition_statement()
+  ~Sql_cmd_alter_table_repair_partition()
   {}
 
-  /**
-    Execute a ALTER TABLE REPAIR PARTITION statement at runtime.
-    @param thd the current thread.
-    @return false on success.
-  */
   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;
+  }
 };
 
 
 /**
   Class that represents the ALTER TABLE t1 TRUNCATE PARTITION p statement.
 */
-class Alter_table_truncate_partition_statement : public Sql_statement
+class Sql_cmd_alter_table_truncate_partition : public Sql_cmd_truncate_table
 {
 public:
   /**
     Constructor, used to represent a ALTER TABLE TRUNCATE PARTITION statement.
-    @param lex the LEX structure for this statement.
   */
-  Alter_table_truncate_partition_statement(LEX *lex)
-    : Sql_statement(lex)
+  Sql_cmd_alter_table_truncate_partition()
   {}
 
-  virtual ~Alter_table_truncate_partition_statement()
+  virtual ~Sql_cmd_alter_table_truncate_partition()
   {}
 
-  /**
-    Execute a ALTER TABLE TRUNCATE PARTITION statement at runtime.
-    @param thd the current thread.
-    @return false on success.
-  */
   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;
+  }
 };
 
 #endif /* WITH_PARTITION_STORAGE_ENGINE */