summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--BitKeeper/etc/logging_ok1
-rw-r--r--sql/ha_berkeley.cc3
-rw-r--r--sql/ha_ndbcluster.cc4
3 files changed, 5 insertions, 3 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 9749be3448e..f64d9ca4042 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -148,6 +148,7 @@ mronstrom@build.mysql.com
mronstrom@mysql.com
mskold@mysql.com
msvensson@build.mysql.com
+msvensson@neptunus.(none)
mwagner@cash.mwagner.org
mwagner@evoq.mwagner.org
mwagner@here.mwagner.org
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; }
/*