MDEV-11688 fil_crypt_threads_end() tries to create threads

after aborted InnoDB startup This bug was repeatable by starting MariaDB 10.2 with an invalid option, such as --innodb-flush-method=foo. It is not repeatable in MariaDB 10.1 in the same way, but the problem exists already there.
MariaDB · Jan 3, 2017 · fc77925 · fc77925
1 parent b4616c4
commit fc77925
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/storage/innobase/fil/fil0crypt.cc b/storage/innobase/fil/fil0crypt.cc
@@ -2465,8 +2465,9 @@ void
 fil_crypt_threads_end()
 /*===================*/
 {
-	/* stop threads */
-	fil_crypt_set_thread_cnt(0);
+	if (fil_crypt_threads_inited) {
+		fil_crypt_set_thread_cnt(0);
+	}
 }
 
 /*********************************************************************