Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1

into april.(none):/home/svoj/devel/mysql/merge/mysql-4.1

Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1
into april.(none):/home/svoj/devel/mysql/merge/mysql-4.1
a525b294 · unknown · 16c564a3 · 523d97f4 · a525b294
Commit a525b294 authored Feb 07, 2006 by unknown
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
@@ -3061,8 +3061,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);
+      }
    }
  }