Commit 6ba16a70 authored by unknown's avatar unknown
Browse files

Merge polly.local:/tmp/maint/bug26844/my50-bug26844 

into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
parents ff7db598 3d90a07a

mysys/my_malloc.c

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ gptr my_malloc(unsigned int size, myf my_flags) 
    if (my_flags & MY_FAE)

      error_handler_hook=fatal_error_handler_hook;

    if (my_flags & (MY_FAE+MY_WME))

      my_error(EE_OUTOFMEMORY, MYF(ME_BELL+ME_WAITTANG),size);

      my_error(EE_OUTOFMEMORY, MYF(ME_BELL+ME_WAITTANG+ME_NOREFRESH),size);

    if (my_flags & MY_FAE)

      exit(1);

  }

mysys/safemalloc.c

+2 −2
Original line number Diff line number Diff line
@@ -150,11 +150,11 @@ gptr _mymalloc(uint size, const char *filename, uint lineno, myf MyFlags) 
      char buff[SC_MAXWIDTH];

      my_errno=errno;

      sprintf(buff,"Out of memory at line %d, '%s'", lineno, filename);

      my_message(EE_OUTOFMEMORY,buff,MYF(ME_BELL+ME_WAITTANG));

      my_message(EE_OUTOFMEMORY, buff, MYF(ME_BELL+ME_WAITTANG+ME_NOREFRESH));

      sprintf(buff,"needed %d byte (%ldk), memory in use: %ld bytes (%ldk)",

	      size, (size + 1023L) / 1024L,

	      sf_malloc_max_memory, (sf_malloc_max_memory + 1023L) / 1024L);

      my_message(EE_OUTOFMEMORY,buff,MYF(ME_BELL+ME_WAITTANG));

      my_message(EE_OUTOFMEMORY, buff, MYF(ME_BELL+ME_WAITTANG+ME_NOREFRESH));

    }

    DBUG_PRINT("error",("Out of memory, in use: %ld at line %d, '%s'",

			sf_malloc_max_memory,lineno, filename));