From a2b5ef8abf33cb3782c8d6c93d933ba4688bcb4f Mon Sep 17 00:00:00 2001
From: unknown <msvensson@neptunus.(none)>
Date: Mon, 21 Mar 2005 12:29:08 +0100
Subject: [PATCH] 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

configure.in:
  Add libsupc++ to librarys to link
sql/ha_berkeley.cc:
  Reverting the change made to fix this problem in 4.1
sql/ha_ndbcluster.cc:
  Reverting the change made to fix this problem in 4.1
---
 configure.in         | 3 ++-
 sql/ha_berkeley.cc   | 3 +--
 sql/ha_ndbcluster.cc | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/configure.in b/configure.in
index 9a58e0c9b8c..84f5cbd93c0 100644
--- a/configure.in
+++ b/configure.in
@@ -353,7 +353,8 @@ then
   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
diff --git a/sql/ha_berkeley.cc b/sql/ha_berkeley.cc
index d57c51d24b1..f8e14844875 100644
--- a/sql/ha_berkeley.cc
+++ b/sql/ha_berkeley.cc
@@ -371,9 +371,8 @@ 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
-{ 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
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index fcbe7636dc8..56dd9a43b59 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -3015,8 +3015,8 @@ int ha_ndbcluster::extra_opt(enum ha_extra_function operation, ulong cache_size)
 }
 
 
-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; }
 
 
 /*