summaryrefslogtreecommitdiff
path: root/sql/ha_ndbcluster.cc
diff options
context:
space:
mode:
authorunknown <tomas@poseidon.ndb.mysql.com>2004-10-05 10:04:09 +0000
committerunknown <tomas@poseidon.ndb.mysql.com>2004-10-05 10:04:09 +0000
commite767d7a46bd90bfc50f6f6bcb1f412ccae94f33c (patch)
tree694594cf41bf15cc24482d8767491c103f9cc762 /sql/ha_ndbcluster.cc
parentd6e82d74bbf2e6ee83793a8c0029cb751c253ca5 (diff)
downloadmariadb-git-e767d7a46bd90bfc50f6f6bcb1f412ccae94f33c.tar.gz
moved code out of DBUG_ASSERT
Diffstat (limited to 'sql/ha_ndbcluster.cc')
-rw-r--r--sql/ha_ndbcluster.cc9
1 files 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);