[Commits] f2174eb0a62: Fix merge error.

jan jan.lindstrom at mariadb.com
Wed Aug 30 10:00:46 EEST 2017


revision-id: f2174eb0a62bc3519b21f43401ed135b8ea7a033 (mariadb-10.2.8-30-gf2174eb0a62)
parent(s): 1517094ba9c8b78d9026e3f466dc43b79da16897
author: Jan Lindström
committer: Jan Lindström
timestamp: 2017-08-30 10:00:41 +0300
message:

Fix merge error.

---
 storage/innobase/fil/fil0crypt.cc | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/storage/innobase/fil/fil0crypt.cc b/storage/innobase/fil/fil0crypt.cc
index de47bdbc803..e106031d8c3 100644
--- a/storage/innobase/fil/fil0crypt.cc
+++ b/storage/innobase/fil/fil0crypt.cc
@@ -2279,12 +2279,6 @@ fil_crypt_set_thread_cnt(
 	if (srv_n_fil_crypt_threads) {
 		os_event_set(fil_crypt_threads_event);
 	}
-
-	/* Send a message to encryption threads that there could be
-	something to do. */
-	if (srv_n_fil_crypt_threads) {
-		os_event_set(fil_crypt_threads_event);
-	}
 }
 
 /*********************************************************************


More information about the commits mailing list