From 99923bfa764a95d49921d2e1800c35f897d85f39 Mon Sep 17 00:00:00 2001 From: "tomas@whalegate.ndb.mysql.com" <> Date: Fri, 11 May 2007 09:19:03 +0200 Subject: [PATCH] Bug#25818 No return of NDB share object in failures in open method - correct manual/auto merge to 5.1 --- sql/ha_ndbcluster.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index e9c634011f0..315b3c56eb3 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -6292,9 +6292,9 @@ int ha_ndbcluster::open(const char *name, int mode, uint test_if_locked) } if (res) { - free_share(m_share); + free_share(&m_share); m_share= 0; - release_metadata(); + release_metadata(current_thd, get_ndb()); DBUG_RETURN(res); } #ifdef HAVE_NDB_BINLOG -- 2.30.9