Commit 39f8776f authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/jonas/src/mysql-5.0
parents c0f35576 78fb71b0

ndb/src/common/portlib/gcc.cpp

+1 −1
Original line number Diff line number Diff line
@@ -2,6 +2,6 @@ 
/**

 * GCC linking problem...

 */

#ifdef DEFINE_CXA_PURE_VIRTUAL

#if 0

extern "C" { int __cxa_pure_virtual() { return 0;} }

#endif

ndb/src/common/util/new.cpp

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ extern "C" { 
  void (* ndb_new_handler)() = 0;

}



#ifdef USE_MYSYS_NEW

#if 0



void *operator new (size_t sz)

{