bk commit into 4.0 tree (msvensson:1.2081) BUG#6554

[msvensson]

Below is the list of changes that have just been committed into a local
4.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2081 05/04/01 12:32:47 msvensson@neptunus.(none) +2 -0
  BUG#6554 Problem Building MySql on Fedora Core 3
   - Remove the local static var

  BitKeeper/etc/logging_ok
    1.333 05/04/01 12:32:47 msvensson@neptunus.(none) +1 -0
    Logging to logging@stripped accepted

  sql/ha_berkeley.cc
    1.118 05/04/01 12:32:42 msvensson@neptunus.(none) +3 -1
    Remove local static var, make it local in file instead.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/bug6554-mysql-4.0

--- 1.117/sql/ha_berkeley.cc	2004-06-25 12:35:48 +02:00
+++ 1.118/sql/ha_berkeley.cc	2005-04-01 12:32:42 +02:00
@@ -336,8 +336,10 @@
 ** 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

--- 1.332/BitKeeper/etc/logging_ok	2005-03-30 02:41:08 +02:00
+++ 1.333/BitKeeper/etc/logging_ok	2005-04-01 12:32:47 +02:00
@@ -102,6 +102,7 @@
 monty@stripped
 monty@stripped
 monty@stripped
+msvensson@neptunus.(none)
 mwagner@stripped
 mwagner@stripped
 mwagner@stripped