BUG#29862057 MEM0MEM-T FAILS BECAUSE OF NON-INITIALIZED INFRASTRUCTURE FOR EVENTS

Unit test mem0mem-t was missing to call os_event_global_init.

RB: 22281
(cherry picked from commit 89fcdb7a0a1ca40d4bef5876f90138c780815f8d)

Author: Paweł Olchawa

storage/innobase/handler/ha_innodb.cc

@@ -4051,10 +4051,11 @@ innobase_init(
 		DBUG_RETURN(HA_ERR_INITIALIZATION);
 	}
 # endif /* UNIV_DEBUG */
-	os_event_global_init();
 
 #endif /* HAVE_PSI_INTERFACE */
 
+	os_event_global_init();
+
 	/* Set buffer pool size to default for fast startup when mysqld is
 	run with --help --verbose options. */
 	ulint	srv_buf_pool_size_org = 0;

storage/innobase/os/os0event.cc

@@ -253,6 +253,7 @@ struct os_event {
 	enabled for the cond_attr object. */
 	static bool cond_attr_has_monotonic_clock;
 #endif /* !_WIN32 */
+	static bool global_initialized;
 
 public:
 	event_iter_t		event_iter;	/*!< For O(1) removal from
@@ -491,6 +492,7 @@ os_event::wait_time_low(
 /** Constructor */
 os_event::os_event(const char* name) UNIV_NOTHROW
 {
+	ut_a(global_initialized);
 	init();
 
 	m_set = false;
@@ -619,6 +621,7 @@ os_event_destroy(
 pthread_condattr_t os_event::cond_attr;
 bool os_event::cond_attr_has_monotonic_clock (false);
 #endif /* !_WIN32 */
+bool os_event::global_initialized (false);
 
 
 void os_event_global_init(void) {
@@ -643,9 +646,11 @@ void os_event_global_init(void) {
 
 #endif /* UNIV_LINUX */
 #endif /* !_WIN32 */
+	os_event::global_initialized = true;
 }
 
 void os_event_global_destroy(void) {
+	ut_a(os_event::global_initialized);
 #ifndef _WIN32
 	os_event::cond_attr_has_monotonic_clock = false;
 #ifdef UNIV_DEBUG
@@ -654,4 +659,5 @@ void os_event_global_destroy(void) {
 		pthread_condattr_destroy(&os_event::cond_attr);
 	ut_ad(ret == 0);
 #endif /* !_WIN32 */
+	os_event::global_initialized = false;
 }

unittest/gunit/innodb/mem0mem-t.cc

@@ -1,4 +1,4 @@
-/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
 #include "univ.i"
 
 #include "mem0mem.h"
+#include "os0event.h"
 #include "srv0conc.h"
 #include "srv0srv.h"
 
@@ -37,13 +38,15 @@ class mem0mem : public ::testing::Test {
 	SetUpTestCase()
 	{
 		srv_max_n_threads = srv_sync_array_size + 1;
+		os_event_global_init();
 		sync_check_init();
 	}
 	static
 	void
 	TearDownTestCase()
 	{
 		sync_check_close();
+		os_event_global_destroy();
 	}
 };