diff options
| author | unknown <joreland@mysql.com> | 2005-01-19 10:07:14 +0100 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2005-01-19 10:07:14 +0100 |
| commit | 21d24f34a66a2cd9132c59cfb68db2673321a9c1 (patch) | |
| tree | 4f7aa86996e0db4a2120ea596d7be84f74c6940d /ndb/src/kernel/vm | |
| parent | bfe74e69903583f1bb9b4ad803c137d6487afa74 (diff) | |
| parent | 7893b8dfaa740b882880555e84e03370e1810cef (diff) | |
| download | mariadb-git-21d24f34a66a2cd9132c59cfb68db2673321a9c1.tar.gz | |
Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
ndb/include/kernel/AttributeHeader.hpp:
Auto merged
ndb/include/ndb_global.h.in:
Auto merged
ndb/src/kernel/blocks/backup/BackupInit.cpp:
Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
Auto merged
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
Diffstat (limited to 'ndb/src/kernel/vm')
| -rw-r--r-- | ndb/src/kernel/vm/Emulator.cpp | 1 | ||||
| -rw-r--r-- | ndb/src/kernel/vm/SimulatedBlock.hpp | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/ndb/src/kernel/vm/Emulator.cpp b/ndb/src/kernel/vm/Emulator.cpp index adf3c438945..068610b6778 100644 --- a/ndb/src/kernel/vm/Emulator.cpp +++ b/ndb/src/kernel/vm/Emulator.cpp @@ -33,7 +33,6 @@ #include <NdbOut.hpp> #include <NdbMutex.h> #include <NdbSleep.h> -#include <new> extern "C" { extern void (* ndb_new_handler)(); diff --git a/ndb/src/kernel/vm/SimulatedBlock.hpp b/ndb/src/kernel/vm/SimulatedBlock.hpp index cff19734368..787d14ca5cb 100644 --- a/ndb/src/kernel/vm/SimulatedBlock.hpp +++ b/ndb/src/kernel/vm/SimulatedBlock.hpp @@ -36,7 +36,6 @@ #include <ErrorReporter.hpp> #include <ErrorHandlingMacros.hpp> -#include <new> #include "DLList.hpp" #include "ArrayPool.hpp" #include "DLHashTable.hpp" |