bk commit into 5.0 tree (joreland:1.1910) BUG#10330 -
05-04-2005
, 05:29 AM
Below is the list of changes that have just been committed into a local
5.0 repository of jonas. When jonas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/in...urce-tree.html
ChangeSet
1.1910 05/05/04 13:29:15 joreland (AT) mysql (DOT) com +2 -0
bug#10330 - linking with ndb fails
changes to handling of new/delete cxa_pure_virtual has changed in mysys
remove "ndb"'s own impl. as they are no longer needed as we link mysys at all places
ndb/src/common/util/new.cpp
1.7 05/05/04 13:29:12 joreland (AT) mysql (DOT) com +1 -1
remove "ndb" new/delete
ndb/src/common/portlib/gcc.cpp
1.3 05/05/04 13:29:12 joreland (AT) mysql (DOT) com +1 -1
remove ndb __cxa_pure_virtual
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: joreland
# Host: eel.mysql.com
# Root: /home/jonas/src/mysql-5.0
--- 1.2/ndb/src/common/portlib/gcc.cpp Thu May 27 13:16:11 2004
+++ 1.3/ndb/src/common/portlib/gcc.cpp Wed May 4 13:29:12 2005
@@ -2,6 +2,6 @@
/**
* GCC linking problem...
*/
-#ifdef DEFINE_CXA_PURE_VIRTUAL
+#if 0
extern "C" { int __cxa_pure_virtual() { return 0;} }
#endif
--- 1.6/ndb/src/common/util/new.cpp Sat Aug 21 09:57:41 2004
+++ 1.7/ndb/src/common/util/new.cpp Wed May 4 13:29:12 2005
@@ -6,7 +6,7 @@
void (* ndb_new_handler)() = 0;
}
-#ifdef USE_MYSYS_NEW
+#if 0
void *operator new (size_t sz)
{
--
MySQL Internals Mailing List
For list archives: http://lists.mysql.com/internals
To unsubscribe: http://lists.mysql.com/internals?uns...ie.nctu.edu.tw |