database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-03 20:43:11 +03:00
Code Activity

moved code out of DBUG_ASSERT

Browse Source
This commit is contained in:
tomas@poseidon.ndb.mysql.com
2004-10-05 10:04:09 +00:00
parent 250d643ee2
commit d60ba54d1c
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/ha_ndbcluster.cc
View File

@@ -1206,7 +1206,8 @@ inline int ha_ndbcluster::next_result(byte *buf)
{ {
if (execute_commit(this,trans) != 0) if (execute_commit(this,trans) != 0)
DBUG_RETURN(ndb_err(trans)); DBUG_RETURN(ndb_err(trans));
DBUG_ASSERT(trans->restart() == 0); int res= trans->restart();
DBUG_ASSERT(res == 0);
} }
ops_pending= 0; ops_pending= 0;
} }
@@ -1644,7 +1645,8 @@ int ha_ndbcluster::write_row(byte *record)
no_uncommitted_rows_execute_failure(); no_uncommitted_rows_execute_failure();
DBUG_RETURN(ndb_err(trans)); 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)) if ((has_auto_increment) && (skip_auto_increment))
@@ -2281,7 +2283,8 @@ int ha_ndbcluster::rnd_init(bool scan)
{ {
if (!scan) if (!scan)
DBUG_RETURN(1); DBUG_RETURN(1);
DBUG_ASSERT(cursor->restart() == 0); int res= cursor->restart();
DBUG_ASSERT(res == 0);
} }
index_init(table->primary_key); index_init(table->primary_key);
DBUG_RETURN(0); DBUG_RETURN(0);