---
 storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp |    4 ----
 storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp       |    4 ----
 storage/ndb/src/kernel/vm/SimulatedBlock.cpp      |    9 ++++++++-
 storage/ndb/src/kernel/vm/pc.hpp                  |    6 +++++-
 4 files changed, 13 insertions(+), 10 deletions(-)

Index: telco-6.2/storage/ndb/src/kernel/vm/pc.hpp
===================================================================
--- telco-6.2.orig/storage/ndb/src/kernel/vm/pc.hpp	2008-07-02 09:34:01.000000000 +0200
+++ telco-6.2/storage/ndb/src/kernel/vm/pc.hpp	2008-07-02 09:58:43.000000000 +0200
@@ -122,19 +122,23 @@
 
 // -------- ERROR INSERT MACROS -------
 #ifdef ERROR_INSERT
-#define ERROR_INSERT_VARIABLE UintR cerrorInsert
+#define ERROR_INSERT_VARIABLE UintR cerrorInsert, c_error_insert_extra
 #define ERROR_INSERTED(x) (cerrorInsert == (x))
 #define ERROR_INSERTED_CLEAR(x) (cerrorInsert == (x) ? (cerrorInsert = 0, true) : false)
 #define SET_ERROR_INSERT_VALUE(x) cerrorInsert = x
+#define SET_ERROR_INSERT_VALUE2(x,y) cerrorInsert = x; c_error_insert_extra = y
 #define CLEAR_ERROR_INSERT_VALUE cerrorInsert = 0
 #else
 #define ERROR_INSERT_VARIABLE typedef void * cerrorInsert // Will generate compiler error if used
 #define ERROR_INSERTED(x) false
 #define ERROR_INSERTED_CLEAR(x) false
 #define SET_ERROR_INSERT_VALUE(x)
+#define SET_ERROR_INSERT_VALUE2(x,y)
 #define CLEAR_ERROR_INSERT_VALUE
 #endif
 
+#define DECLARE_DUMP0(BLOCK, CODE, DESC) if (arg == CODE)
+
 /* ------------------------------------------------------------------------- */
 /*       COMMONLY USED CONSTANTS.                                            */
 /* ------------------------------------------------------------------------- */
Index: telco-6.2/storage/ndb/src/kernel/vm/SimulatedBlock.cpp
===================================================================
--- telco-6.2.orig/storage/ndb/src/kernel/vm/SimulatedBlock.cpp	2008-07-02 09:37:21.000000000 +0200
+++ telco-6.2/storage/ndb/src/kernel/vm/SimulatedBlock.cpp	2008-07-02 09:37:38.000000000 +0200
@@ -878,7 +878,14 @@ SimulatedBlock::execCHANGE_NODE_STATE_RE
 
 void
 SimulatedBlock::execNDB_TAMPER(Signal * signal){
-  SET_ERROR_INSERT_VALUE(signal->theData[0]);
+  if (signal->getLength() == 1)
+  {
+    SET_ERROR_INSERT_VALUE(signal->theData[0]);
+  }
+  else
+  {
+    SET_ERROR_INSERT_VALUE2(signal->theData[0], signal->theData[1]);
+  }
 }
 
 void
Index: telco-6.2/storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp
===================================================================
--- telco-6.2.orig/storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp	2008-06-02 07:38:39.000000000 +0200
+++ telco-6.2/storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp	2008-07-02 09:40:03.000000000 +0200
@@ -383,10 +383,6 @@ private:
   void execREAD_CONFIG_CONF(Signal*);
 
   friend struct UpgradeStartup;
-
-#ifdef ERROR_INSERT
-  Uint32 c_error_insert_extra;
-#endif
 };
 
 #endif
Index: telco-6.2/storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp
===================================================================
--- telco-6.2.orig/storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp	2008-06-02 07:38:39.000000000 +0200
+++ telco-6.2/storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp	2008-07-02 09:39:19.000000000 +0200
@@ -456,10 +456,6 @@ private:
   StopReq c_stopReq;
   bool check_multi_node_shutdown(Signal* signal);
 
-#ifdef ERROR_INSERT
-  Uint32 c_error_insert_extra;
-#endif
-
   void recompute_version_info(Uint32 type);
   void recompute_version_info(Uint32 type, Uint32 version);
   void execNODE_VERSION_REP(Signal* signal);
