Commit a45c39e7 authored by unknown's avatar unknown
Browse files

manual merge

parent 76d98963

sql/ha_ndbcluster.cc

+2 −2
Original line number Diff line number Diff line
@@ -2202,7 +2202,7 @@ int ha_ndbcluster::update_row(const byte *old_data, byte *new_data) 
      // read into m_ref

      DBUG_DUMP("key", m_ref, NDB_HIDDEN_PRIMARY_KEY_LENGTH);

      

      if (set_hidden_key(op, table->fields, m_ref))

      if (set_hidden_key(op, table->s->fields, m_ref))

        ERR_RETURN(op->getNdbError());

    } 

    else
@@ -2284,7 +2284,7 @@ int ha_ndbcluster::delete_row(const byte *record) 
      // This table has no primary key, use "hidden" primary key

      DBUG_PRINT("info", ("Using hidden key"));

      

      if (set_hidden_key(op, table->fields, m_ref))

      if (set_hidden_key(op, table->s->fields, m_ref))

        ERR_RETURN(op->getNdbError());

    } 

    else