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

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

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
6fe11666 · tomas@poseidon.ndb.mysql.com · c445b29d · 06a57659 · 6fe11666
Commit 6fe11666 authored Feb 07, 2006 by tomas@poseidon.ndb.mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

sql/ha_ndbcluster.cc sql/ha_ndbcluster.cc +5 -2

No files found.
--- 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();
+      else
-      DBUG_ASSERT(res == 0);
+      {
+        int res= trans->restart();
+        DBUG_ASSERT(res == 0);
+      }
    }
  }