database/mariadb
database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-05-28 13:01:41 +03:00
Code

Merge problem

Browse Source 
FC3 fix
This commit is contained in:
msvensson@neptunus.homeip.net 2005-01-14 14:33:26 +01:00
parent d52bac6a78
commit cb7524e103
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BitKeeper/etc/logging_ok
View File

@ -141,6 +141,7 @@ mronstrom@build.mysql.com
mronstrom@mysql.com mronstrom@mysql.com
mskold@mysql.com mskold@mysql.com
msvensson@build.mysql.com msvensson@build.mysql.com
msvensson@neptunus.homeip.net
mwagner@cash.mwagner.org mwagner@cash.mwagner.org
mwagner@evoq.mwagner.org mwagner@evoq.mwagner.org
mwagner@here.mwagner.org mwagner@here.mwagner.org

13
sql/ha_ndbcluster.cc
View File

@ -2905,9 +2905,13 @@ int ha_ndbcluster::reset()
DBUG_RETURN(1); DBUG_RETURN(1);
} }
static const char *ha_ndb_bas_ext[]= { ha_ndb_ext, NullS };
const char **ha_ndbcluster::bas_ext() const const char**
{ static const char *ext[]= { ha_ndb_ext, NullS }; return ext; } ha_ndbcluster::bas_ext() const
{
return ha_ndb_bas_ext;
}
/* /*
@ -4644,8 +4648,9 @@ ha_ndbcluster::cached_table_registration(
} }
{ {
Uint64 commit_count; Uint64 commit_count;
m_ndb->setDatabaseName(m_dbname); Ndb *ndb= get_ndb();
if (ndb_get_table_statistics(m_ndb, m_tabname, 0, &commit_count)) ndb->setDatabaseName(m_dbname);
if (ndb_get_table_statistics(ndb, m_tabname, 0, &commit_count))
{ {
*engine_data= 0; *engine_data= 0;
DBUG_RETURN(FALSE); DBUG_RETURN(FALSE);