diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2006-02-07 11:31:52 +0100 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2006-02-07 11:31:52 +0100 |
| commit | 96268d4a9a375fdd6e7effe530f26261bbd01d55 (patch) | |
| tree | 0a943e0d7cdfe2adac42973469b7562deea4efd6 | |
| parent | 95958982f6abc497c62e8225048a206b35732444 (diff) | |
| parent | 523d97f4ddfe695ca6134a65d93a24f388e52a4c (diff) | |
| download | mariadb-git-96268d4a9a375fdd6e7effe530f26261bbd01d55.tar.gz | |
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
| -rw-r--r-- | sql/ha_ndbcluster.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index 2310ace2d46..51882d321fc 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -3131,8 +3131,11 @@ int ha_ndbcluster::end_bulk_insert() no_uncommitted_rows_execute_failure(); my_errno= error= ndb_err(trans); } - int res= trans->restart(); - DBUG_ASSERT(res == 0); + else + { + int res= trans->restart(); + DBUG_ASSERT(res == 0); + } } } |