diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-08-29 20:30:18 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-08-29 20:30:18 +0300 |
| commit | 01209de7637a7206c18788e08919b5ccf0b3d700 (patch) | |
| tree | cb436bf0815ce83cda99844a256a0cde359d2f03 /storage/innobase/srv | |
| parent | 352d27ce36bc807f0c3c803e192ad1851f7f86a0 (diff) | |
| parent | bbfd53cd32c1cf8be30f1d18225adb7fc5f6faf9 (diff) | |
| download | mariadb-git-01209de7637a7206c18788e08919b5ccf0b3d700.tar.gz | |
Merge remote-tracking branch 'origin/bb-10.1-jplindst' into 10.1
Diffstat (limited to 'storage/innobase/srv')
| -rw-r--r-- | storage/innobase/srv/srv0start.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/storage/innobase/srv/srv0start.cc b/storage/innobase/srv/srv0start.cc index e5d1a6328b4..8b963fc3259 100644 --- a/storage/innobase/srv/srv0start.cc +++ b/storage/innobase/srv/srv0start.cc @@ -3027,7 +3027,6 @@ files_checked: "wsrep recovery."); } #endif /* WITH_WSREP */ - /* Create thread(s) that handles key rotation */ fil_system_enter(); fil_crypt_threads_init(); |