Commit 5de7ba46 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr/home/ram/work/mysql-4.0 

into  mysql.com:/usr/home/ram/work/mysql-4.1


myisam/mi_search.c:
  Auto merged
include/m_string.h:
  SCCS merged
parents 62002fdc 6c89848d

include/m_string.h

+0 −9
Original line number Diff line number Diff line
@@ -122,15 +122,6 @@ extern void bmove_align(gptr dst,const gptr src,uint len); 
#define bmove512(A,B,C) memcpy(A,B,C)

#endif



#ifdef HAVE_purify

#define memcpy_overlap(A,B,C) \

DBUG_ASSERT((A) <= (B) || ((B)+(C)) <= (A)); \

bmove((byte*) (A),(byte*) (B),(size_t) (C));

#else

#define memcpy_overlap(A,B,C) memcpy((A), (B), (C))

#endif /* HAVE_purify */





	/* Prototypes for string functions */



#if !defined(bfill) && !defined(HAVE_BFILL)

myisam/mi_search.c

+1 −1
Original line number Diff line number Diff line
@@ -978,7 +978,7 @@ uint _mi_get_binary_pack_key(register MI_KEYDEF *keyinfo, uint nod_flag, 
    }

    DBUG_PRINT("info",("key: %lx  from: %lx  length: %u",

		       (long) key, (long) from, length));

    memcpy_overlap((byte*) key, (byte*) from, (size_t) length);

    memmove((byte*) key, (byte*) from, (size_t) length);

    key+=length;

    from+=length;

  }