bzr push into mysql-5.1 branch (Martin.Skold:2693 to 2694)

[Martin Skold]

 2694 Martin Skold	2008-10-15
       Fix for crash in ha_ndbcluster::open->update_stats->ndb_get_table_statistics->ndb_err, close_cached_tables should not take LOCK_open (ndb_autodicovery3.test), added missing argument to ndb_get_table_statistics
modified:
  sql/ha_ndbcluster.cc

 2693 Martin Skold	2008-10-14
      Fix for crash in ha_ndbcluster::open->update_stats->ndb_get_table_statistics->ndb_err, close_cached_tables should not take LOCK_open (ndb_autodicovery3.test)
modified:
  sql/ha_ndbcluster.cc
  sql/ha_ndbcluster.h

=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2008-10-14 14:06:02 +0000
+++ b/sql/ha_ndbcluster.cc	2008-10-15 13:16:46 +0000
@@ -8768,7 +8768,8 @@ int ha_ndbcluster::update_stats(THD *thd
       DBUG_RETURN(my_errno= HA_ERR_OUT_OF_MEM);
     }
     if (int err= ndb_get_table_statistics(thd, this, TRUE, ndb,
-                                          m_ndb_statistics_record, &stat))
+                                          m_ndb_statistics_record, &stat,
+                                          have_lock))
     {
       DBUG_RETURN(err);
     }