Commit 96ead39d authored by unknown's avatar unknown

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged
parents 5773da5e d23938d1
...@@ -3131,8 +3131,11 @@ int ha_ndbcluster::end_bulk_insert() ...@@ -3131,8 +3131,11 @@ int ha_ndbcluster::end_bulk_insert()
no_uncommitted_rows_execute_failure(); no_uncommitted_rows_execute_failure();
my_errno= error= ndb_err(trans); my_errno= error= ndb_err(trans);
} }
int res= trans->restart(); else
DBUG_ASSERT(res == 0); {
int res= trans->restart();
DBUG_ASSERT(res == 0);
}
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment