Commit a446b5fe authored by unknown's avatar unknown
Browse files

Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb-bj 

into  dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/bug19352
parents b3890381 540a69c3

ndb/src/kernel/vm/SimulatedBlock.cpp

+8 −6
Original line number Diff line number Diff line
@@ -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

    if( real_size == (Uint64)size )

      p = ndbd_malloc(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, NDBD_EXIT_MEMALLOC, buf1, buf2);

    }