diff options
| author | lzhou/root@dev3-138.dev.cn.tlan <> | 2006-11-02 13:16:38 +0000 |
|---|---|---|
| committer | lzhou/root@dev3-138.dev.cn.tlan <> | 2006-11-02 13:16:38 +0000 |
| commit | 0b81fa006e4c81821b171be65a3f401fd0480ebb (patch) | |
| tree | e0785c51a4a337f3e6d8a5e9dba0ec55256dbdd1 /ndb | |
| parent | c1703bbc1615d3fdac3d318ef8e9449960776838 (diff) | |
| parent | 2f6df58526c5f9195ab913899e77a935caa95b4f (diff) | |
| download | mariadb-git-0b81fa006e4c81821b171be65a3f401fd0480ebb.tar.gz | |
Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb-bj
into dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-4.1/bug19352
Diffstat (limited to 'ndb')
| -rw-r--r-- | ndb/src/kernel/vm/SimulatedBlock.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/ndb/src/kernel/vm/SimulatedBlock.cpp b/ndb/src/kernel/vm/SimulatedBlock.cpp index 9b52ac65331..d5ba3ac63c1 100644 --- a/ndb/src/kernel/vm/SimulatedBlock.cpp +++ b/ndb/src/kernel/vm/SimulatedBlock.cpp @@ -658,24 +658,26 @@ SimulatedBlock::allocRecord(const char * type, size_t s, size_t n, bool clear) void * p = NULL; size_t size = n*s; + Uint64 real_size = (Uint64)((Uint64)n)*((Uint64)s); refresh_watch_dog(); - if (size > 0){ + if (real_size > 0){ #ifdef VM_TRACE_MEM - ndbout_c("%s::allocRecord(%s, %u, %u) = %u bytes", + ndbout_c("%s::allocRecord(%s, %u, %u) = %llu bytes", getBlockName(number()), type, s, n, - size); + real_size); #endif - p = NdbMem_Allocate(size); + if( real_size == (Uint64)size ) + p = NdbMem_Allocate(size); if (p == NULL){ char buf1[255]; char buf2[255]; BaseString::snprintf(buf1, sizeof(buf1), "%s could not allocate memory for %s", getBlockName(number()), type); - BaseString::snprintf(buf2, sizeof(buf2), "Requested: %ux%u = %u bytes", - (Uint32)s, (Uint32)n, (Uint32)size); + BaseString::snprintf(buf2, sizeof(buf2), "Requested: %ux%u = %llu bytes", + (Uint32)s, (Uint32)n, (Uint64)real_size); ERROR_SET(fatal, ERR_MEMALLOC, buf1, buf2); } |