1
0
mirror of https://github.com/MariaDB/server.git synced 2026-10-23 18:49:29 +03:00

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.
This commit is contained in:
Marko Mäkelä
2017-01-03 13:18:47 +02:00
parent b4616c40be
commit fc779252ae

View File

@@ -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);
}
}
/*********************************************************************