Fixed failed merge

7a18eb7a · unknown · e2d17faa · 7a18eb7a
Commit 7a18eb7a authored Jan 01, 2005 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/ha_ndbcluster.cc sql/ha_ndbcluster.cc +1 -1

No files found.
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -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"));