Bug#33855045 Test ndbinfo_upgrade fails on valgrind builds [#2]

When creating a NdbEventOperationImpl it need reference to a
NdbDictionary::Event. Creating a NdbDictionary::Event involves a
roundtrip to NDB in order to "open" the Event and return the Event
instance. This may fail and is not suitable for doing in a constructor.

Fix by moving the opening of NdbDictionary::Event out of
NdbEventOperationImpl constructor.

Change-Id: I5752f8b636ddd31672ac95f59b8f272a41cddfa9

Author: blaudden

storage/ndb/include/ndbapi/NdbEventOperation.hpp

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
+   Copyright (c) 2003, 2022, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License, version 2.0,
@@ -337,7 +337,7 @@ class NdbEventOperation {
   friend class NdbEventOperationImpl;
   friend class NdbEventBuffer;
 #endif
-  NdbEventOperation(Ndb *theNdb, const char* eventName);
+  NdbEventOperation(Ndb *ndb, const NdbDictionary::Event *event);
   ~NdbEventOperation();
   class NdbEventOperationImpl &m_impl;
   NdbEventOperation(NdbEventOperationImpl& impl);

storage/ndb/src/ndbapi/NdbEventOperation.cpp

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
+   Copyright (c) 2003, 2022, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License, version 2.0,
@@ -29,8 +29,9 @@
 #include "NdbDictionaryImpl.hpp"
 #include <EventLogger.hpp>
 
-NdbEventOperation::NdbEventOperation(Ndb *theNdb,const char* eventName) 
-  : m_impl(* new NdbEventOperationImpl(*this,theNdb,eventName))
+NdbEventOperation::NdbEventOperation(Ndb *ndb,
+                                     const NdbDictionary::Event *event)
+  : m_impl(* new NdbEventOperationImpl(*this, ndb, event))
 {
 }
 

storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp

@@ -92,30 +92,18 @@ print_std(const SubTableData * sdata, LinearSectionPtr ptr[3])
 // todo free allocated data when closing NdbEventBuffer
 
 NdbEventOperationImpl::NdbEventOperationImpl(NdbEventOperation &f,
-					     Ndb *theNdb, 
-					     const char* eventName) :
+                                             Ndb *ndb,
+                                             const NdbDictionary::Event *event) :
   NdbEventOperation(*this),
   m_facade(&f),
-  m_ndb(theNdb),
+  m_ndb(ndb),
   m_state(EO_ERROR),
   m_oid(~(Uint32)0),
   m_stop_gci(),
   m_allow_empty_update(false)
 {
   DBUG_ENTER("NdbEventOperationImpl::NdbEventOperationImpl");
-
-  assert(m_ndb != NULL);
-  NdbDictionary::Dictionary *myDict = m_ndb->getDictionary();
-  assert(myDict != NULL);
-
-  const NdbDictionary::Event *myEvnt = myDict->getEvent(eventName);
-  if (!myEvnt)
-  {
-    m_error.code= myDict->getNdbError().code;
-    DBUG_VOID_RETURN;
-  }
-
-  init(myEvnt->m_impl);
+  init(event->m_impl);
   DBUG_VOID_RETURN;
 }
 
@@ -4288,7 +4276,15 @@ NdbEventBuffer::createEventOperation(const char* eventName,
     assert(m_event_queue.is_empty());
   }
 
-  NdbEventOperation* tOp= new NdbEventOperation(m_ndb, eventName);
+  NdbDictionary::Dictionary *dict = m_ndb->getDictionary();
+  const NdbDictionary::Event *event = dict->getEvent(eventName);
+  if (!event)
+  {
+    theError.code= dict->getNdbError().code;
+    DBUG_RETURN(NULL);
+  }
+
+  NdbEventOperation* tOp= new NdbEventOperation(m_ndb, event);
   if (tOp == 0)
   {
     theError.code= 4000;

storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp

@@ -555,8 +555,8 @@ class EpochDataList
 class NdbEventOperationImpl : public NdbEventOperation {
 public:
   NdbEventOperationImpl(NdbEventOperation &f,
-			Ndb *theNdb, 
-			const char* eventName);
+                        Ndb *ndb,
+                        const NdbDictionary::Event *myEvnt);
   NdbEventOperationImpl(Ndb *theNdb, 
 			NdbEventImpl& evnt);
   void init(NdbEventImpl& evnt);
@@ -601,7 +601,7 @@ class NdbEventOperationImpl : public NdbEventOperation {
   const NdbError & getNdbError() const;
   NdbError m_error;
 
-  Ndb *m_ndb;
+  Ndb *const m_ndb;
   NdbEventImpl *m_eventImpl;
 
   NdbRecAttr *theFirstPkAttrs[2];