Commit e2f56710 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
parents ab16339d 122a2fda

sql/ha_ndbcluster.cc

+4 −1
Original line number Diff line number Diff line
@@ -1894,6 +1894,7 @@ int ha_ndbcluster::write_row(byte *record) 
  m_bulk_insert_not_flushed= TRUE;

  if ((m_rows_to_insert == (ha_rows) 1) || 

      ((m_rows_inserted % m_bulk_insert_rows) == 0) ||

      m_primary_key_update ||

      set_blob_value)

  {

    THD *thd= current_thd;
@@ -2018,17 +2019,19 @@ int ha_ndbcluster::update_row(const byte *old_data, byte *new_data) 
    if (delete_res)

    {

      DBUG_PRINT("info", ("delete failed"));

      // Undo write_row(new_data)

      DBUG_RETURN(delete_res);

    }     

    // Insert new row

    DBUG_PRINT("info", ("delete succeded"));

    m_primary_key_update= TRUE;

    insert_res= write_row(new_data);

    m_primary_key_update= FALSE;

    if (insert_res)

    {

      DBUG_PRINT("info", ("insert failed"));

      if (trans->commitStatus() == NdbConnection::Started)

      {

      // Undo write_row(new_data)

        m_primary_key_update= TRUE;

        insert_res= write_row((byte *)old_data);

        m_primary_key_update= FALSE;