bk commit into 4.0 tree (ramil:1.2162) BUG#10836

[ramil]

Below is the list of changes that have just been committed into a local
4.0 repository of ram. When ram 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.2162 05/10/12 18:50:25 ramil@stripped +2 -0
  memcpy_overlap() removed, as 
    1. it's wrong to use memcpy() for overlapped areas;
    2. we use it only once.
  During merge to 4.1 will remove a memcpy_overlap() call 
  from strings/ctype-tis620.c as well in order to fix 
  bug #10836: ctype_tis620 test failure with ICC-compiled binaries on IA64.

  myisam/mi_search.c
    1.44 05/10/12 18:50:22 ramil@stripped +1 -1
    use memmove() instead, as memcpy_overlap() is removed.

  include/m_string.h
    1.23 05/10/12 18:50:22 ramil@stripped +0 -10
    memcpy_overlap() removed, as 
      1. it's wrong to use memcpy() for overlapped areas;
      2. we use it only once.
    During merge to 4.1 will remove a memcpy_overlap() call 
    from strings/ctype-tis620.c as well in order to fix 
    bug #10836: ctype_tis620 test failure with ICC-compiled binaries on IA64.

# 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:	ramil
# Host:	myoffice.izhnet.ru
# Root:	/usr/home/ram/work/mysql-4.0

--- 1.22/include/m_string.h	2004-08-30 20:41:39 +05:00
+++ 1.23/include/m_string.h	2005-10-12 18:50:22 +05:00
@@ -119,16 +119,6 @@
 #define bmove512(A,B,C) memcpy(A,B,C)
 #endif
 
-#ifdef HAVE_purify
-#include <assert.h>
-#define memcpy_overlap(A,B,C) \
-DBUG_ASSERT((A) <= (B) || ((B)+(C)) <= (A)); \
-bmove((byte*) key,(byte*) from,(size_t) length);
-#else
-#define memcpy_overlap(A,B,C) memcpy((A), (B), (C))
-#endif /* HAVE_purify */
-
-
 	/* Prototypes for string functions */
 
 #if !defined(bfill) && !defined(HAVE_BFILL)

--- 1.43/myisam/mi_search.c	2005-09-23 13:15:08 +05:00
+++ 1.44/myisam/mi_search.c	2005-10-12 18:50:22 +05:00
@@ -1306,7 +1306,7 @@
     }
     DBUG_PRINT("info",("key: %p  from: %p  length: %u",
 		       key, from, length));
-    memcpy_overlap((byte*) key, (byte*) from, (size_t) length);
+    memmove((byte*) key, (byte*) from, (size_t) length);
     key+=length;
     from+=length;
   }