Merge 5.5 into 10.0

24 files changed, 36 insertions, 36 deletions

diff --git a/storage/innobase/btr/btr0btr.cc b/storage/innobase/btr/btr0btr.cc
index e75f116d458..c5fc4a58620 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 http://bugs.mysql.com\n",
+			" to https://jira.mariadb.org/\n",
 			(unsigned long) data_size1, (unsigned long) data_size2,
 			(unsigned long) max_ins_size1,
 			(unsigned long) max_ins_size2);
diff --git a/storage/innobase/ibuf/ibuf0ibuf.cc b/storage/innobase/ibuf/ibuf0ibuf.cc
index 4b772eedd8a..ba4cc0924b9 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 http://bugs.mysql.com\n", stderr);
+	      " to https://jira.mariadb.org/\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"
-		      " http://bugs.mysql.com!\n", stderr);
+		      " https://jira.mariadb.org/\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 http://bugs.mysql.com\n",
+			" to https://jira.mariadb.org/\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 http://bugs.mysql.com\n",
+				" to https://jira.mariadb.org/\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"
-			" http://bugs.mysql.com\n"
+			" https://jira.mariadb.org/\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 http://bugs.mysql.com\n\n",
+				" to https://jira.mariadb.org/\n\n",
 				(ulong) page_no,
 				(ulong)
 				fil_page_get_type(block->frame));
diff --git a/storage/innobase/include/mtr0log.ic b/storage/innobase/include/mtr0log.ic
index 3ed4876eeab..c7372d1d0f1 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 "
-				"bugs.mysql.com.\n",
+				"https://jira.mariadb.org/\n",
 				type, offset, space);
 			ut_ad(0);
 		}
diff --git a/storage/innobase/lock/lock0lock.cc b/storage/innobase/lock/lock0lock.cc
index a72db9e8e83..f5b7b35d749 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 http://bugs.mysql.com\n",
+		      " to https://jira.mariadb.org/\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 http://bugs.mysql.com\n",
+		      " to https://jira.mariadb.org/\n",
 		      stderr);
 		ut_ad(0);
 	}
diff --git a/storage/innobase/row/row0ins.cc b/storage/innobase/row/row0ins.cc
index d2e9e8f1940..47f09ac764b 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"
-			      " http://bugs.mysql.com\n", stderr);
+			      " https://jira.mariadb.org/\n", stderr);
 			ut_ad(0);
 			err = DB_SUCCESS;
 
diff --git a/storage/innobase/row/row0sel.cc b/storage/innobase/row/row0sel.cc
index f14424dd252..007e686bc79 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 http://bugs.mysql.com\n", stderr);
+			      " to https://jira.mariadb.org/\n", stderr);
 			ut_ad(0);
 		}
 
diff --git a/storage/innobase/row/row0umod.cc b/storage/innobase/row/row0umod.cc
index 77fa3cada2b..d8bb6955e60 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 http://bugs.mysql.com\n", stderr);
+			      " to https://jira.mariadb.org/\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 7151801783c..a650222e2a2 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 http://bugs.mysql.com\n", stderr);
+		      " to https://jira.mariadb.org/\n", stderr);
 		ut_ad(0);
 		break;
 	case ROW_FOUND:
diff --git a/storage/innobase/srv/srv0srv.cc b/storage/innobase/srv/srv0srv.cc
index e552e54846f..e8e77c1376a 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 http://bugs.mysql.com\n",
+				" to https://jira.mariadb.org\n",
 				old_lsn, new_lsn);
 			ut_ad(0);
 		}
diff --git a/storage/innobase/trx/trx0purge.cc b/storage/innobase/trx/trx0purge.cc
index cfe6309c36b..456e7357043 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 http://bugs.mysql.com\n",
+				" to https://jira.mariadb.org/\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 8701fbcc0f5..e3ab15e185f 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 http://bugs.mysql.com\n"
+				" to https://jira.mariadb.org/\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 a1cad144da4..a0bd82b385a 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 http://bugs.mysql.com.\n"
+	      " to https://jira.mariadb.org/\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 47a2fa9b2cb..d6fbba01202 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 http://bugs.mysql.com\n",
+			" to https://jira.mariadb.org/\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 fd17f531a16..fb5d4ffa3af 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 http://bugs.mysql.com\n", stderr);
+	      " to https://jira.mariadb.org/\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"
-		      " http://bugs.mysql.com!\n", stderr);
+		      " https://jira.mariadb.org/\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 http://bugs.mysql.com\n",
+			" to https://jira.mariadb.org/\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 http://bugs.mysql.com\n",
+				" to https://jira.mariadb.org/\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"
-			" http://bugs.mysql.com\n"
+			" https://jira.mariadb.org/\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 http://bugs.mysql.com\n\n",
+				" to https://jira.mariadb.org/\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 bc49f655294..72b961539f1 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 "
-				"bugs.mysql.com.\n",
+				"https://jira.mariadb.org/\n",
 				type, offset, space);
 			ut_ad(0);
 		}
diff --git a/storage/xtradb/lock/lock0lock.cc b/storage/xtradb/lock/lock0lock.cc
index 4f4fc37c645..1a2b15422bb 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 http://bugs.mysql.com\n",
+		      " to https://jira.mariadb.org/\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 http://bugs.mysql.com\n",
+		      " to https://jira.mariadb.org/\n",
 		      stderr);
 		ut_ad(0);
 	}
diff --git a/storage/xtradb/row/row0ins.cc b/storage/xtradb/row/row0ins.cc
index 20a68e7eca2..6dcb11c8bb5 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"
-			      " http://bugs.mysql.com\n", stderr);
+			      " https://jira.mariadb.org/\n", stderr);
 			ut_ad(0);
 			err = DB_SUCCESS;
 
diff --git a/storage/xtradb/row/row0sel.cc b/storage/xtradb/row/row0sel.cc
index a20b44de411..ec502234e32 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 http://bugs.mysql.com\n", stderr);
+			      " to https://jira.mariadb.org/\n", stderr);
 			ut_ad(0);
 		}
 
diff --git a/storage/xtradb/row/row0umod.cc b/storage/xtradb/row/row0umod.cc
index bd0a36e2240..eeb48b42621 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 http://bugs.mysql.com\n", stderr);
+			      " to https://jira.mariadb.org/\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 66fe55bbcce..0f520229a18 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 http://bugs.mysql.com\n", stderr);
+		      " to https://jira.mariadb.org/\n", stderr);
 		ut_ad(0);
 		break;
 	case ROW_FOUND:
diff --git a/storage/xtradb/srv/srv0srv.cc b/storage/xtradb/srv/srv0srv.cc
index 6a119756401..d79c29ffe97 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 http://bugs.mysql.com\n",
+				" to https://jira.mariadb.org\n",
 				old_lsn, new_lsn);
 			ut_ad(0);
 		}
diff --git a/storage/xtradb/trx/trx0purge.cc b/storage/xtradb/trx/trx0purge.cc
index a4463744a69..8d6982ad860 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 http://bugs.mysql.com\n",
+				" to https://jira.mariadb.org/\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 3193dfd81b5..4e0ba825ed2 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 http://bugs.mysql.com\n"
+				" to https://jira.mariadb.org/\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 a1cad144da4..a0bd82b385a 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 http://bugs.mysql.com.\n"
+	      " to https://jira.mariadb.org/\n"
 	      "InnoDB: If you get repeated assertion failures"
 	      " or crashes, even\n"
 	      "InnoDB: immediately after the mysqld startup, there may be\n"