Commit 7a18eb7a authored by unknown's avatar unknown
Browse files

Fixed failed merge

parent e2d17faa

sql/ha_ndbcluster.cc

+1 −1
Original line number Diff line number Diff line
@@ -212,6 +212,7 @@ Thd_ndb::~Thd_ndb() 
{

  if (ndb)

    delete ndb;

  ndb= 0;

}



inline
@@ -2687,7 +2688,6 @@ void ha_ndbcluster::info(uint flag) 
  {

    DBUG_PRINT("info", ("HA_STATUS_ERRKEY"));

    errkey= m_dupkey;

    errkey= m_dupkey;

  }

  if (flag & HA_STATUS_AUTO)

    DBUG_PRINT("info", ("HA_STATUS_AUTO"));