Merge branch 'mysql-8.0' into mysql-trunk

Ole John Aske · Ole John Aske · commit 51135b76cde6 · 2023-09-14T20:38:39.000+02:00
Change-Id: Ifee872920c41e0f9c7021c1ae6baca669072607f
diff --git a/storage/ndb/test/include/NdbMgmd.hpp b/storage/ndb/test/include/NdbMgmd.hpp
@@ -99,6 +99,7 @@ class NdbMgmd {
       ndb_mgm_destroy_handle(&m_handle);
       m_handle = NULL;
     }
+    m_event_socket.close();
   }
 
   NdbMgmHandle handle(void) const {

Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,7 @@ class NdbMgmd {`
`99`	`99`	`ndb_mgm_destroy_handle(&m_handle);`
`100`	`100`	`m_handle = NULL;`
`101`	`101`	`}`
	`102`	`+ m_event_socket.close();`
`102`	`103`	`}`
`103`	`104`
`104`	`105`	`NdbMgmHandle handle(void) const {`