Merge mysql.com:/usr/local/mysql/mysql-5.0-sol10-sparc-a-fix

into  mysql.com:/usr/local/mysql/mysql-5.1-new


storage/ndb/src/common/portlib/Makefile.am:
  Auto merged
BitKeeper/deleted/.del-gcc.cpp~3d2e013cfac48838:
  Auto merged
storage/ndb/config/common.mk.am:
  Manual merge.

storage/ndb/config/common.mk.am

@@ -7,6 +7,6 @@ ndbapiincludedir = "$(pkgincludedir)/storage/ndb/ndbapi"
 mgmapiincludedir = "$(pkgincludedir)/storage/ndb/mgmapi"
 
 INCLUDES = $(INCLUDES_LOC)
-LDADD = $(top_srcdir)/storage/ndb/src/common/portlib/gcc.cpp $(LDADD_LOC)
+LDADD = $(LDADD_LOC)
 DEFS = @DEFS@ @NDB_DEFS@ $(DEFS_LOC) $(NDB_EXTRA_FLAGS)
 NDB_CXXFLAGS=@ndb_cxxflags_fix@ $(NDB_CXXFLAGS_LOC) 

storage/ndb/src/common/portlib/Makefile.am

-noinst_HEADERS = gcc.cpp
-
 noinst_LTLIBRARIES = libportlib.la
 
 libportlib_la_SOURCES = \

storage/ndb/src/common/portlib/gcc.cpp

-
-/**
- * GCC linking problem...
- */
-#if 0
-extern "C" { int __cxa_pure_virtual() { return 0;} }
-#endif