mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 05:22:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into poseidon.(none):/home/tomas/mysql-4.1-ndb
This commit is contained in:
tomas@poseidon.(none) 2004-05-27 11:19:54 +00:00
commit 3d6d1e0c4f
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ndb/src/common/portlib/gcc.cpp
View file

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

4
ndb/src/common/util/new.cpp
View file

@ -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