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

into mysql.com:/home/jonas/src/mysql-5.0

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
39f8776f · unknown · c0f35576 · 78fb71b0 · 39f8776f · 39f8776f
Commit 39f8776f authored May 04, 2005 by unknown
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

ndb/src/common/portlib/gcc.cpp ndb/src/common/portlib/gcc.cpp +1 -1

ndb/src/common/util/new.cpp ndb/src/common/util/new.cpp +1 -1

No files found.
--- a/ndb/src/common/portlib/gcc.cpp
+++ b/ndb/src/common/portlib/gcc.cpp
@@ -2,6 +2,6 @@
 /**
 * GCC linking problem...
 */
-#ifdef DEFINE_CXA_PURE_VIRTUAL
+#if 0
 extern "C" { int __cxa_pure_virtual() { return 0;} }
 #endif
--- a/ndb/src/common/util/new.cpp
+++ b/ndb/src/common/util/new.cpp
@@ -6,7 +6,7 @@ extern "C" {
  void (* ndb_new_handler)() = 0;
 }

-#ifdef USE_MYSYS_NEW
+#if 0

 void *operator new (size_t sz)
 {