From d60ba54d1cc75295c8ab9981fbbef4c28e9a458c Mon Sep 17 00:00:00 2001
From: "tomas@poseidon.ndb.mysql.com" <>
Date: Tue, 5 Oct 2004 10:04:09 +0000
Subject: [PATCH] moved code out of DBUG_ASSERT

---
 sql/ha_ndbcluster.cc | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index d03a088775f..57232778d48 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -1206,7 +1206,8 @@ inline int ha_ndbcluster::next_result(byte *buf)
 	{
 	  if  (execute_commit(this,trans) != 0)
 	    DBUG_RETURN(ndb_err(trans));
-	  DBUG_ASSERT(trans->restart() == 0);
+	  int res= trans->restart();
+	  DBUG_ASSERT(res == 0);
 	}
 	ops_pending= 0;
       }
@@ -1644,7 +1645,8 @@ int ha_ndbcluster::write_row(byte *record)
 	no_uncommitted_rows_execute_failure();
 	DBUG_RETURN(ndb_err(trans));
       }
-      DBUG_ASSERT(trans->restart() == 0);
+      int res= trans->restart();
+      DBUG_ASSERT(res == 0);
     }
   }
   if ((has_auto_increment) && (skip_auto_increment))
@@ -2281,7 +2283,8 @@ int ha_ndbcluster::rnd_init(bool scan)
   {
     if (!scan)
       DBUG_RETURN(1);
-    DBUG_ASSERT(cursor->restart() == 0);
+    int res= cursor->restart();
+    DBUG_ASSERT(res == 0);
   }
   index_init(table->primary_key);
   DBUG_RETURN(0);