Commit ab5c7a9e authored by unknown's avatar unknown
Browse files

moved code out of DBUG_ASSERT

parent 2f321291

sql/ha_ndbcluster.cc

+6 −3
Original line number Diff line number Diff line
@@ -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);