Commit 96268d4a authored by unknown's avatar unknown
Browse files

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 95958982 523d97f4

sql/ha_ndbcluster.cc

+5 −2
Original line number Diff line number Diff line
@@ -3131,10 +3131,13 @@ int ha_ndbcluster::end_bulk_insert() 
        no_uncommitted_rows_execute_failure();

        my_errno= error= ndb_err(trans);

      }

      else

      {

        int res= trans->restart();

        DBUG_ASSERT(res == 0);

      }

    }

  }



  m_rows_inserted= (ha_rows) 0;

  m_rows_to_insert= (ha_rows) 1;