Merge branch 'merge-innodb-5.6' into 10.0

33 files changed, 196 insertions, 70 deletions

diff --git a/storage/innobase/btr/btr0btr.cc b/storage/innobase/btr/btr0btr.cc
index c5fc4a58620..e75f116d458 100644
--- a/storage/innobase/btr/btr0btr.cc
+++ b/storage/innobase/btr/btr0btr.cc
@@ -1896,7 +1896,7 @@ btr_page_reorganize_low(
 			"InnoDB: Error: page old max ins size %lu"
 			" new max ins size %lu\n"
 			"InnoDB: Submit a detailed bug report"
-			" to https://jira.mariadb.org/\n",
+			" to http://bugs.mysql.com\n",
 			(unsigned long) data_size1, (unsigned long) data_size2,
 			(unsigned long) max_ins_size1,
 			(unsigned long) max_ins_size2);
diff --git a/storage/innobase/dict/dict0stats_bg.cc b/storage/innobase/dict/dict0stats_bg.cc
index 75214a1b2e9..f2760bd6a56 100644
--- a/storage/innobase/dict/dict0stats_bg.cc
+++ b/storage/innobase/dict/dict0stats_bg.cc
@@ -213,7 +213,7 @@ dict_stats_wait_bg_to_stop_using_table(
 				unlocking/locking the data dict */
 {
 	while (!dict_stats_stop_bg(table)) {
-		DICT_STATS_BG_YIELD(trx);
+		DICT_BG_YIELD(trx);
 	}
 }
 
diff --git a/storage/innobase/fts/fts0fts.cc b/storage/innobase/fts/fts0fts.cc
index d7798f386a4..c5281d26f13 100644
--- a/storage/innobase/fts/fts0fts.cc
+++ b/storage/innobase/fts/fts0fts.cc
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 2011, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2011, 2017, Oracle and/or its affiliates. All Rights Reserved.
 Copyright (c) 2016, 2017, MariaDB Corporation.
 
 This program is free software; you can redistribute it and/or modify it under
@@ -26,6 +26,7 @@ Full Text Search interface
 #include "row0mysql.h"
 #include "row0upd.h"
 #include "dict0types.h"
+#include "dict0stats_bg.h"
 #include "row0sel.h"
 
 #include "fts0fts.h"
@@ -868,18 +869,37 @@ fts_drop_index(
 
 			err = fts_drop_index_tables(trx, index);
 
-			fts_free(table);
-
+			for(;;) {
+				bool retry = false;
+				if (index->index_fts_syncing) {
+					retry = true;
+				}
+				if (!retry){
+					fts_free(table);
+					break;
+				}
+				DICT_BG_YIELD(trx);
+			}
 			return(err);
 		}
 
-		current_doc_id = table->fts->cache->next_doc_id;
-		first_doc_id = table->fts->cache->first_doc_id;
-		fts_cache_clear(table->fts->cache);
-		fts_cache_destroy(table->fts->cache);
-		table->fts->cache = fts_cache_create(table);
-		table->fts->cache->next_doc_id = current_doc_id;
-		table->fts->cache->first_doc_id = first_doc_id;
+		for(;;) {
+			bool retry = false;
+			if (index->index_fts_syncing) {
+				retry = true;
+			}
+			if (!retry){
+				current_doc_id = table->fts->cache->next_doc_id;
+				first_doc_id = table->fts->cache->first_doc_id;
+				fts_cache_clear(table->fts->cache);
+				fts_cache_destroy(table->fts->cache);
+				table->fts->cache = fts_cache_create(table);
+				table->fts->cache->next_doc_id = current_doc_id;
+				table->fts->cache->first_doc_id = first_doc_id;
+				break;
+			}
+			DICT_BG_YIELD(trx);
+		}
 	} else {
 		fts_cache_t*            cache = table->fts->cache;
 		fts_index_cache_t*      index_cache;
@@ -889,9 +909,17 @@ fts_drop_index(
 		index_cache = fts_find_index_cache(cache, index);
 
 		if (index_cache != NULL) {
-			if (index_cache->words) {
-				fts_words_free(index_cache->words);
-				rbt_free(index_cache->words);
+			for(;;) {
+				bool retry = false;
+				if (index->index_fts_syncing) {
+					retry = true;
+				}
+				if (!retry && index_cache->words) {
+					fts_words_free(index_cache->words);
+					rbt_free(index_cache->words);
+					break;
+				}
+				DICT_BG_YIELD(trx);
 			}
 
 			ib_vector_remove(cache->indexes, *(void**) index_cache);
@@ -4568,10 +4596,16 @@ begin_sync:
 		index_cache = static_cast<fts_index_cache_t*>(
 			ib_vector_get(cache->indexes, i));
 
-		if (index_cache->index->to_be_dropped) {
+		if (index_cache->index->to_be_dropped
+		   || index_cache->index->table->to_be_dropped) {
 			continue;
 		}
 
+		index_cache->index->index_fts_syncing = true;
+		DBUG_EXECUTE_IF("fts_instrument_sync_sleep_drop_waits",
+				os_thread_sleep(10000000);
+				);
+
 		error = fts_sync_index(sync, index_cache);
 
 		if (error != DB_SUCCESS && !sync->interrupted) {
@@ -4604,11 +4638,33 @@ begin_sync:
 end_sync:
 	if (error == DB_SUCCESS && !sync->interrupted) {
 		error = fts_sync_commit(sync);
+		if (error == DB_SUCCESS) {
+			for (i = 0; i < ib_vector_size(cache->indexes); ++i) {
+				fts_index_cache_t*      index_cache;
+				index_cache = static_cast<fts_index_cache_t*>(
+					ib_vector_get(cache->indexes, i));
+				if (index_cache->index->index_fts_syncing) {
+					index_cache->index->index_fts_syncing
+								= false;
+				}
+			}
+		}
 	}  else {
 		fts_sync_rollback(sync);
 	}
 
 	rw_lock_x_lock(&cache->lock);
+	/* Clear fts syncing flags of any indexes incase sync is
+	interrupeted */
+	for (i = 0; i < ib_vector_size(cache->indexes); ++i) {
+		fts_index_cache_t*      index_cache;
+		index_cache = static_cast<fts_index_cache_t*>(
+                      ib_vector_get(cache->indexes, i));
+		if (index_cache->index->index_fts_syncing == true) {
+			index_cache->index->index_fts_syncing = false;
+                  }
+	}
+
 	sync->interrupted = false;
 	sync->in_progress = false;
 	os_event_set(sync->event);
diff --git a/storage/innobase/fts/fts0opt.cc b/storage/innobase/fts/fts0opt.cc
index cb30122adcb..d9f96948000 100644
--- a/storage/innobase/fts/fts0opt.cc
+++ b/storage/innobase/fts/fts0opt.cc
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 2007, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2007, 2017, Oracle and/or its affiliates. All Rights Reserved.
 Copyright (c) 2016, MariaDB Corporation. All Rights reserved.
 
 This program is free software; you can redistribute it and/or modify it under
@@ -2971,13 +2971,6 @@ fts_optimize_sync_table(
 {
 	dict_table_t*   table = NULL;
 
-	/* Prevent DROP INDEX etc. from running when we are syncing
-	cache in background. */
-	if (!rw_lock_s_lock_nowait(&dict_operation_lock, __FILE__, __LINE__)) {
-		/* Exit when fail to get dict operation lock. */
-		return;
-	}
-
 	table = dict_table_open_on_id(table_id, FALSE, DICT_TABLE_OP_NORMAL);
 
 	if (table) {
@@ -2987,8 +2980,6 @@ fts_optimize_sync_table(
 
 		dict_table_close(table, FALSE, FALSE);
 	}
-
-	rw_lock_s_unlock(&dict_operation_lock);
 }
 
 /**********************************************************************//**
diff --git a/storage/innobase/fts/fts0que.cc b/storage/innobase/fts/fts0que.cc
index c74137031bb..b874309964b 100644
--- a/storage/innobase/fts/fts0que.cc
+++ b/storage/innobase/fts/fts0que.cc
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 2007, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2007, 2017, Oracle and/or its affiliates. All Rights Reserved.
 Copyright (c) 2017, MariaDB Corporation.
 
 This program is free software; you can redistribute it and/or modify it under
diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc
index 627cb1534d3..82eedddb280 100644
--- a/storage/innobase/handler/handler0alter.cc
+++ b/storage/innobase/handler/handler0alter.cc
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 2005, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2005, 2017, Oracle and/or its affiliates. All Rights Reserved.
 Copyright (c) 2017, MariaDB Corporation.
 
 This program is free software; you can redistribute it and/or modify it under
@@ -5769,7 +5769,47 @@ ha_innobase::commit_inplace_alter_table(
 			break;
 		}
 
-		DICT_STATS_BG_YIELD(trx);
+		DICT_BG_YIELD(trx);
+	}
+
+	/* Make a concurrent Drop fts Index to wait until sync of that
+	fts index is happening in the background */
+	for (;;) {
+		bool    retry = false;
+
+		for (inplace_alter_handler_ctx** pctx = ctx_array;
+		    *pctx; pctx++) {
+			int count =0;
+			ha_innobase_inplace_ctx*        ctx
+				= static_cast<ha_innobase_inplace_ctx*>(*pctx);
+			DBUG_ASSERT(new_clustered == ctx->need_rebuild());
+
+			if (dict_fts_index_syncing(ctx->old_table)) {
+				count++;
+				if (count == 100) {
+					fprintf(stderr,
+					"Drop index waiting for background sync"
+					"to finish\n");
+				}
+				retry = true;
+			}
+
+			if (new_clustered && dict_fts_index_syncing(ctx->new_table)) {
+				count++;
+				if (count == 100) {
+					fprintf(stderr,
+                                        "Drop index waiting for background sync"
+                                        "to finish\n");
+				}
+				retry = true;
+			}
+		}
+
+		 if (!retry) {
+			 break;
+		}
+
+		DICT_BG_YIELD(trx);
 	}
 
 	/* Apply the changes to the data dictionary tables, for all
@@ -6085,8 +6125,13 @@ foreign_fail:
 
 		ut_d(dict_table_check_for_dup_indexes(
 			     ctx->new_table, CHECK_ABORTED_OK));
-		ut_a(fts_check_cached_index(ctx->new_table));
 
+#ifdef UNIV_DEBUG
+		if (!(ctx->new_table->fts != NULL
+			&& ctx->new_table->fts->cache->sync->in_progress)) {
+			ut_a(fts_check_cached_index(ctx->new_table));
+		}
+#endif
 		if (new_clustered) {
 			/* Since the table has been rebuilt, we remove
 			all persistent statistics corresponding to the
diff --git a/storage/innobase/ibuf/ibuf0ibuf.cc b/storage/innobase/ibuf/ibuf0ibuf.cc
index ba4cc0924b9..4b772eedd8a 100644
--- a/storage/innobase/ibuf/ibuf0ibuf.cc
+++ b/storage/innobase/ibuf/ibuf0ibuf.cc
@@ -3972,7 +3972,7 @@ ibuf_insert_to_index_page_low(
 		(ulong) zip_size, (ulong) old_bits);
 
 	fputs("InnoDB: Submit a detailed bug report"
-	      " to https://jira.mariadb.org/\n", stderr);
+	      " to http://bugs.mysql.com\n", stderr);
 	ut_ad(0);
 	DBUG_RETURN(NULL);
 }
@@ -4045,7 +4045,7 @@ dump:
 		      " Please run CHECK TABLE on\n"
 		      "InnoDB: your tables.\n"
 		      "InnoDB: Submit a detailed bug report to"
-		      " https://jira.mariadb.org/\n", stderr);
+		      " http://bugs.mysql.com!\n", stderr);
 
 		DBUG_VOID_RETURN;
 	}
@@ -4221,7 +4221,7 @@ ibuf_set_del_mark(
 		fprintf(stderr, "\nspace %u offset %u"
 			" (%u records, index id %llu)\n"
 			"InnoDB: Submit a detailed bug report"
-			" to https://jira.mariadb.org/\n",
+			" to http://bugs.mysql.com\n",
 			(unsigned) buf_block_get_space(block),
 			(unsigned) buf_block_get_page_no(block),
 			(unsigned) page_get_n_recs(page),
@@ -4285,7 +4285,7 @@ ibuf_delete(
 			fprintf(stderr, "\nspace %u offset %u"
 				" (%u records, index id %llu)\n"
 				"InnoDB: Submit a detailed bug report"
-				" to https://jira.mariadb.org/\n",
+				" to http://bugs.mysql.com\n",
 				(unsigned) buf_block_get_space(block),
 				(unsigned) buf_block_get_page_no(block),
 				(unsigned) page_get_n_recs(page),
@@ -4356,7 +4356,7 @@ ibuf_restore_pos(
 	} else {
 		fprintf(stderr,
 			"InnoDB: ERROR: Submit the output to"
-			" https://jira.mariadb.org/\n"
+			" http://bugs.mysql.com\n"
 			"InnoDB: ibuf cursor restoration fails!\n"
 			"InnoDB: ibuf record inserted to page %lu:%lu\n",
 			(ulong) space, (ulong) page_no);
@@ -4665,7 +4665,7 @@ ibuf_merge_or_delete_for_page(
 				"InnoDB: to determine if they are corrupt"
 				" after this.\n\n"
 				"InnoDB: Please submit a detailed bug report"
-				" to https://jira.mariadb.org/\n\n",
+				" to http://bugs.mysql.com\n\n",
 				(ulong) page_no,
 				(ulong)
 				fil_page_get_type(block->frame));
diff --git a/storage/innobase/include/dict0dict.ic b/storage/innobase/include/dict0dict.ic
index 1ed231aa248..268eb2c56f8 100644
--- a/storage/innobase/include/dict0dict.ic
+++ b/storage/innobase/include/dict0dict.ic
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2017, 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
@@ -904,6 +904,27 @@ dict_table_x_lock_indexes(
 }
 
 /*********************************************************************//**
+Returns true if the particular FTS index in the table is still syncing
+in the background, false otherwise.
+@param [in] table      Table containing FTS index
+@return True if sync of fts index is still going in the background  */
+UNIV_INLINE
+bool
+dict_fts_index_syncing(
+	dict_table_t*   table)
+{
+	 dict_index_t*   index;
+
+	for (index = dict_table_get_first_index(table);
+	    index != NULL;
+	    index = dict_table_get_next_index(index)) {
+		if (index->index_fts_syncing) {
+			 return(true);
+		}
+	}
+	return(false);
+}
+/*********************************************************************//**
 Release the exclusive locks on all index tree. */
 UNIV_INLINE
 void
diff --git a/storage/innobase/include/dict0mem.h b/storage/innobase/include/dict0mem.h
index 10a57f620ad..5164149d826 100644
--- a/storage/innobase/include/dict0mem.h
+++ b/storage/innobase/include/dict0mem.h
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2017, Oracle and/or its affiliates. All Rights Reserved.
 Copyright (c) 2012, Facebook Inc.
 Copyright (c) 2015, 2016, MariaDB Corporation.
 
@@ -616,6 +616,8 @@ struct dict_index_t{
 				dict_sys->mutex. Other changes are
 				protected by index->lock. */
 	dict_field_t*	fields;	/*!< array of field descriptions */
+	bool            index_fts_syncing;/*!< Whether the fts index is
+					still syncing in the background */
 #ifndef UNIV_HOTBACKUP
 	UT_LIST_NODE_T(dict_index_t)
 			indexes;/*!< list of indexes of the table */
diff --git a/storage/innobase/include/dict0stats_bg.h b/storage/innobase/include/dict0stats_bg.h
index 2bd441d5f5e..69d61ea88f1 100644
--- a/storage/innobase/include/dict0stats_bg.h
+++ b/storage/innobase/include/dict0stats_bg.h
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 2012, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2012, 2017, Oracle and/or its affiliates. All Rights Reserved.
 Copyright (c) 2017, MariaDB Corporation.
 
 This program is free software; you can redistribute it and/or modify it under
@@ -61,7 +61,7 @@ dict_stats_recalc_pool_del(
 /** Yield the data dictionary latch when waiting
 for the background thread to stop accessing a table.
 @param trx	transaction holding the data dictionary locks */
-#define DICT_STATS_BG_YIELD(trx)	do {	\
+#define DICT_BG_YIELD(trx)	do {	\
 	row_mysql_unlock_data_dictionary(trx);	\
 	os_thread_sleep(250000);		\
 	row_mysql_lock_data_dictionary(trx);	\
diff --git a/storage/innobase/include/mtr0log.ic b/storage/innobase/include/mtr0log.ic
index c7372d1d0f1..3ed4876eeab 100644
--- a/storage/innobase/include/mtr0log.ic
+++ b/storage/innobase/include/mtr0log.ic
@@ -215,7 +215,7 @@ mlog_write_initial_log_record_fast(
 				"%d on page %lu of space %lu in the "
 				"doublewrite buffer, continuing anyway.\n"
 				"Please post a bug report to "
-				"https://jira.mariadb.org/\n",
+				"bugs.mysql.com.\n",
 				type, offset, space);
 			ut_ad(0);
 		}
diff --git a/storage/innobase/lock/lock0lock.cc b/storage/innobase/lock/lock0lock.cc
index f5b7b35d749..a72db9e8e83 100644
--- a/storage/innobase/lock/lock0lock.cc
+++ b/storage/innobase/lock/lock0lock.cc
@@ -1981,7 +1981,7 @@ lock_rec_enqueue_waiting(
 		dict_index_name_print(stderr, trx, index);
 		fputs(".\n"
 		      "InnoDB: Submit a detailed bug report"
-		      " to https://jira.mariadb.org/\n",
+		      " to http://bugs.mysql.com\n",
 		      stderr);
 		ut_ad(0);
 	}
@@ -4438,7 +4438,7 @@ lock_table_enqueue_waiting(
 		ut_print_name(stderr, trx, TRUE, table->name);
 		fputs(".\n"
 		      "InnoDB: Submit a detailed bug report"
-		      " to https://jira.mariadb.org/\n",
+		      " to http://bugs.mysql.com\n",
 		      stderr);
 		ut_ad(0);
 	}
diff --git a/storage/innobase/row/row0ins.cc b/storage/innobase/row/row0ins.cc
index 47f09ac764b..d2e9e8f1940 100644
--- a/storage/innobase/row/row0ins.cc
+++ b/storage/innobase/row/row0ins.cc
@@ -1129,7 +1129,7 @@ row_ins_foreign_check_on_constraint(
 			rec_print(stderr, clust_rec, clust_index);
 			fputs("\n"
 			      "InnoDB: Submit a detailed bug report to"
-			      " https://jira.mariadb.org/\n", stderr);
+			      " http://bugs.mysql.com\n", stderr);
 			ut_ad(0);
 			err = DB_SUCCESS;
 
diff --git a/storage/innobase/row/row0mysql.cc b/storage/innobase/row/row0mysql.cc
index 2215e4107e2..74a17b9a1c3 100644
--- a/storage/innobase/row/row0mysql.cc
+++ b/storage/innobase/row/row0mysql.cc
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 2000, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2000, 2017, Oracle and/or its affiliates. All Rights Reserved.
 Copyright (c) 2017, MariaDB Corporation.
 
 This program is free software; you can redistribute it and/or modify it under
@@ -57,6 +57,7 @@ Created 9/17/2000 Heikki Tuuri
 #include "log0log.h"
 #include "btr0sea.h"
 #include "fil0fil.h"
+#include "srv0srv.h"
 #include "ibuf0ibuf.h"
 #include "fts0fts.h"
 #include "fts0types.h"
@@ -3934,6 +3935,16 @@ row_drop_table_for_mysql(
 			ut_ad(!table->fts->add_wq);
 			ut_ad(lock_trx_has_sys_table_locks(trx) == 0);
 
+			for (;;) {
+				bool retry = false;
+				if (dict_fts_index_syncing(table)) {
+					retry = true;
+				}
+				if (!retry) {
+					break;
+				}
+				DICT_BG_YIELD(trx);
+			}
 			row_mysql_unlock_data_dictionary(trx);
 			fts_optimize_remove_table(table);
 			row_mysql_lock_data_dictionary(trx);
diff --git a/storage/innobase/row/row0sel.cc b/storage/innobase/row/row0sel.cc
index 007e686bc79..f14424dd252 100644
--- a/storage/innobase/row/row0sel.cc
+++ b/storage/innobase/row/row0sel.cc
@@ -3085,7 +3085,7 @@ row_sel_get_clust_rec_for_mysql(
 			trx_print(stderr, trx, 600);
 			fputs("\n"
 			      "InnoDB: Submit a detailed bug report"
-			      " to https://jira.mariadb.org/\n", stderr);
+			      " to http://bugs.mysql.com\n", stderr);
 			ut_ad(0);
 		}
 
diff --git a/storage/innobase/row/row0umod.cc b/storage/innobase/row/row0umod.cc
index d8bb6955e60..77fa3cada2b 100644
--- a/storage/innobase/row/row0umod.cc
+++ b/storage/innobase/row/row0umod.cc
@@ -676,7 +676,7 @@ row_undo_mod_del_unmark_sec_and_undo_update(
 			trx_print(stderr, trx, 0);
 			fputs("\n"
 			      "InnoDB: Submit a detailed bug report"
-			      " to https://jira.mariadb.org/\n", stderr);
+			      " to http://bugs.mysql.com\n", stderr);
 
 			ib_logf(IB_LOG_LEVEL_WARN,
 				"record in index %s was not found"
diff --git a/storage/innobase/row/row0upd.cc b/storage/innobase/row/row0upd.cc
index a650222e2a2..7151801783c 100644
--- a/storage/innobase/row/row0upd.cc
+++ b/storage/innobase/row/row0upd.cc
@@ -1781,7 +1781,7 @@ row_upd_sec_index_entry(
 		trx_print(stderr, trx, 0);
 		fputs("\n"
 		      "InnoDB: Submit a detailed bug report"
-		      " to https://jira.mariadb.org/\n", stderr);
+		      " to http://bugs.mysql.com\n", stderr);
 		ut_ad(0);
 		break;
 	case ROW_FOUND:
diff --git a/storage/innobase/srv/srv0srv.cc b/storage/innobase/srv/srv0srv.cc
index e8e77c1376a..e552e54846f 100644
--- a/storage/innobase/srv/srv0srv.cc
+++ b/storage/innobase/srv/srv0srv.cc
@@ -1791,7 +1791,7 @@ loop:
 				" was greater\n"
 				"InnoDB: than the new log sequence number " LSN_PF "!\n"
 				"InnoDB: Please submit a bug report"
-				" to https://jira.mariadb.org\n",
+				" to http://bugs.mysql.com\n",
 				old_lsn, new_lsn);
 			ut_ad(0);
 		}
diff --git a/storage/innobase/trx/trx0purge.cc b/storage/innobase/trx/trx0purge.cc
index 456e7357043..cfe6309c36b 100644
--- a/storage/innobase/trx/trx0purge.cc
+++ b/storage/innobase/trx/trx0purge.cc
@@ -604,7 +604,7 @@ trx_purge_rseg_get_next_history_log(
 				"InnoDB: but its length is still"
 				" reported as %lu! Make a detailed bug\n"
 				"InnoDB: report, and submit it"
-				" to https://jira.mariadb.org/\n",
+				" to http://bugs.mysql.com\n",
 				(ulong) trx_sys->rseg_history_len);
 			ut_ad(0);
 		}
diff --git a/storage/innobase/trx/trx0rec.cc b/storage/innobase/trx/trx0rec.cc
index e3ab15e185f..8701fbcc0f5 100644
--- a/storage/innobase/trx/trx0rec.cc
+++ b/storage/innobase/trx/trx0rec.cc
@@ -1021,7 +1021,7 @@ trx_undo_update_rec_get_update(
 			fprintf(stderr, "\n"
 				"InnoDB: but index has only %lu fields\n"
 				"InnoDB: Submit a detailed bug report"
-				" to https://jira.mariadb.org/\n"
+				" to http://bugs.mysql.com\n"
 				"InnoDB: Run also CHECK TABLE ",
 				(ulong) dict_index_get_n_fields(index));
 			ut_print_name(stderr, trx, TRUE, index->table_name);
diff --git a/storage/innobase/ut/ut0dbg.cc b/storage/innobase/ut/ut0dbg.cc
index a0bd82b385a..a1cad144da4 100644
--- a/storage/innobase/ut/ut0dbg.cc
+++ b/storage/innobase/ut/ut0dbg.cc
@@ -63,7 +63,7 @@ ut_dbg_assertion_failed(
 
 	fputs("InnoDB: We intentionally generate a memory trap.\n"
 	      "InnoDB: Submit a detailed bug report"
-	      " to https://jira.mariadb.org/\n"
+	      " to http://bugs.mysql.com.\n"
 	      "InnoDB: If you get repeated assertion failures"
 	      " or crashes, even\n"
 	      "InnoDB: immediately after the mysqld startup, there may be\n"
diff --git a/storage/xtradb/btr/btr0btr.cc b/storage/xtradb/btr/btr0btr.cc
index d6fbba01202..47a2fa9b2cb 100644
--- a/storage/xtradb/btr/btr0btr.cc
+++ b/storage/xtradb/btr/btr0btr.cc
@@ -1940,7 +1940,7 @@ btr_page_reorganize_low(
 			"InnoDB: Error: page old max ins size %lu"
 			" new max ins size %lu\n"
 			"InnoDB: Submit a detailed bug report"
-			" to https://jira.mariadb.org/\n",
+			" to http://bugs.mysql.com\n",
 			(unsigned long) data_size1, (unsigned long) data_size2,
 			(unsigned long) max_ins_size1,
 			(unsigned long) max_ins_size2);
diff --git a/storage/xtradb/ibuf/ibuf0ibuf.cc b/storage/xtradb/ibuf/ibuf0ibuf.cc
index fb5d4ffa3af..fd17f531a16 100644
--- a/storage/xtradb/ibuf/ibuf0ibuf.cc
+++ b/storage/xtradb/ibuf/ibuf0ibuf.cc
@@ -4014,7 +4014,7 @@ ibuf_insert_to_index_page_low(
 		(ulong) zip_size, (ulong) old_bits);
 
 	fputs("InnoDB: Submit a detailed bug report"
-	      " to https://jira.mariadb.org/\n", stderr);
+	      " to http://bugs.mysql.com\n", stderr);
 	ut_ad(0);
 	DBUG_RETURN(NULL);
 }
@@ -4087,7 +4087,7 @@ dump:
 		      " Please run CHECK TABLE on\n"
 		      "InnoDB: your tables.\n"
 		      "InnoDB: Submit a detailed bug report to"
-		      " https://jira.mariadb.org/\n", stderr);
+		      " http://bugs.mysql.com!\n", stderr);
 
 		DBUG_VOID_RETURN;
 	}
@@ -4263,7 +4263,7 @@ ibuf_set_del_mark(
 		fprintf(stderr, "\nspace %u offset %u"
 			" (%u records, index id %llu)\n"
 			"InnoDB: Submit a detailed bug report"
-			" to https://jira.mariadb.org/\n",
+			" to http://bugs.mysql.com\n",
 			(unsigned) buf_block_get_space(block),
 			(unsigned) buf_block_get_page_no(block),
 			(unsigned) page_get_n_recs(page),
@@ -4327,7 +4327,7 @@ ibuf_delete(
 			fprintf(stderr, "\nspace %u offset %u"
 				" (%u records, index id %llu)\n"
 				"InnoDB: Submit a detailed bug report"
-				" to https://jira.mariadb.org/\n",
+				" to http://bugs.mysql.com\n",
 				(unsigned) buf_block_get_space(block),
 				(unsigned) buf_block_get_page_no(block),
 				(unsigned) page_get_n_recs(page),
@@ -4398,7 +4398,7 @@ ibuf_restore_pos(
 	} else {
 		fprintf(stderr,
 			"InnoDB: ERROR: Submit the output to"
-			" https://jira.mariadb.org/\n"
+			" http://bugs.mysql.com\n"
 			"InnoDB: ibuf cursor restoration fails!\n"
 			"InnoDB: ibuf record inserted to page %lu:%lu\n",
 			(ulong) space, (ulong) page_no);
@@ -4707,7 +4707,7 @@ ibuf_merge_or_delete_for_page(
 				"InnoDB: to determine if they are corrupt"
 				" after this.\n\n"
 				"InnoDB: Please submit a detailed bug report"
-				" to https://jira.mariadb.org/\n\n",
+				" to http://bugs.mysql.com\n\n",
 				(ulong) page_no,
 				(ulong)
 				fil_page_get_type(block->frame));
diff --git a/storage/xtradb/include/mtr0log.ic b/storage/xtradb/include/mtr0log.ic
index 72b961539f1..bc49f655294 100644
--- a/storage/xtradb/include/mtr0log.ic
+++ b/storage/xtradb/include/mtr0log.ic
@@ -216,7 +216,7 @@ mlog_write_initial_log_record_fast(
 				"%d on page %lu of space %lu in the "
 				"doublewrite buffer, continuing anyway.\n"
 				"Please post a bug report to "
-				"https://jira.mariadb.org/\n",
+				"bugs.mysql.com.\n",
 				type, offset, space);
 			ut_ad(0);
 		}
diff --git a/storage/xtradb/lock/lock0lock.cc b/storage/xtradb/lock/lock0lock.cc
index 1a2b15422bb..4f4fc37c645 100644
--- a/storage/xtradb/lock/lock0lock.cc
+++ b/storage/xtradb/lock/lock0lock.cc
@@ -2008,7 +2008,7 @@ lock_rec_enqueue_waiting(
 		dict_index_name_print(stderr, trx, index);
 		fputs(".\n"
 		      "InnoDB: Submit a detailed bug report"
-		      " to https://jira.mariadb.org/\n",
+		      " to http://bugs.mysql.com\n",
 		      stderr);
 		ut_ad(0);
 	}
@@ -4475,7 +4475,7 @@ lock_table_enqueue_waiting(
 		ut_print_name(stderr, trx, TRUE, table->name);
 		fputs(".\n"
 		      "InnoDB: Submit a detailed bug report"
-		      " to https://jira.mariadb.org/\n",
+		      " to http://bugs.mysql.com\n",
 		      stderr);
 		ut_ad(0);
 	}
diff --git a/storage/xtradb/row/row0ins.cc b/storage/xtradb/row/row0ins.cc
index 6dcb11c8bb5..20a68e7eca2 100644
--- a/storage/xtradb/row/row0ins.cc
+++ b/storage/xtradb/row/row0ins.cc
@@ -1135,7 +1135,7 @@ row_ins_foreign_check_on_constraint(
 			rec_print(stderr, clust_rec, clust_index);
 			fputs("\n"
 			      "InnoDB: Submit a detailed bug report to"
-			      " https://jira.mariadb.org/\n", stderr);
+			      " http://bugs.mysql.com\n", stderr);
 			ut_ad(0);
 			err = DB_SUCCESS;
 
diff --git a/storage/xtradb/row/row0sel.cc b/storage/xtradb/row/row0sel.cc
index ec502234e32..a20b44de411 100644
--- a/storage/xtradb/row/row0sel.cc
+++ b/storage/xtradb/row/row0sel.cc
@@ -3104,7 +3104,7 @@ row_sel_get_clust_rec_for_mysql(
 			trx_print(stderr, trx, 600);
 			fputs("\n"
 			      "InnoDB: Submit a detailed bug report"
-			      " to https://jira.mariadb.org/\n", stderr);
+			      " to http://bugs.mysql.com\n", stderr);
 			ut_ad(0);
 		}
 
diff --git a/storage/xtradb/row/row0umod.cc b/storage/xtradb/row/row0umod.cc
index eeb48b42621..bd0a36e2240 100644
--- a/storage/xtradb/row/row0umod.cc
+++ b/storage/xtradb/row/row0umod.cc
@@ -646,7 +646,7 @@ row_undo_mod_del_unmark_sec_and_undo_update(
 			trx_print(stderr, trx, 0);
 			fputs("\n"
 			      "InnoDB: Submit a detailed bug report"
-			      " to https://jira.mariadb.org/\n", stderr);
+			      " to http://bugs.mysql.com\n", stderr);
 
 			ib_logf(IB_LOG_LEVEL_WARN,
 				"record in index %s was not found"
diff --git a/storage/xtradb/row/row0upd.cc b/storage/xtradb/row/row0upd.cc
index 0f520229a18..66fe55bbcce 100644
--- a/storage/xtradb/row/row0upd.cc
+++ b/storage/xtradb/row/row0upd.cc
@@ -1786,7 +1786,7 @@ row_upd_sec_index_entry(
 		trx_print(stderr, trx, 0);
 		fputs("\n"
 		      "InnoDB: Submit a detailed bug report"
-		      " to https://jira.mariadb.org/\n", stderr);
+		      " to http://bugs.mysql.com\n", stderr);
 		ut_ad(0);
 		break;
 	case ROW_FOUND:
diff --git a/storage/xtradb/srv/srv0srv.cc b/storage/xtradb/srv/srv0srv.cc
index d79c29ffe97..6a119756401 100644
--- a/storage/xtradb/srv/srv0srv.cc
+++ b/storage/xtradb/srv/srv0srv.cc
@@ -2225,7 +2225,7 @@ loop:
 				" was greater\n"
 				"InnoDB: than the new log sequence number " LSN_PF "!\n"
 				"InnoDB: Please submit a bug report"
-				" to https://jira.mariadb.org\n",
+				" to http://bugs.mysql.com\n",
 				old_lsn, new_lsn);
 			ut_ad(0);
 		}
diff --git a/storage/xtradb/trx/trx0purge.cc b/storage/xtradb/trx/trx0purge.cc
index 8d6982ad860..a4463744a69 100644
--- a/storage/xtradb/trx/trx0purge.cc
+++ b/storage/xtradb/trx/trx0purge.cc
@@ -608,7 +608,7 @@ trx_purge_rseg_get_next_history_log(
 				"InnoDB: but its length is still"
 				" reported as %lu! Make a detailed bug\n"
 				"InnoDB: report, and submit it"
-				" to https://jira.mariadb.org/\n",
+				" to http://bugs.mysql.com\n",
 				(ulong) trx_sys->rseg_history_len);
 			ut_ad(0);
 		}
diff --git a/storage/xtradb/trx/trx0rec.cc b/storage/xtradb/trx/trx0rec.cc
index 4e0ba825ed2..3193dfd81b5 100644
--- a/storage/xtradb/trx/trx0rec.cc
+++ b/storage/xtradb/trx/trx0rec.cc
@@ -1022,7 +1022,7 @@ trx_undo_update_rec_get_update(
 			fprintf(stderr, "\n"
 				"InnoDB: but index has only %lu fields\n"
 				"InnoDB: Submit a detailed bug report"
-				" to https://jira.mariadb.org/\n"
+				" to http://bugs.mysql.com\n"
 				"InnoDB: Run also CHECK TABLE ",
 				(ulong) dict_index_get_n_fields(index));
 			ut_print_name(stderr, trx, TRUE, index->table_name);
diff --git a/storage/xtradb/ut/ut0dbg.cc b/storage/xtradb/ut/ut0dbg.cc
index a0bd82b385a..a1cad144da4 100644
--- a/storage/xtradb/ut/ut0dbg.cc
+++ b/storage/xtradb/ut/ut0dbg.cc
@@ -63,7 +63,7 @@ ut_dbg_assertion_failed(
 
 	fputs("InnoDB: We intentionally generate a memory trap.\n"
 	      "InnoDB: Submit a detailed bug report"
-	      " to https://jira.mariadb.org/\n"
+	      " to http://bugs.mysql.com.\n"
 	      "InnoDB: If you get repeated assertion failures"
 	      " or crashes, even\n"
 	      "InnoDB: immediately after the mysqld startup, there may be\n"