diff options
| author | unknown <mskold@mysql.com> | 2005-01-01 22:47:50 +0100 |
|---|---|---|
| committer | unknown <mskold@mysql.com> | 2005-01-01 22:47:50 +0100 |
| commit | 7a18eb7a6bee68767b0b2d59722d0bdfe551f7ce (patch) | |
| tree | 51f0bae400b3813024c38871e5d65cf62f6a089f | |
| parent | e2d17faa2bfb291c51581b96a48968681b9d16f8 (diff) | |
| download | mariadb-git-7a18eb7a6bee68767b0b2d59722d0bdfe551f7ce.tar.gz | |
Fixed failed merge
| -rw-r--r-- | sql/ha_ndbcluster.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index 9e50ef9ed2a..3c6cd83d5dc 100644 --- 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")); |