After-merge fixes for MDEV-14180

mysql-test/suite/encryption/r/innodb-first-page-read.result

@@ -66,6 +66,8 @@ VARIABLE_VALUE <= 29
 1
 set global innodb_encrypt_tables=OFF;
 # wait until tables are decrypted
+SET GLOBAL innodb_max_dirty_pages_pct=0.0;
+SET GLOBAL innodb_max_dirty_pages_pct_lwm=0.0;
 # result should be actual number of tables except remote tables could be read twice
 # i.e. < 23 + 3*2 = 29
 SELECT VARIABLE_VALUE <= 29  FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'innodb_pages0_read';

mysql-test/suite/encryption/r/innodb-key-rotation-disable.result

@@ -1,3 +1,5 @@
+SET GLOBAL innodb_file_per_table = ON;
+set global innodb_compression_algorithm = 1;
 create database enctests;
 use enctests;
 create table t1(a int not null primary key, b char(200)) engine=innodb;

mysql-test/suite/encryption/t/innodb-first-page-read.test

@@ -77,7 +77,13 @@ SELECT VARIABLE_VALUE <= 29  FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABL
 set global innodb_encrypt_tables=OFF;
 
 --echo # wait until tables are decrypted
---let $wait_condition=SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0
+SET GLOBAL innodb_max_dirty_pages_pct=0.0;
+SET GLOBAL innodb_max_dirty_pages_pct_lwm=0.0;
+
+let $wait_condition =
+SELECT variable_value = 0
+FROM information_schema.global_status
+WHERE variable_name = 'INNODB_BUFFER_POOL_PAGES_DIRTY';
 --source include/wait_condition.inc
 
 --echo # result should be actual number of tables except remote tables could be read twice

storage/innobase/fil/fil0fil.cc

@@ -1421,10 +1421,12 @@ fil_space_create(
 		encryption threads. */
 		fil_system.default_encrypt_tables.push_back(*space);
 		space->is_in_default_encrypt = true;
-		mutex_exit(&fil_system.mutex);
+	}
+
+	mutex_exit(&fil_system.mutex);
+
+	if (rotate && srv_n_fil_crypt_threads_started) {
 		os_event_set(fil_crypt_threads_event);
-	} else {
-		mutex_exit(&fil_system.mutex);
 	}
 
 	return(space);