From: Date: March 21 2005 12:29pm
Subject: bk commit into 5.0 tree (msvensson:1.1814) BUG#6554
List-Archive: http://lists.mysql.com/internals/23226
X-Bug: 6554
Message-Id: <20050321112913.9076F25E084@localhost.localdomain>

Below is the list of changes that have just been committed into a local
5.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.1814 05/03/21 12:29:08 msvensson@neptunus.(none) +3 -0
  BUG#6554: Problem Building MySql on Fedora Core 3
    - Link with libsupc++.a which contains language support functions.
      see http://gcc.gnu.org/onlinedocs/libstdc++/faq/index.html#2_5

  sql/ha_ndbcluster.cc
    1.163 05/03/21 12:29:04 msvensson@neptunus.(none) +2 -2
    Reverting the change made to fix this problem in 4.1

  sql/ha_berkeley.cc
    1.141 05/03/21 12:29:04 msvensson@neptunus.(none) +1 -2
    Reverting the change made to fix this problem in 4.1

  configure.in
    1.271 05/03/21 12:29:04 msvensson@neptunus.(none) +2 -1
    Add libsupc++ to librarys to link

# 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

--- 1.270/configure.in	2005-03-09 14:08:50 +01:00
+++ 1.271/configure.in	2005-03-21 12:29:04 +01:00
@@ -353,7 +353,8 @@
   then
     if $CXX -v 2>&1 | grep 'version 3' > /dev/null 2>&1
     then
-      CXXFLAGS="$CXXFLAGS -DUSE_MYSYS_NEW -DDEFINE_CXA_PURE_VIRTUAL"
+     # Statically link the language support function's found in libsupc++.a
+     LIBS="$LIBS -lsupc++"
     fi
   fi
 fi

--- 1.140/sql/ha_berkeley.cc	2005-03-14 12:23:14 +01:00
+++ 1.141/sql/ha_berkeley.cc	2005-03-21 12:29:04 +01:00
@@ -371,9 +371,8 @@
 ** Berkeley DB tables
 *****************************************************************************/
 
-static const char *ha_bdb_bas_exts[]= { ha_berkeley_ext, NullS };
 const char **ha_berkeley::bas_ext() const
-{ return ha_bdb_bas_exts; }
+{ static const char *ext[]= { ha_berkeley_ext, NullS }; return ext; }
 
 
 ulong ha_berkeley::index_flags(uint idx, uint part, bool all_parts) const

--- 1.162/sql/ha_ndbcluster.cc	2005-03-14 12:25:22 +01:00
+++ 1.163/sql/ha_ndbcluster.cc	2005-03-21 12:29:04 +01:00
@@ -3015,8 +3015,8 @@
 }
 
 
-static const char *ha_ndb_bas_exts[]= { ha_ndb_ext, NullS };
-{ return ha_ndb_bas_exts; }
+const char** ha_ndbcluster::bas_ext() const
+{ static const char *ext[]= { ha_ndb_ext, NullS }; return ext; }
 
 
 /*