Commit 4f15839f authored by thek@adventure.(none)'s avatar thek@adventure.(none)
Browse files

Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 

into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
parents a9fff11f 27b6c17d

mysys/my_alloc.c

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ void *alloc_root(MEM_ROOT *mem_root, size_t length) 
    {

      if (mem_root->error_handler)

	(*mem_root->error_handler)();

      return((void*) 0);                      /* purecov: inspected */

      DBUG_RETURN((void*) 0);                      /* purecov: inspected */

    }

    mem_root->block_num++;

    next->next= *prev;