Commit 90697f24 authored by unknown's avatar unknown

BUG#6554 Problem Building MySql on Fedora Core 3

 - Moved static variables defined inside of function to file scope to avoid this linking problem on FC3


sql/ha_berkeley.cc:
  Moved list of bdb extension to file scope
sql/ha_ndbcluster.cc:
  Moved list of ndb extesions to file scope
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
parent 2427f369
...@@ -148,6 +148,7 @@ mronstrom@build.mysql.com ...@@ -148,6 +148,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.(none)
mwagner@cash.mwagner.org mwagner@cash.mwagner.org
mwagner@evoq.mwagner.org mwagner@evoq.mwagner.org
mwagner@here.mwagner.org mwagner@here.mwagner.org
......
...@@ -340,8 +340,9 @@ void berkeley_cleanup_log_files(void) ...@@ -340,8 +340,9 @@ void berkeley_cleanup_log_files(void)
** Berkeley DB tables ** Berkeley DB tables
*****************************************************************************/ *****************************************************************************/
static const char *ha_bdb_bas_exts[]= { ha_berkeley_ext, NullS };
const char **ha_berkeley::bas_ext() const const char **ha_berkeley::bas_ext() const
{ static const char *ext[]= { ha_berkeley_ext, NullS }; return ext; } { return ha_bdb_bas_exts; }
ulong ha_berkeley::index_flags(uint idx, uint part, bool all_parts) const ulong ha_berkeley::index_flags(uint idx, uint part, bool all_parts) const
......
...@@ -2979,9 +2979,9 @@ int ha_ndbcluster::reset() ...@@ -2979,9 +2979,9 @@ int ha_ndbcluster::reset()
DBUG_RETURN(1); DBUG_RETURN(1);
} }
static const char *ha_ndb_bas_exts[]= { ha_ndb_ext, NullS };
const char **ha_ndbcluster::bas_ext() const const char **ha_ndbcluster::bas_ext() const
{ static const char *ext[]= { ha_ndb_ext, NullS }; return ext; } { return ha_ndb_bas_exts; }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment