Commit fc779252 authored by Marko Mäkelä's avatar Marko Mäkelä

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.
parent b4616c40
...@@ -2465,8 +2465,9 @@ void ...@@ -2465,8 +2465,9 @@ void
fil_crypt_threads_end() fil_crypt_threads_end()
/*===================*/ /*===================*/
{ {
/* stop threads */ if (fil_crypt_threads_inited) {
fil_crypt_set_thread_cnt(0); fil_crypt_set_thread_cnt(0);
}
} }
/********************************************************************* /*********************************************************************
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment