summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorstewart@flamingspork.com[stewart] <>2007-07-26 20:25:05 +1000
committerstewart@flamingspork.com[stewart] <>2007-07-26 20:25:05 +1000
commitf9d977f980affc217fc1dd4fb2ba9bb53bbd9262 (patch)
tree5dbfdc8779560a485cda8886374a1ffba6cc10c3
parent76f7cdba81ae7c52c1e0a435e72fb58a878462b0 (diff)
downloadmariadb-git-f9d977f980affc217fc1dd4fb2ba9bb53bbd9262.tar.gz
[PATCH] Bug#26793 I_S query crashes in NDB
If ::exteral_lock hadn't been called, we'd have no NDB object, so need to check/get one here. It looks like sql_show.cc is the only place that does this.... or at least the other places will be well hidden. Index: ndb-work/sql/ha_ndbcluster.cc ===================================================================
-rw-r--r--sql/ha_ndbcluster.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index 357b797ec75..03b6bcf3242 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -3310,6 +3310,8 @@ int ha_ndbcluster::info(uint flag)
DBUG_PRINT("info", ("HA_STATUS_AUTO"));
if (m_table && table->found_next_number_field)
{
+ if ((my_errno= check_ndb_connection()))
+ DBUG_RETURN(my_errno);
Ndb *ndb= get_ndb();
Uint64 auto_increment_value64;