diff options
| author | unknown <msvensson@neptunus.homeip.net> | 2005-01-14 14:33:26 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.homeip.net> | 2005-01-14 14:33:26 +0100 |
| commit | d6747f963e13d87c1a7bc952b95ceeba8ba2aada (patch) | |
| tree | de972b3d406595a875787d2d911a1527c0634b97 | |
| parent | a2a3cf6578440eee07755820e008b139e39a34f7 (diff) | |
| download | mariadb-git-d6747f963e13d87c1a7bc952b95ceeba8ba2aada.tar.gz | |
Merge problem
FC3 fix
sql/ha_ndbcluster.cc:
Fixed merge problem, that occured when m_ndb where removed.
Fix fo FC3 compile problem.
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | sql/ha_ndbcluster.cc | 13 |
2 files changed, 10 insertions, 4 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 9e25aca5fa2..b352bceba8a 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -141,6 +141,7 @@ mronstrom@build.mysql.com mronstrom@mysql.com mskold@mysql.com msvensson@build.mysql.com +msvensson@neptunus.homeip.net mwagner@cash.mwagner.org mwagner@evoq.mwagner.org mwagner@here.mwagner.org diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index 11dd20a46d6..0d83955a335 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -2905,9 +2905,13 @@ int ha_ndbcluster::reset() DBUG_RETURN(1); } +static const char *ha_ndb_bas_ext[]= { ha_ndb_ext, NullS }; -const char **ha_ndbcluster::bas_ext() const -{ static const char *ext[]= { ha_ndb_ext, NullS }; return ext; } +const char** +ha_ndbcluster::bas_ext() const +{ + return ha_ndb_bas_ext; +} /* @@ -4644,8 +4648,9 @@ ha_ndbcluster::cached_table_registration( } { Uint64 commit_count; - m_ndb->setDatabaseName(m_dbname); - if (ndb_get_table_statistics(m_ndb, m_tabname, 0, &commit_count)) + Ndb *ndb= get_ndb(); + ndb->setDatabaseName(m_dbname); + if (ndb_get_table_statistics(ndb, m_tabname, 0, &commit_count)) { *engine_data= 0; DBUG_RETURN(FALSE); |