Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0

into mysql.com:/space/pekka/ndb/version/my50

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

sql/ha_berkeley.cc

@@ -372,9 +372,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

@@ -3022,12 +3022,8 @@ int ha_ndbcluster::extra_opt(enum ha_extra_function operation, ulong cache_size)
 }
 
 
-static const char *ha_ndb_bas_ext[]= { ha_ndb_ext, NullS };
-const char**
-ha_ndbcluster::bas_ext() const
-{   
-  return ha_ndb_bas_ext; 
-}
+const char** ha_ndbcluster::bas_ext() const
+{ static const char *ext[]= { ha_ndb_ext, NullS }; return ext; }
 
 
 /*