From 0dafcf529c14b42e2e63d1634da79e0700be16a1 Mon Sep 17 00:00:00 2001
From: Eugene Kosov <claprix@yandex.ru>
Date: Thu, 20 Dec 2018 17:58:50 +0300
Subject: [PATCH] cleanup os_event

---
 storage/innobase/os/os0event.cc | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/storage/innobase/os/os0event.cc b/storage/innobase/os/os0event.cc
index f2931239c3a..4e18a48332e 100644
--- a/storage/innobase/os/os0event.cc
+++ b/storage/innobase/os/os0event.cc
@@ -31,8 +31,6 @@ Created 2012-09-23 Sunny Bains
 #include <synchapi.h>
 #endif /* _WIN32 */
 
-#include <list>
-
 /** The number of microsecnds in a second. */
 static const ulint MICROSECS_IN_A_SECOND = 1000000;
 
@@ -44,9 +42,6 @@ typedef CONDITION_VARIABLE	os_cond_t;
 typedef pthread_cond_t		os_cond_t;
 #endif /* _WIN32 */
 
-typedef std::list<os_event_t, ut_allocator<os_event_t> >	os_event_list_t;
-typedef os_event_list_t::iterator				event_iter_t;
-
 /** InnoDB condition variable. */
 struct os_event {
 	os_event(const char* name) UNIV_NOTHROW;
@@ -234,9 +229,6 @@ private:
 	os_cond_t		cond_var;	/*!< condition variable is
 						used in waiting for the event */
 
-public:
-	event_iter_t		event_iter;	/*!< For O(1) removal from
-						list */
 protected:
 	// Disable copying
 	os_event(const os_event&);
@@ -544,8 +536,6 @@ os_event_destroy(
 	os_event_t&	event)			/*!< in/own: event to free */
 
 {
-	if (event != NULL) {
-		UT_DELETE(event);
-		event = NULL;
-	}
+	UT_DELETE(event);
+	event = NULL;
 }