Commit a2b5ef8a authored by unknown's avatar unknown
Browse files

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
parent e58dfda4

configure.in

+2 −1
Original line number Diff line number Diff line
@@ -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

sql/ha_berkeley.cc

+1 −2
Original line number Diff line number Diff line
@@ -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

sql/ha_ndbcluster.cc

+2 −2
Original line number Diff line number Diff line
@@ -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; }





/*