Merge branch 'mysql-5.6' into mysql-5.7

Author: Aakanksha Verma

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

@@ -18,3 +18,20 @@ c1	c2
 5	5
 6	6
 DROP TABLE t1;
+CREATE TABLE parent (a INT PRIMARY KEY, b INT NOT NULL) ENGINE = InnoDB;
+INSERT INTO parent VALUES(1,2),(2,2);
+CREATE TABLE child (a INT PRIMARY KEY, b INT NOT NULL) ENGINE = InnoDB;
+INSERT INTO child VALUES (10, 2);
+SET DEBUG_SYNC = 'innodb_inplace_alter_table_enter SIGNAL start_create
+WAIT_FOR go_ahead';
+CREATE UNIQUE INDEX idx ON parent(b);;
+SET DEBUG_SYNC = 'now WAIT_FOR start_create';
+INSERT INTO parent VALUES(4, 2);
+SET DEBUG_SYNC = 'now SIGNAL go_ahead';
+ERROR 23000: Duplicate entry '2' for key 'idx'
+SET DEBUG_SYNC = 'now SIGNAL conn_add_fk';
+SET DEBUG_SYNC = 'now WAIT_FOR conn_add_fk';
+ALTER TABLE child ADD CONSTRAINT cfx FOREIGN KEY (b) REFERENCES parent(b);
+ERROR HY000: Cannot add foreign key constraint
+DROP TABLE child;
+DROP TABLE parent;

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

@@ -33,3 +33,45 @@ DROP TABLE t1;
 # Clean up temporary files left by crash.
 let MYSQLD_DATADIR= `SELECT @@datadir`;
 --remove_files_wildcard $MYSQLD_DATADIR/test #sql*.frm
+
+#
+## Bug #26654685   INDEX->ID == BTR_PAGE_GET_INDEX_ID(PAGE)
+##		   AT BTR_CUR_SEARCH_TO_NTH_LEVEL IN BTR/B
+#
+
+--source include/have_debug.inc
+--source include/have_debug_sync.inc
+--source include/count_sessions.inc
+--source include/have_innodb_max_16k.inc
+
+CREATE TABLE parent (a INT PRIMARY KEY, b INT NOT NULL) ENGINE = InnoDB;
+INSERT INTO parent VALUES(1,2),(2,2);
+CREATE TABLE child (a INT PRIMARY KEY, b INT NOT NULL) ENGINE = InnoDB;
+INSERT INTO child VALUES (10, 2);
+
+# This should rollback due to dup key
+SET DEBUG_SYNC = 'innodb_inplace_alter_table_enter SIGNAL start_create
+WAIT_FOR go_ahead';
+--send CREATE UNIQUE INDEX idx ON parent(b);
+
+# Make table ref_count > 1
+connect (con1,localhost,root,,);
+connection con1;
+SET DEBUG_SYNC = 'now WAIT_FOR start_create';
+INSERT INTO parent VALUES(4, 2);
+SET DEBUG_SYNC = 'now SIGNAL go_ahead';
+
+connection default;
+--error ER_DUP_ENTRY
+reap;
+SET DEBUG_SYNC = 'now SIGNAL conn_add_fk';
+
+connection con1;
+SET DEBUG_SYNC = 'now WAIT_FOR conn_add_fk';
+--error ER_CANNOT_ADD_FOREIGN
+ALTER TABLE child ADD CONSTRAINT cfx FOREIGN KEY (b) REFERENCES parent(b);
+
+--connection default
+DROP TABLE child;
+DROP TABLE parent;
+--disconnect con1

storage/innobase/dict/dict0dict.cc

@@ -3666,6 +3666,11 @@ dict_foreign_find_index(
 		    && !(index->type & DICT_FTS)
 		    && !dict_index_is_spatial(index)
 		    && !index->to_be_dropped
+		    && (!(index->uncommitted
+			&& ((index->online_status
+			     ==  ONLINE_INDEX_ABORTED_DROPPED)
+			     || (index->online_status
+				== ONLINE_INDEX_ABORTED))))
 		    && dict_foreign_qualify_index(
 			    table, col_names, columns, n_cols,
 			    index, types_idx,