diff options
| author | unknown <bell@sanja.is.com.ua> | 2005-05-20 17:32:36 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2005-05-20 17:32:36 +0300 |
| commit | 39c7b0987bef3adb311925452edbc0f3ef4da4c9 (patch) | |
| tree | 74def7745a048509f283429bc0706a08b45f6686 /ndb | |
| parent | 7fa4dc6d2f1885c6bc939f8e3864dec33c5ee112 (diff) | |
| parent | cd2150993562ca2465a91340d5bd9f2aefd50784 (diff) | |
| download | mariadb-git-39c7b0987bef3adb311925452edbc0f3ef4da4c9.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug-5.0
Diffstat (limited to 'ndb')
| -rw-r--r-- | ndb/src/kernel/SimBlockList.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ndb/src/kernel/SimBlockList.cpp b/ndb/src/kernel/SimBlockList.cpp index 75a52ae0c4b..bf3958cf137 100644 --- a/ndb/src/kernel/SimBlockList.cpp +++ b/ndb/src/kernel/SimBlockList.cpp @@ -39,7 +39,6 @@ #else enum SIMBLOCKLIST_DUMMY { A_VALUE = 0 }; -static void * operator new (size_t sz, SIMBLOCKLIST_DUMMY dummy){ char * tmp = (char *)malloc(sz); |