summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2006-01-16 12:48:16 +0100
committerunknown <msvensson@neptunus.(none)>2006-01-16 12:48:16 +0100
commit7c269aff0f19611ca0636357e044b424e7dd2260 (patch)
treeb34c59c5a57a532244cbcbe0b2aeec3dde7f6c0e
parent2946f9a64f664293010777e422e7b66058ce323a (diff)
parent549d8c3d4055f0959d931ea29177883e44fdf242 (diff)
downloadmariadb-git-7c269aff0f19611ca0636357e044b424e7dd2260.tar.gz
Merge bk-internal:/home/bk/mysql-4.0
into neptunus.(none):/home/msvensson/mysql/bug6554/my40-bug6554
-rw-r--r--sql/ha_berkeley.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/ha_berkeley.cc b/sql/ha_berkeley.cc
index b307b3a4b75..4ee844ac719 100644
--- a/sql/ha_berkeley.cc
+++ b/sql/ha_berkeley.cc
@@ -336,8 +336,9 @@ void berkeley_cleanup_log_files(void)
** Berkeley DB tables
*****************************************************************************/
+static const char *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 bdb_bas_exts; }
static int