Merge branch 'mysql-5.6-cluster-7.4' into mysql-5.7-cluster-7.5

VarunNagaraju · VarunNagaraju · commit 3a01e365b368 · 2021-03-09T11:37:10.000+05:30
Change-Id: I670dbb694d5c2add9290995c5ff69e19b633d392
diff --git a/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp b/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, 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,
@@ -20262,6 +20262,12 @@ void Dbdict::dropEvent_sendReply(Signal* signal,
     ret->setErrorLine(evntRecPtr.p->m_errorLine);
     ret->setErrorNode(evntRecPtr.p->m_errorNode);
 
+    // Attempt to get the trace to investigate sporadic failures
+    #ifdef ERROR_INSERT
+      ndbrequire(evntRecPtr.p->m_errorCode != 4710); // Investigate Bug#32130078
+      ndbrequire(evntRecPtr.p->m_errorCode != 1418); // Investigate Bug#30647187
+    #endif
+
     sendSignal(senderRef, GSN_DROP_EVNT_REF, signal,
 	       DropEvntRef::SignalLength, JBB);
   } else {
diff --git a/storage/ndb/test/ndbapi/testUpgrade.cpp b/storage/ndb/test/ndbapi/testUpgrade.cpp
@@ -370,13 +370,14 @@ createDropEvent(NDBT_Context* ctx, NDBT_Step* step, bool wait = true)
       {
         continue;
       }
+      ndbout << "step " << step->getStepNo() << endl;
+      ndbout << "Creating event for table: " << tab->getName() << endl;
       if ((res = createEvent(pNdb, *tab) != NDBT_OK))
       {
         goto done;
       }
-      
-      
-      
+      ndbout << "step " << step->getStepNo() << endl;
+      ndbout << "Dropping event for table: " << tab->getName() << endl;
       if ((res = dropEvent(pNdb, *tab)) != NDBT_OK)
       {
         goto done;

Original file line number	Diff line number	Diff line change
`@@ -370,13 +370,14 @@ createDropEvent(NDBT_Context* ctx, NDBT_Step* step, bool wait = true)`
`370`	`370`	`{`
`371`	`371`	`continue;`
`372`	`372`	`}`
	`373`	`+ ndbout << "step " << step->getStepNo() << endl;`
	`374`	`+ ndbout << "Creating event for table: " << tab->getName() << endl;`
`373`	`375`	`if ((res = createEvent(pNdb, *tab) != NDBT_OK))`
`374`	`376`	`{`
`375`	`377`	`goto done;`
`376`	`378`	`}`
`377`		`-`
`378`		`-`
`379`		`-`
	`379`	`+ ndbout << "step " << step->getStepNo() << endl;`
	`380`	`+ ndbout << "Dropping event for table: " << tab->getName() << endl;`
`380`	`381`	`if ((res = dropEvent(pNdb, *tab)) != NDBT_OK)`
`381`	`382`	`{`
`382`	`383`	`goto done;`