Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb

into mc05.(none):/space2/tomas/mysql-4.1

ndb/src/common/portlib/gcc.cpp

@@ -2,6 +2,6 @@
 /**
  * GCC linking problem...
  */
-#if ( __GNUC__ == 3 )
+#ifdef DEFINE_CXA_PURE_VIRTUAL
 extern "C" { int __cxa_pure_virtual() { return 0;} }
 #endif

ndb/src/common/util/new.cpp

@@ -5,6 +5,8 @@ extern "C" {
   void (* ndb_new_handler)() = 0;
 }
 
+#ifdef USE_MYSYS_NEW
+
 void *operator new (size_t sz)
 {
   void * p = malloc (sz ? sz : 1);
@@ -36,3 +38,5 @@ void operator delete[] (void *ptr) throw ()
   if (ptr)
     free(ptr);
 }
+
+#endif // USE_MYSYS_NEW