Merge branch 'mysql-5.6' into mysql-5.7

Author: sachinagarwal1111

mysql-test/suite/innodb/r/innodb-alter.result

@@ -825,3 +825,24 @@ ALTER TABLE t1 DROP KEY idx, ADD UNIQUE KEY uidx (col1);
 ERROR 23000: Duplicate entry '2' for key 'uidx'
 DELETE FROM t1 WHERE col1 = 2;
 DROP TABLE t1;
+#
+# BUG #26334149 MYSQL CRASHES WHEN FULL TEXT INDEXES IBD FILES ARE
+# ORPHANED DUE TO RENAME TABLE
+#
+CREATE DATABASE db1;
+USE db1;
+CREATE TABLE `notes` (
+`id` int(11) NOT NULL AUTO_INCREMENT,
+`body` text COLLATE utf8_unicode_ci,
+PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8
+COLLATE=utf8_unicode_ci
+ROW_FORMAT=COMPRESSED;
+ALTER TABLE notes ADD FULLTEXT INDEX `index_ft_body` (body(255));
+Warnings:
+Warning	124	InnoDB rebuilding table to add column FTS_DOC_ID
+DROP INDEX index_ft_body ON notes;
+CREATE DATABASE db2;
+RENAME TABLE db1.notes TO db2.notes;
+DROP DATABASE db1;
+DROP DATABASE db2;

mysql-test/suite/innodb/t/innodb-alter.test

@@ -464,3 +464,24 @@ INSERT INTO t1 (col1, col2) VALUES (2 , 'A');
 ALTER TABLE t1 DROP KEY idx, ADD UNIQUE KEY uidx (col1);
 DELETE FROM t1 WHERE col1 = 2;
 DROP TABLE t1;
+
+--echo #
+--echo # BUG #26334149 MYSQL CRASHES WHEN FULL TEXT INDEXES IBD FILES ARE
+--echo # ORPHANED DUE TO RENAME TABLE
+--echo #
+CREATE DATABASE db1; USE db1;
+CREATE TABLE notes (
+   id int(11) NOT NULL AUTO_INCREMENT,
+   body text COLLATE utf8_unicode_ci,
+   PRIMARY KEY (`id`)
+   ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8
+COLLATE=utf8_unicode_ci
+ROW_FORMAT=COMPRESSED;
+
+ALTER TABLE notes ADD FULLTEXT INDEX index_ft_body (body(255));
+DROP INDEX index_ft_body ON notes;
+
+CREATE DATABASE db2;
+RENAME TABLE db1.notes TO db2.notes;
+DROP DATABASE db1;
+DROP DATABASE db2;

storage/innobase/row/row0mysql.cc

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 2000, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2000, 2018, 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 as published by the Free Software
@@ -5506,8 +5506,9 @@ row_rename_table_for_mysql(
 		}
 	}
 
-	if (dict_table_has_fts_index(table)
-	    && !dict_tables_have_same_db(old_name, new_name)) {
+	if ((dict_table_has_fts_index(table)
+		|| DICT_TF2_FLAG_IS_SET(table, DICT_TF2_FTS_HAS_DOC_ID))
+		&& !dict_tables_have_same_db(old_name, new_name)) {
 		err = fts_rename_aux_tables(table, new_name, trx);
 		if (err != DB_TABLE_NOT_FOUND) {
 			aux_fts_rename = true;