bk commit into 5.1 tree (kaa:1.2492)

[Alexey Kopytov]

Below is the list of changes that have just been committed into a local
5.1 repository of kaa. When kaa does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-03-28 20:10:41+04:00, kaa@stripped +2 -0
  Merge polly.local:/tmp/maint/bug26844/my50-bug26844
  into  polly.local:/tmp/maint/bug26844/my51-bug26844
  MERGE: 1.1810.2372.136

  mysys/my_malloc.c@stripped, 2007-03-28 20:10:36+04:00, kaa@stripped +0 -0
    Auto merged
    MERGE: 1.9.1.4

  mysys/safemalloc.c@stripped, 2007-03-28 20:10:36+04:00, kaa@stripped +0 -0
    Auto merged
    MERGE: 1.24.1.4

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kaa
# Host:	polly.local
# Root:	/tmp/maint/bug26844/my51-bug26844/RESYNC

--- 1.14/mysys/my_malloc.c	2007-03-28 20:10:50 +04:00
+++ 1.15/mysys/my_malloc.c	2007-03-28 20:10:50 +04:00
@@ -37,7 +37,7 @@ gptr my_malloc(unsigned int size, myf my
     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);
   }

--- 1.29/mysys/safemalloc.c	2007-03-28 20:10:50 +04:00
+++ 1.30/mysys/safemalloc.c	2007-03-28 20:10:50 +04:00
@@ -150,11 +150,11 @@ gptr _mymalloc(uint size, const char *fi
       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));