Merge branch 'mysql-8.0' into mysql-trunk

Rahul Malik · Rahul Malik · commit 670775d504c2 · 2019-02-27T18:32:08.000+05:30
diff --git a/mysql-test/r/partition_exchange.result b/mysql-test/r/partition_exchange.result
@@ -2061,3 +2061,70 @@ add column after exchange partition
 ALTER TABLE t2 ADD COLUMN j INT,ALGORITHM=INSTANT;
 ALTER TABLE t2 ADD COLUMN k INT,ALGORITHM=COPY;
 DROP TABLE t1,t2;
+#
+Bug#28687608 exchange partition with different row_format
+#
+SET @orig_default_row_format = @@global.innodb_default_row_format;
+SET GLOBAL innodb_default_row_format=COMPACT;
+CREATE TABLE t1 (
+col1 INT UNSIGNED,
+col2 DATETIME
+)
+ENGINE=INNODB
+PARTITION BY RANGE COLUMNS(col2)
+(
+PARTITION p0 VALUES LESS THAN ('1960-01-01'),
+PARTITION p1 VALUES LESS THAN ('1980-01-01')
+);
+INSERT INTO t1 VALUES ('1','1958-02-17 06:25:34');
+INSERT INTO t1 VALUES ('2','1962-11-23 11:06:06');
+SET GLOBAL innodb_default_row_format=DYNAMIC;
+ALTER TABLE t1 ADD PARTITION (PARTITION p2 VALUES LESS THAN ('2000-01-01'));
+INSERT INTO t1 VALUES ('3','1999-10-13 05:28:46'), ('4', '1996-09-26 20:00:00');
+SELECT NAME,ROW_FORMAT  FROM INFORMATION_SCHEMA.INNODB_TABLES
+WHERE NAME LIKE '%t1%' ORDER BY TABLE_ID;
+NAME	ROW_FORMAT
+test/t1#P#p0	Compact
+test/t1#P#p1	Compact
+test/t1#P#p2	Dynamic
+CREATE TABLE t2 LIKE t1;
+ALTER TABLE t2 REMOVE PARTITIONING;
+exchange compact partition with dynamic;
+ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2;
+ERROR HY000: Non matching attribute 'ROW_FORMAT' between partition and table
+ALTER TABLE t1 EXCHANGE PARTITION p2 WITH TABLE t2;
+DROP TABLE t1,t2;
+SET GLOBAL innodb_default_row_format=COMPACT;
+CREATE TABLE t1 (a INT,
+b VARCHAR(55),
+PRIMARY KEY (a))
+PARTITION BY RANGE (a)
+SUBPARTITION BY HASH(a)
+(PARTITION p0 VALUES LESS THAN (100)
+(SUBPARTITION sp0,
+SUBPARTITION sp1),
+PARTITION p1 VALUES LESS THAN  (200)
+(SUBPARTITION sp2,
+SUBPARTITION sp3));
+SET GLOBAL innodb_default_row_format=DYNAMIC;
+ALTER TABLE t1 ADD PARTITION (PARTITION p2 VALUES LESS THAN (300)
+(SUBPARTITION sp4,
+SUBPARTITION sp5));
+INSERT INTO t1(b,a) VALUES('first',40),('second',91),('third',140),
+('forth',191);
+SELECT NAME,ROW_FORMAT  FROM INFORMATION_SCHEMA.INNODB_TABLES
+WHERE NAME LIKE '%t1%' ORDER BY TABLE_ID;
+NAME	ROW_FORMAT
+test/t1#P#p0#SP#sp0	Compact
+test/t1#P#p0#SP#sp1	Compact
+test/t1#P#p1#SP#sp2	Compact
+test/t1#P#p1#SP#sp3	Compact
+test/t1#P#p2#SP#sp4	Dynamic
+test/t1#P#p2#SP#sp5	Dynamic
+CREATE TABLE t2 like t1;
+ALTER TABLE t2 REMOVE PARTITIONING;
+ALTER TABLE t1 EXCHANGE PARTITION sp2 WITH TABLE t2;
+ERROR HY000: Non matching attribute 'ROW_FORMAT' between partition and table
+ALTER TABLE t1 EXCHANGE PARTITION sp4 WITH TABLE t2;
+DROP TABLE t1,t2;
+SET @@global.innodb_default_row_format=@orig_default_row_format;
diff --git a/mysql-test/t/partition_exchange.test b/mysql-test/t/partition_exchange.test
@@ -997,3 +997,80 @@ ALTER TABLE t2 ADD COLUMN k INT,ALGORITHM=COPY;
 
 DROP TABLE t1,t2;
 
+--echo #
+--echo Bug#28687608 exchange partition with different row_format
+--echo #
+
+SET @orig_default_row_format = @@global.innodb_default_row_format;
+
+SET GLOBAL innodb_default_row_format=COMPACT;
+CREATE TABLE t1 (
+  col1 INT UNSIGNED,
+  col2 DATETIME
+)
+ENGINE=INNODB
+PARTITION BY RANGE COLUMNS(col2)
+(
+PARTITION p0 VALUES LESS THAN ('1960-01-01'),
+PARTITION p1 VALUES LESS THAN ('1980-01-01')
+);
+
+INSERT INTO t1 VALUES ('1','1958-02-17 06:25:34');
+INSERT INTO t1 VALUES ('2','1962-11-23 11:06:06');
+
+SET GLOBAL innodb_default_row_format=DYNAMIC;
+
+ALTER TABLE t1 ADD PARTITION (PARTITION p2 VALUES LESS THAN ('2000-01-01'));
+
+INSERT INTO t1 VALUES ('3','1999-10-13 05:28:46'), ('4', '1996-09-26 20:00:00');
+
+--replace_result #p# #p# #sp# #sp#
+SELECT NAME,ROW_FORMAT  FROM INFORMATION_SCHEMA.INNODB_TABLES
+WHERE NAME LIKE '%t1%' ORDER BY TABLE_ID;
+
+CREATE TABLE t2 LIKE t1;
+ALTER TABLE t2 REMOVE PARTITIONING;
+
+--echo exchange compact partition with dynamic;
+
+--error ER_PARTITION_EXCHANGE_DIFFERENT_OPTION
+ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2;
+
+ALTER TABLE t1 EXCHANGE PARTITION p2 WITH TABLE t2;
+DROP TABLE t1,t2;
+
+SET GLOBAL innodb_default_row_format=COMPACT;
+CREATE TABLE t1 (a INT,
+  b VARCHAR(55),
+  PRIMARY KEY (a))
+PARTITION BY RANGE (a)
+SUBPARTITION BY HASH(a)
+(PARTITION p0 VALUES LESS THAN (100)
+ (SUBPARTITION sp0,
+  SUBPARTITION sp1),
+ PARTITION p1 VALUES LESS THAN  (200)
+ (SUBPARTITION sp2,
+  SUBPARTITION sp3));
+
+SET GLOBAL innodb_default_row_format=DYNAMIC;
+
+ALTER TABLE t1 ADD PARTITION (PARTITION p2 VALUES LESS THAN (300)
+(SUBPARTITION sp4,
+SUBPARTITION sp5));
+
+INSERT INTO t1(b,a) VALUES('first',40),('second',91),('third',140),
+('forth',191);
+
+--replace_result #p# #p# #sp# #sp#
+SELECT NAME,ROW_FORMAT  FROM INFORMATION_SCHEMA.INNODB_TABLES
+WHERE NAME LIKE '%t1%' ORDER BY TABLE_ID;
+
+CREATE TABLE t2 like t1;
+ALTER TABLE t2 REMOVE PARTITIONING;
+
+--error ER_PARTITION_EXCHANGE_DIFFERENT_OPTION
+ALTER TABLE t1 EXCHANGE PARTITION sp2 WITH TABLE t2;
+
+ALTER TABLE t1 EXCHANGE PARTITION sp4 WITH TABLE t2;
+DROP TABLE t1,t2;
+SET @@global.innodb_default_row_format=@orig_default_row_format;
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
@@ -16420,6 +16420,15 @@ static MYSQL_SYSVAR_ENUM(
   &distribution_typelib              /* typelib */
 );
 
+/* Get partition row type
+@param[in] table   partition_table
+@param[in] part_id Id of partition for which row type to be retrieved
+@return Partition row type. */
+enum row_type ha_ndbcluster::get_partition_row_type(
+    const dd::Table *table MY_ATTRIBUTE((unused)),
+    uint part_id MY_ATTRIBUTE((unused))) {
+  return table_share->real_row_type;
+}
 
 void ha_ndbcluster::set_auto_partitions(partition_info *part_info)
 {
diff --git a/sql/ha_ndbcluster.h b/sql/ha_ndbcluster.h
@@ -204,6 +204,13 @@ class ha_ndbcluster: public handler, public Partition_handler
 
   void append_create_info(String *packet) override;
 
+  /* Get partition row type
+  @param[in] table   partition table
+  @param[in] part_id Id of partition for which row type to be retrieved
+  @return Partition row type. */
+  enum row_type get_partition_row_type(const dd::Table *table,
+                                       uint part_id) override;
+
  private:
   bool choose_mrr_impl(uint keyno, uint n_ranges, ha_rows n_rows,
                        uint *bufsz, uint *flags, Cost_estimate *);
diff --git a/sql/partitioning/partition_handler.h b/sql/partitioning/partition_handler.h
@@ -310,6 +310,15 @@ class Partition_handler {
     return 0;
   }
 
+  /**
+    Get partition row type from SE
+    @param       table      partition table
+    @param       part_id    Id of partition for which row type to be retrieved
+    @return      Partition row type.
+  */
+  virtual enum row_type get_partition_row_type(const dd::Table *table,
+                                               uint part_id) = 0;
+
  private:
   /**
     Truncate partition.
diff --git a/sql/sql_partition_admin.cc b/sql/sql_partition_admin.cc
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License, version 2.0,
@@ -174,10 +174,12 @@ static bool check_exchange_partition(TABLE *table, TABLE *part_table) {
   @param table      Non partitioned table.
   @param part_table Partitioned table.
   @param part_elem  Partition element to use for partition specific compare.
+  @param part_id    Id of specific partition
 */
 static bool compare_table_with_partition(THD *thd, TABLE *table,
                                          TABLE *part_table,
-                                         partition_element *part_elem) {
+                                         partition_element *part_elem,
+                                         uint part_id) {
   HA_CREATE_INFO table_create_info, part_create_info;
   Alter_info part_alter_info(thd->mem_root);
   Alter_table_ctx part_alter_ctx;  // Not used
@@ -222,7 +224,12 @@ static bool compare_table_with_partition(THD *thd, TABLE *table,
       table_create_info.auto_increment_value;
 
   /* Check compatible row_types and set create_info accordingly. */
-  if (part_table->s->real_row_type != table->s->real_row_type) {
+  Partition_handler *part_handler;
+  part_handler = part_table->file->get_partition_handler();
+  auto part_row_type =
+      part_handler->get_partition_row_type(part_table_def, part_id);
+
+  if (part_row_type != table->s->real_row_type) {
     my_error(ER_PARTITION_EXCHANGE_DIFFERENT_OPTION, MYF(0), "ROW_FORMAT");
     DBUG_RETURN(true);
   }
@@ -384,7 +391,8 @@ bool Sql_cmd_alter_table_exchange_partition::exchange_partition(
     DBUG_RETURN(true);
   }
 
-  if (compare_table_with_partition(thd, swap_table, part_table, part_elem))
+  if (compare_table_with_partition(thd, swap_table, part_table, part_elem,
+                                   swap_part_id))
     DBUG_RETURN(true);
 
   /* Table and partition has same structure/options */
diff --git a/storage/innobase/handler/ha_innopart.cc b/storage/innobase/handler/ha_innopart.cc
@@ -2913,6 +2913,44 @@ int ha_innopart::extra(enum ha_extra_function operation) {
   return (ha_innobase::extra(operation));
 }
 
+/* Get partition row type
+@param[in] table   partition_table
+@param[in] part_id Id of partition for which row type to be retrieved
+@return Partition row type. */
+enum row_type ha_innopart::get_partition_row_type(const dd::Table *table,
+                                                  uint part_id) {
+  dd::Table::enum_row_format format;
+  row_type real_type = ROW_TYPE_NOT_USED;
+
+  auto dd_table = table->leaf_partitions().at(part_id);
+  const dd::Properties &part_p = dd_table->se_private_data();
+  if (part_p.exists(dd_partition_key_strings[DD_PARTITION_ROW_FORMAT])) {
+    part_p.get(dd_partition_key_strings[DD_PARTITION_ROW_FORMAT],
+               reinterpret_cast<uint32 *>(&format));
+    switch (format) {
+      case dd::Table::RF_REDUNDANT:
+        real_type = ROW_TYPE_REDUNDANT;
+        break;
+      case dd::Table::RF_COMPACT:
+        real_type = ROW_TYPE_COMPACT;
+        break;
+      case dd::Table::RF_COMPRESSED:
+        real_type = ROW_TYPE_COMPRESSED;
+        break;
+      case dd::Table::RF_DYNAMIC:
+        real_type = ROW_TYPE_DYNAMIC;
+        break;
+      default:
+        ut_a(0);
+    }
+  }
+  if (real_type == ROW_TYPE_NOT_USED) {
+    return table_share->real_row_type;
+  } else {
+    return real_type;
+  }
+};
+
 int ha_innopart::truncate_impl(const char *name, TABLE *form,
                                dd::Table *table_def) {
   DBUG_ENTER("ha_innopart::truncate_impl");
diff --git a/storage/innobase/handler/ha_innopart.h b/storage/innobase/handler/ha_innopart.h
@@ -516,6 +516,13 @@ class ha_innopart : public ha_innobase,
                           ulonglong nb_desired_values, ulonglong *first_value,
                           ulonglong *nb_reserved_values) override;
 
+  /* Get partition row type
+  @param[in] table   partition table
+  @param[in] part_id Id of partition for which row type to be retrieved
+  @return Partition row type. */
+  enum row_type get_partition_row_type(const dd::Table *table,
+                                       uint part_id) override;
+
   int cmp_ref(const uchar *ref1, const uchar *ref2) const override;
 
   int read_range_first(const key_range *start_key, const key_range *end_key,
