bk commit into 5.1 tree (svoj:1.2360)

[Sergey Vojtovich]

Below is the list of changes that have just been committed into a local
5.1 repository of svoj. When svoj 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
  1.2360 06/04/24 20:19:32 svoj@april.(none) +1 -0
  after merge fix

  storage/myisam/mi_dynrec.c
    1.43 06/04/24 20:19:28 svoj@april.(none) +5 -0
    after merge fix

# 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:	svoj
# Host:	april.(none)
# Root:	/home/svoj/devel/mysql/merge/mysql-5.1-new

--- 1.42/storage/myisam/mi_dynrec.c	2006-02-22 11:31:55 +04:00
+++ 1.43/storage/myisam/mi_dynrec.c	2006-04-24 20:19:28 +05:00
@@ -67,6 +67,11 @@
 my_bool mi_dynmap_file(MI_INFO *info, my_off_t size)
 {
   DBUG_ENTER("mi_dynmap_file");
+  if (size > (my_off_t) (~((size_t) 0)) - MEMMAP_EXTRA_MARGIN)
+  {
+    DBUG_PRINT("warning", ("File is too large for mmap"));
+    DBUG_RETURN(1);
+  }
   info->s->file_map= (byte*)
                   my_mmap(0, (size_t)(size + MEMMAP_EXTRA_MARGIN),
                           info->s->mode==O_RDONLY ? PROT_READ :