From eb6c1f129b1a5f6fabbf896719e9bda767b684e8 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 14 Mar 2005 12:07:49 +0100 Subject: 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 --- sql/ha_berkeley.cc | 3 ++- sql/ha_ndbcluster.cc | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'sql') diff --git a/sql/ha_berkeley.cc b/sql/ha_berkeley.cc index e33cd3fca1b..626201a38a6 100644 --- a/sql/ha_berkeley.cc +++ b/sql/ha_berkeley.cc @@ -340,8 +340,9 @@ void berkeley_cleanup_log_files(void) ** Berkeley DB tables *****************************************************************************/ +static const char *ha_bdb_bas_exts[]= { ha_berkeley_ext, NullS }; 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 diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index f0988affc2e..66bcc303fd1 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -2979,9 +2979,9 @@ int ha_ndbcluster::reset() DBUG_RETURN(1); } - +static const char *ha_ndb_bas_exts[]= { ha_ndb_ext, NullS }; const char **ha_ndbcluster::bas_ext() const -{ static const char *ext[]= { ha_ndb_ext, NullS }; return ext; } +{ return ha_ndb_bas_exts; } /* -- cgit v1.2.1