diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2005-01-20 20:16:10 +0100 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2005-01-20 20:16:10 +0100 |
| commit | 0a94c211e297b98b19e8c54069991ce91a1bf00e (patch) | |
| tree | 3cc00d67200e09c68eb3fe5fbee3ececa5a5fc7a /ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp | |
| parent | f704ad069c4b0ea428a4fcb60f1d3b9055a9add2 (diff) | |
| parent | 44eb7ad8191a164f410c75b7af2df356d5f123c4 (diff) | |
| download | mariadb-git-0a94c211e297b98b19e8c54069991ce91a1bf00e.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/wl2299
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
Diffstat (limited to 'ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp')
| -rw-r--r-- | ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp b/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp index a4335e2ec8f..9001491dd64 100644 --- a/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp +++ b/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp @@ -39,7 +39,6 @@ #include <EventLogger.hpp> #include <TimeQueue.hpp> -#include <new> #include <NdbSleep.h> #include <SafeCounter.hpp> |