Bug#21514135 SCHEMA MISMATCH ERROR WHEN IMPORTING TABLESPACE AFTER DROPPING

Darshan M N · Darshan M N · commit a0bc9d81d696 · 2015-09-21T15:28:47.000+05:30
AN INDEX

Problem:
========
A schema mismatch error occurs when importing a TABLESPACE from one server
to another. The situation occurs when importing a table has been altered by
DROP INDEX on the source server.

The high level flow is:
1) Drop an index from a table on the source server
2) Move the table to the destination server using transportable TABLESPACES
3) Receive a "SCHEMA MISMATCH" error when importing TABLESPACE

This problem is due to the variable dict_col_t-&gt;ord_part of a column, part
of an index to be dropped, not being reset to 0.

Fix:
====
During the dropping of an index, it is checked if the column being part of
the index to be dropped is part of any other index which is not being
dropped. If it is not part of any other index then the dict_col_t-&gt;ord_part
variable is reset to 0.

Reviewed-by: Jimmy Yang &lt;Jimmy.Yang@oracle.com&gt;
Reviewed-by: Satya Bodapati &lt;satya.bodapati@oracle.com&gt;
RB: 10212
diff --git a/mysql-test/suite/innodb/include/import.inc b/mysql-test/suite/innodb/include/import.inc
@@ -3,19 +3,38 @@
 
 let $MYSQLD_DATADIR = `SELECT @@datadir`;
 
-FLUSH TABLES t1 FOR EXPORT;
+if(!$source_db) {
+	let $source_db = test;
+}
 
---copy_file $MYSQLD_DATADIR/test/t1.cfg $MYSQLD_DATADIR/t1.cfg_back
---copy_file $MYSQLD_DATADIR/test/t1.ibd $MYSQLD_DATADIR/t1.ibd_back
+if(!$dest_db) {
+	let $dest_db = test;
+}
+
+eval FLUSH TABLES $source_db.t1 FOR EXPORT;
+
+--copy_file $MYSQLD_DATADIR/$source_db/t1.cfg $MYSQLD_DATADIR/t1.cfg_back
+--copy_file $MYSQLD_DATADIR/$source_db/t1.ibd $MYSQLD_DATADIR/t1.ibd_back
 
 UNLOCK TABLES;
-ALTER TABLE t1 DISCARD TABLESPACE;
 
---move_file $MYSQLD_DATADIR/t1.cfg_back $MYSQLD_DATADIR/test/t1.cfg
---move_file $MYSQLD_DATADIR/t1.ibd_back $MYSQLD_DATADIR/test/t1.ibd
+if($source_db != $dest_db) {
+	eval USE $dest_db;
+	let $create1 = query_get_value(SHOW CREATE TABLE $source_db.t1, Create Table, 1);
+	eval $create1;
+}
+
+eval ALTER TABLE $dest_db.t1 DISCARD TABLESPACE;
+
+--move_file $MYSQLD_DATADIR/t1.cfg_back $MYSQLD_DATADIR/$dest_db/t1.cfg
+--move_file $MYSQLD_DATADIR/t1.ibd_back $MYSQLD_DATADIR/$dest_db/t1.ibd
+
+eval ALTER TABLE $dest_db.t1 IMPORT TABLESPACE;
 
-ALTER TABLE t1 IMPORT TABLESPACE;
+eval CHECK TABLE $dest_db.t1;
+eval SHOW CREATE TABLE $dest_db.t1;
+eval SELECT * FROM $dest_db.t1;
 
-CHECK TABLE t1;
-SHOW CREATE TABLE t1;
-SELECT * FROM t1;
+if($source_db != $dest_db) {
+	eval DROP TABLE $dest_db.t1;
+}
diff --git a/mysql-test/suite/innodb/r/import.result b/mysql-test/suite/innodb/r/import.result
@@ -9,14 +9,14 @@ ALTER TABLE t1 ADD INDEX ind2(c3, c1(10), c2);
 ALTER TABLE t1 ADD INDEX ind3(c2, c3, c1(20));
 INSERT INTO t1 VALUES ('Test Data -1', 'Test Data -2', 'Test Data -3');
 # Test with 2ndary index having prefix
-FLUSH TABLES t1 FOR EXPORT;
+FLUSH TABLES test.t1 FOR EXPORT;
 UNLOCK TABLES;
-ALTER TABLE t1 DISCARD TABLESPACE;
-ALTER TABLE t1 IMPORT TABLESPACE;
-CHECK TABLE t1;
+ALTER TABLE test.t1 DISCARD TABLESPACE;
+ALTER TABLE test.t1 IMPORT TABLESPACE;
+CHECK TABLE test.t1;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
-SHOW CREATE TABLE t1;
+SHOW CREATE TABLE test.t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` varchar(32) NOT NULL DEFAULT '',
@@ -27,19 +27,19 @@ t1	CREATE TABLE `t1` (
   KEY `ind2` (`c3`,`c1`(10),`c2`),
   KEY `ind3` (`c2`,`c3`,`c1`(20))
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-SELECT * FROM t1;
+SELECT * FROM test.t1;
 c1	c2	c3
 Test Data -1	Test Data -2	Test Data -3
 # Test with PK & 2ndary index with prefix
 ALTER TABLE t1 DROP PRIMARY KEY, ADD PRIMARY KEY(c1(5), c2(10), c3(20));
-FLUSH TABLES t1 FOR EXPORT;
+FLUSH TABLES test.t1 FOR EXPORT;
 UNLOCK TABLES;
-ALTER TABLE t1 DISCARD TABLESPACE;
-ALTER TABLE t1 IMPORT TABLESPACE;
-CHECK TABLE t1;
+ALTER TABLE test.t1 DISCARD TABLESPACE;
+ALTER TABLE test.t1 IMPORT TABLESPACE;
+CHECK TABLE test.t1;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
-SHOW CREATE TABLE t1;
+SHOW CREATE TABLE test.t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` varchar(32) NOT NULL DEFAULT '',
@@ -50,7 +50,7 @@ t1	CREATE TABLE `t1` (
   KEY `ind2` (`c3`,`c1`(10),`c2`),
   KEY `ind3` (`c2`,`c3`,`c1`(20))
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-SELECT * FROM t1;
+SELECT * FROM test.t1;
 c1	c2	c3
 Test Data -1	Test Data -2	Test Data -3
 DROP TABLE t1;
diff --git a/mysql-test/suite/innodb/r/innodb-alter.result b/mysql-test/suite/innodb/r/innodb-alter.result
@@ -790,3 +790,73 @@ CHECK TABLE t1;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
 DROP TABLE t1, parent;
+#
+#BUG#21514135 SCHEMA MISMATCH ERROR WHEN IMPORTING TABLESPACE AFTER
+#DROPPING AN INDEX
+#
+CREATE DATABASE source_db;
+CREATE DATABASE dest_db;
+CREATE TABLE source_db.t1 (
+id int(11) NOT NULL,
+age int(11) DEFAULT NULL,
+name varchar(20),
+PRIMARY KEY (id),
+KEY index1 (age)
+) ENGINE=InnoDB;
+ALTER TABLE source_db.t1 DROP INDEX index1, ADD INDEX index2(name, age), algorithm=inplace;
+FLUSH TABLES source_db.t1 FOR EXPORT;
+UNLOCK TABLES;
+USE dest_db;
+CREATE TABLE `t1` (
+  `id` int(11) NOT NULL,
+  `age` int(11) DEFAULT NULL,
+  `name` varchar(20) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `index2` (`name`,`age`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+ALTER TABLE dest_db.t1 DISCARD TABLESPACE;
+ALTER TABLE dest_db.t1 IMPORT TABLESPACE;
+CHECK TABLE dest_db.t1;
+Table	Op	Msg_type	Msg_text
+dest_db.t1	check	status	OK
+SHOW CREATE TABLE dest_db.t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `id` int(11) NOT NULL,
+  `age` int(11) DEFAULT NULL,
+  `name` varchar(20) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `index2` (`name`,`age`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+SELECT * FROM dest_db.t1;
+id	age	name
+DROP TABLE dest_db.t1;
+ALTER TABLE source_db.t1 DROP INDEX index2, algorithm=inplace;
+FLUSH TABLES source_db.t1 FOR EXPORT;
+UNLOCK TABLES;
+USE dest_db;
+CREATE TABLE `t1` (
+  `id` int(11) NOT NULL,
+  `age` int(11) DEFAULT NULL,
+  `name` varchar(20) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+ALTER TABLE dest_db.t1 DISCARD TABLESPACE;
+ALTER TABLE dest_db.t1 IMPORT TABLESPACE;
+CHECK TABLE dest_db.t1;
+Table	Op	Msg_type	Msg_text
+dest_db.t1	check	status	OK
+SHOW CREATE TABLE dest_db.t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `id` int(11) NOT NULL,
+  `age` int(11) DEFAULT NULL,
+  `name` varchar(20) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+SELECT * FROM dest_db.t1;
+id	age	name
+DROP TABLE dest_db.t1;
+DROP TABLE source_db.t1;
+DROP DATABASE source_db;
+DROP DATABASE dest_db;
diff --git a/mysql-test/suite/innodb/t/innodb-alter.test b/mysql-test/suite/innodb/t/innodb-alter.test
@@ -449,3 +449,33 @@ SHOW CREATE TABLE t1;
 CHECK TABLE t1;
 
 DROP TABLE t1, parent;
+
+--echo #
+--echo #BUG#21514135 SCHEMA MISMATCH ERROR WHEN IMPORTING TABLESPACE AFTER
+--echo #DROPPING AN INDEX
+--echo #
+let $source_db = source_db;
+let $dest_db = dest_db;
+
+eval CREATE DATABASE $source_db;
+eval CREATE DATABASE $dest_db;
+
+eval CREATE TABLE $source_db.t1 (
+   id int(11) NOT NULL,
+   age int(11) DEFAULT NULL,
+   name varchar(20),
+   PRIMARY KEY (id),
+   KEY index1 (age)
+   ) ENGINE=InnoDB;
+
+eval ALTER TABLE $source_db.t1 DROP INDEX index1, ADD INDEX index2(name, age), algorithm=inplace;
+
+--source suite/innodb/include/import.inc
+
+eval ALTER TABLE $source_db.t1 DROP INDEX index2, algorithm=inplace;
+
+--source suite/innodb/include/import.inc
+
+eval DROP TABLE $source_db.t1;
+eval DROP DATABASE $source_db;
+eval DROP DATABASE $dest_db;
diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc
@@ -5026,6 +5026,61 @@ commit_cache_rebuild(
 	DBUG_VOID_RETURN;
 }
 
+/** Store the column number of the columns in a list belonging
+to indexes which are not being dropped.
+@param[in]      ctx             In-place ALTER TABLE context
+@param[in, out] drop_col_list   list which will be set, containing columns
+				which is part of index being dropped */
+static
+void
+get_col_list_to_be_dropped(
+        ha_innobase_inplace_ctx*        ctx,
+        std::set<ulint>&                drop_col_list)
+{
+        for (ulint index_count = 0; index_count < ctx->num_to_drop_index;
+             index_count++) {
+                dict_index_t* index = ctx->drop_index[index_count];
+
+                for (ulint col = 0; col < index->n_user_defined_cols; col++) {
+                        ulint col_no = dict_index_get_nth_col_no(index, col);
+                        drop_col_list.insert(col_no);
+                }
+        }
+}
+
+/** For each column, which is part of an index which is not going to be
+dropped, it checks if the column number of the column is same as col_no
+argument passed.
+@param[in]      table   table object
+@param[in]      col_no  column number of the column which is to be checked
+@retval true column exists
+@retval false column does not exist. */
+static
+bool
+check_col_exists_in_indexes(
+        const dict_table_t*	table,
+        ulint			col_no)
+{
+        for (dict_index_t* index = dict_table_get_first_index(table); index;
+             index = dict_table_get_next_index(index)) {
+
+                if (index->to_be_dropped) {
+                        continue;
+                }
+
+                for (ulint col = 0; col < index->n_user_defined_cols; col++) {
+
+                        ulint index_col_no = dict_index_get_nth_col_no(
+                                                index, col);
+                        if (col_no == index_col_no) {
+                                return(true);
+                        }
+                }
+        }
+
+        return(false);
+}
+
 /** Commit the changes made during prepare_inplace_alter_table()
 and inplace_alter_table() inside the data dictionary tables,
 when not rebuilding the table.
@@ -5056,6 +5111,21 @@ commit_try_norebuild(
 	DBUG_ASSERT(ctx->num_to_drop_fk
 		    == ha_alter_info->alter_info->drop_list.elements);
 
+
+        std::set<ulint> drop_list;
+        std::set<ulint>::iterator col_no;
+
+	/* Check if the column, part of an index to be dropped is part of any
+	other index which is not being dropped. If it so, then set the ord_part
+	of the column to 0. */
+        get_col_list_to_be_dropped(ctx, drop_list);
+
+        for(col_no = drop_list.begin(); col_no != drop_list.end(); ++col_no) {
+                if (!check_col_exists_in_indexes(ctx->new_table, *col_no)) {
+			ctx->new_table->cols[*col_no].ord_part = 0;
+                }
+        }
+
 	for (ulint i = 0; i < ctx->num_to_add_index; i++) {
 		dict_index_t*	index = ctx->add_index[i];
 		DBUG_ASSERT(dict_index_get_online_status(index)
