Merge 11.4 into 11.8

Author: dr-m

extra/mariabackup/xtrabackup.cc

@@ -664,11 +664,12 @@ void CorruptedPages::zero_out_free_pages()
     if (!space)
       die("Can't find space object for space name %s to check corrupted page",
           space_name.c_str());
+    mtr_t mtr{nullptr};
     for (std::set<unsigned>::const_iterator page_it=
              space_it->second.pages.begin();
          page_it != space_it->second.pages.end(); ++page_it)
     {
-      if (fseg_page_is_allocated(space, *page_it))
+      if (fseg_page_is_allocated(&mtr, space, *page_it))
       {
         space_info_t &space_info = non_free_pages[space_id];
         space_info.pages.insert(*page_it);

mysql-test/main/rowid_filter_innodb,ahi.rdiff

@@ -13,17 +13,17 @@
            "r_table_time_ms": "REPLACED",
            "r_other_time_ms": "REPLACED",
            "r_engine_stats": {
--            "pages_accessed": 84
-+            "pages_accessed": 6
+-            "pages_accessed": 90
++            "pages_accessed": 51
            },
            "filtered": "REPLACED",
            "r_total_filtered": 2.43902439,
 @@ -2227,7 +2227,7 @@
            "r_table_time_ms": "REPLACED",
            "r_other_time_ms": "REPLACED",
            "r_engine_stats": {
--            "pages_accessed": 84
-+            "pages_accessed": 2
+-            "pages_accessed": 90
++            "pages_accessed": 49
            },
            "filtered": "REPLACED",
            "r_total_filtered": 2.43902439,

mysql-test/main/rowid_filter_innodb.result

@@ -2061,7 +2061,7 @@ ANALYZE
           "r_table_time_ms": "REPLACED",
           "r_other_time_ms": "REPLACED",
           "r_engine_stats": {
-            "pages_accessed": 84
+            "pages_accessed": 90
           },
           "filtered": "REPLACED",
           "r_total_filtered": 2.43902439,
@@ -2093,7 +2093,7 @@ ANALYZE
           "r_table_time_ms": "REPLACED",
           "r_other_time_ms": "REPLACED",
           "r_engine_stats": {
-            "pages_accessed": 2
+            "pages_accessed": 4
           },
           "filtered": "REPLACED",
           "r_total_filtered": 66.66666667,
@@ -2229,7 +2229,7 @@ ANALYZE
           "r_table_time_ms": "REPLACED",
           "r_other_time_ms": "REPLACED",
           "r_engine_stats": {
-            "pages_accessed": 84
+            "pages_accessed": 90
           },
           "filtered": "REPLACED",
           "r_total_filtered": 2.43902439,
@@ -2261,7 +2261,7 @@ ANALYZE
           "r_table_time_ms": "REPLACED",
           "r_other_time_ms": "REPLACED",
           "r_engine_stats": {
-            "pages_accessed": 2
+            "pages_accessed": 4
           },
           "filtered": "REPLACED",
           "r_total_filtered": 66.66666667,

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

@@ -4,21 +4,26 @@ insert into t1 values(1, 2);
 insert into t2 values(1, 2);
 SET GLOBAL innodb_fast_shutdown = 0;
 # restart: --innodb-force-recovery=4
-SELECT CAST(variable_value AS INTEGER) INTO @read1
-FROM INFORMATION_SCHEMA.GLOBAL_STATUS
-WHERE VARIABLE_NAME='innodb_buffer_pool_read_requests';
+select variable_name,variable_value from information_schema.global_status
+WHERE variable_name LIKE 'innodb_buffer_pool_%_requests';
+variable_name	variable_value
+INNODB_BUFFER_POOL_READ_REQUESTS	0
+INNODB_BUFFER_POOL_WRITE_REQUESTS	0
 select * from t1;
 f1	f2
 1	2
-SELECT CAST(variable_value AS INTEGER) INTO @read2
-FROM INFORMATION_SCHEMA.GLOBAL_STATUS
-WHERE VARIABLE_NAME='innodb_buffer_pool_read_requests';
-SELECT @read1>0, @read2>@read1;
-@read1>0	@read2>@read1
-1	1
+select variable_name from information_schema.global_status
+WHERE variable_name LIKE 'innodb_buffer_pool_%_requests' and variable_value>0;
+variable_name
+INNODB_BUFFER_POOL_READ_REQUESTS
 begin;
 insert into t1 values(2, 3);
 rollback;
+select variable_name from information_schema.global_status
+WHERE variable_name LIKE 'innodb_buffer_pool_%_requests' and variable_value>0;
+variable_name
+INNODB_BUFFER_POOL_READ_REQUESTS
+INNODB_BUFFER_POOL_WRITE_REQUESTS
 alter table t1 add f3 int not null, algorithm=copy;
 alter table t1 add f4 int not null, algorithm=inplace;
 drop index idx on t1;

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

@@ -21,25 +21,17 @@ SET GLOBAL innodb_fast_shutdown = 0;
 --source include/restart_mysqld.inc
 let $status=`SHOW ENGINE INNODB STATUS`;
 
---disable_cursor_protocol
-SELECT CAST(variable_value AS INTEGER) INTO @read1
-FROM INFORMATION_SCHEMA.GLOBAL_STATUS
-WHERE VARIABLE_NAME='innodb_buffer_pool_read_requests';
---enable_cursor_protocol
-
+select variable_name,variable_value from information_schema.global_status
+WHERE variable_name LIKE 'innodb_buffer_pool_%_requests';
 select * from t1;
-
---disable_cursor_protocol
-SELECT CAST(variable_value AS INTEGER) INTO @read2
-FROM INFORMATION_SCHEMA.GLOBAL_STATUS
-WHERE VARIABLE_NAME='innodb_buffer_pool_read_requests';
---enable_cursor_protocol
-
-SELECT @read1>0, @read2>@read1;
+select variable_name from information_schema.global_status
+WHERE variable_name LIKE 'innodb_buffer_pool_%_requests' and variable_value>0;
 
 begin;
 insert into t1 values(2, 3);
 rollback;
+select variable_name from information_schema.global_status
+WHERE variable_name LIKE 'innodb_buffer_pool_%_requests' and variable_value>0;
 
 alter table t1 add f3 int not null, algorithm=copy;
 

storage/innobase/btr/btr0btr.cc

@@ -38,6 +38,7 @@ Created 6/2/1994 Heikki Tuuri
 #include "lock0lock.h"
 #include "trx0trx.h"
 #include "srv0mon.h"
+#include "que0que.h"
 #include "gis0geo.h"
 #include "dict0boot.h"
 #include "row0sel.h" /* row_search_max_autoinc() */
@@ -371,14 +372,13 @@ btr_root_fseg_adjust_on_import(
 
 /**************************************************************//**
 Checks and adjusts the root node of a tree during IMPORT TABLESPACE.
-@return error code, or DB_SUCCESS */
-dberr_t
-btr_root_adjust_on_import(
-/*======================*/
-	const dict_index_t*	index)	/*!< in: index tree */
+@param trx    transaction
+@param index  index tree
+@return error code */
+dberr_t btr_root_adjust_on_import(trx_t *trx, const dict_index_t *index)
 {
 	dberr_t			err;
-	mtr_t			mtr;
+	mtr_t			mtr{trx};
 	page_t*			page;
 	page_zip_des_t*		page_zip;
 	dict_table_t*		table = index->table;
@@ -1006,25 +1006,25 @@ btr_create(
 /** Free a B-tree except the root page. The root page MUST be freed after
 this by calling btr_free_root.
 @param[in,out]	block		root page
-@param[in]	log_mode	mtr logging mode */
+@param[in]	outer_mtr	surrounding mini-transaction */
 static
 void
 btr_free_but_not_root(
 	buf_block_t*	block,
-	mtr_log_t	log_mode
+	const mtr_t&	outer_mtr
 #ifdef BTR_CUR_HASH_ADAPT
 	,bool		ahi=false
 #endif
 	)
 {
-	mtr_t	mtr;
+	mtr_t mtr{outer_mtr.trx};
 
 	ut_ad(fil_page_index_page_check(block->page.frame));
 	ut_ad(!page_has_siblings(block->page.frame));
 leaf_loop:
 	mtr_start(&mtr);
 	ut_d(mtr.freeing_tree());
-	mtr_set_log_mode(&mtr, log_mode);
+	mtr_set_log_mode(&mtr, outer_mtr.get_log_mode());
 	fil_space_t *space = mtr.set_named_space_id(block->page.id().space());
 
 	if (!btr_root_fseg_validate(FIL_PAGE_DATA + PAGE_BTR_SEG_LEAF,
@@ -1052,7 +1052,7 @@ btr_free_but_not_root(
 	}
 top_loop:
 	mtr_start(&mtr);
-	mtr_set_log_mode(&mtr, log_mode);
+	mtr_set_log_mode(&mtr, outer_mtr.get_log_mode());
 	space = mtr.set_named_space_id(block->page.id().space());
 
 	finished = !btr_root_fseg_validate(FIL_PAGE_DATA + PAGE_BTR_SEG_TOP,
@@ -1071,16 +1071,13 @@ btr_free_but_not_root(
 	}
 }
 
-#ifdef BTR_CUR_HASH_ADAPT
-TRANSACTIONAL_TARGET
-#endif
 /** Clear the index tree and reinitialize the root page, in the
 rollback of TRX_UNDO_EMPTY. The BTR_SEG_LEAF is freed and reinitialized.
 @param thr query thread
 @return error code */
 dberr_t dict_index_t::clear(que_thr_t *thr)
 {
-  mtr_t mtr;
+  mtr_t mtr{thr_get_trx(thr)};
   mtr.start();
   if (table->is_temporary())
     mtr.set_log_mode(MTR_LOG_NO_REDO);
@@ -1101,7 +1098,7 @@ dberr_t dict_index_t::clear(que_thr_t *thr)
                                RW_X_LATCH, guess, BUF_GET, &mtr, &err);
   if (root_block)
   {
-    btr_free_but_not_root(root_block, mtr.get_log_mode()
+    btr_free_but_not_root(root_block, mtr
 #ifdef BTR_CUR_HASH_ADAPT
 		          ,any_ahi_pages()
 #endif
@@ -1133,19 +1130,20 @@ void btr_free_if_exists(fil_space_t *space, uint32_t page,
 					     space->zip_size(),
 					     index_id, mtr))
   {
-    btr_free_but_not_root(root, mtr->get_log_mode());
+    btr_free_but_not_root(root, *mtr);
     mtr->set_named_space(space);
     btr_free_root(root, *space, mtr);
   }
 }
 
 /** Drop a temporary table
+@param trx    transaction
 @param table   temporary table */
-void btr_drop_temporary_table(const dict_table_t &table)
+void btr_drop_temporary_table(trx_t *trx, const dict_table_t &table)
 {
   ut_ad(table.is_temporary());
   ut_ad(table.space == fil_system.temp_space);
-  mtr_t mtr;
+  mtr_t mtr{trx};
   mtr.start();
   for (const dict_index_t *index= table.indexes.start; index;
        index= dict_table_get_next_index(index))
@@ -1159,8 +1157,8 @@ void btr_drop_temporary_table(const dict_table_t &table)
                                              0, RW_X_LATCH, guess, BUF_GET,
                                              &mtr, nullptr))
     {
-      btr_free_but_not_root(block, MTR_LOG_NO_REDO);
       mtr.set_log_mode(MTR_LOG_NO_REDO);
+      btr_free_but_not_root(block, mtr);
       btr_free_root(block, *fil_system.temp_space, &mtr);
       mtr.commit();
       mtr.start();
@@ -1179,7 +1177,7 @@ btr_read_autoinc(dict_index_t* index)
   ut_ad(index->is_primary());
   ut_ad(index->table->persistent_autoinc);
   ut_ad(!index->table->is_temporary());
-  mtr_t mtr;
+  mtr_t mtr{nullptr};
   mtr.start();
   dberr_t err;
   uint64_t autoinc;
@@ -1217,7 +1215,7 @@ uint64_t btr_read_autoinc_with_fallback(const dict_table_t *table,
   ut_ad(!table->is_temporary());
 
   uint64_t autoinc= 0;
-  mtr_t mtr;
+  mtr_t mtr{nullptr};
   mtr.start();
   const dict_index_t *const first_index= dict_table_get_first_index(table);
 
@@ -1260,19 +1258,20 @@ uint64_t btr_read_autoinc_with_fallback(const dict_table_t *table,
 }
 
 /** Write the next available AUTO_INCREMENT value to PAGE_ROOT_AUTO_INC.
+@param[in,out]	trx	transaction
 @param[in,out]	index	clustered index
 @param[in]	autoinc	the AUTO_INCREMENT value
 @param[in]	reset	whether to reset the AUTO_INCREMENT
 			to a possibly smaller value than currently
 			exists in the page */
-void
-btr_write_autoinc(dict_index_t* index, ib_uint64_t autoinc, bool reset)
+void btr_write_autoinc(trx_t *trx, dict_index_t *index, uint64_t autoinc,
+                       bool reset)
 {
   ut_ad(index->is_primary());
   ut_ad(index->table->persistent_autoinc);
   ut_ad(!index->table->is_temporary());
 
-  mtr_t mtr;
+  mtr_t mtr{trx};
   mtr.start();
   fil_space_t *space= index->table->space;
   if (buf_block_t *root= buf_page_get(page_id_t(space->id, index->page),
@@ -4360,8 +4359,6 @@ btr_print_index(
 	}
 
 	mtr_commit(&mtr);
-
-	ut_ad(btr_validate_index(index, 0));
 }
 #endif /* UNIV_BTR_PRINT */
 
@@ -4706,7 +4703,7 @@ dberr_t
 btr_validate_level(
 /*===============*/
 	dict_index_t*	index,	/*!< in: index tree */
-	const trx_t*	trx,	/*!< in: transaction or NULL */
+	trx_t*		trx,	/*!< in: transaction */
 	ulint		level)	/*!< in: level number */
 {
 	buf_block_t*	block;
@@ -4719,7 +4716,7 @@ btr_validate_level(
 	rec_t*		rec;
 	page_cur_t	cursor;
 	dtuple_t*	node_ptr_tuple;
-	mtr_t		mtr;
+	mtr_t		mtr{trx};
 	mem_heap_t*	heap	= mem_heap_create(256);
 	rec_offs*	offsets	= NULL;
 	rec_offs*	offsets2= NULL;
@@ -4744,7 +4741,7 @@ btr_validate_level(
 	while (level != btr_page_get_level(page)) {
 		const rec_t*	node_ptr;
 		switch (dberr_t e =
-			fseg_page_is_allocated(space,
+			fseg_page_is_allocated(&mtr, space,
 					       block->page.id().page_no())) {
 		case DB_SUCCESS_LOCKED_REC:
 			break;
@@ -4834,7 +4831,8 @@ btr_validate_level(
 #endif /* UNIV_ZIP_DEBUG */
 
 	if (DB_SUCCESS_LOCKED_REC
-	    != fseg_page_is_allocated(space, block->page.id().page_no())) {
+	    != fseg_page_is_allocated(&mtr, space,
+				      block->page.id().page_no())) {
 		btr_validate_report1(index, level, block);
 
 		ib::warn() << "Page is marked as free";
@@ -5137,9 +5135,9 @@ dberr_t
 btr_validate_index(
 /*===============*/
 	dict_index_t*	index,	/*!< in: index */
-	const trx_t*	trx)	/*!< in: transaction or NULL */
+	trx_t*		trx)	/*!< in: transaction */
 {
-  mtr_t mtr;
+  mtr_t mtr{trx};
   mtr.start();
 
   mtr_x_lock_index(index, &mtr);