bk commit into 4.1 tree (msvensson:1.2112) BUG#6554

[msvensson]

Below is the list of changes that have just been committed into a local
4.1 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.2112 05/03/14 12:07:49 msvensson@neptunus.(none) +3 -0
  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

  BitKeeper/etc/logging_ok
    1.367 05/03/14 12:07:49 msvensson@neptunus.(none) +1 -0
    Logging to logging@stripped accepted

  sql/ha_ndbcluster.cc
    1.133 05/03/14 12:07:40 msvensson@neptunus.(none) +2 -2
    Moved list of ndb extesions to file scope

  sql/ha_berkeley.cc
    1.147 05/03/14 12:07:40 msvensson@neptunus.(none) +2 -1
    Moved list of bdb extension to file scope

# 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/bug6762

--- 1.146/sql/ha_berkeley.cc	2005-01-13 01:54:36 +01:00
+++ 1.147/sql/ha_berkeley.cc	2005-03-14 12:07:40 +01:00
@@ -340,8 +340,9 @@
 ** 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

--- 1.366/BitKeeper/etc/logging_ok	2005-03-06 14:22:27 +01:00
+++ 1.367/BitKeeper/etc/logging_ok	2005-03-14 12:07:49 +01:00
@@ -148,6 +148,7 @@
 mronstrom@stripped
 mskold@stripped
 msvensson@stripped
+msvensson@neptunus.(none)
 mwagner@stripped
 mwagner@stripped
 mwagner@stripped

--- 1.132/sql/ha_ndbcluster.cc	2005-03-07 10:53:03 +01:00
+++ 1.133/sql/ha_ndbcluster.cc	2005-03-14 12:07:40 +01:00
@@ -2979,9 +2979,9 @@
   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; }
 
 
 /*