Commit 787318dc authored by unknown's avatar unknown
Browse files

Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 

into  mysql.com:/usr/home/bar/mysql-4.1.b12476
parents 3818980e 3657f600

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;

  }

strings/ctype-tis620.c

+1 −1
Original line number Diff line number Diff line
@@ -498,7 +498,7 @@ static uint thai2sortable(uchar *tstr, uint len) 
	  l2bias use to control position weight of l2char

	  example (*=l2char) XX*X must come before X*XX

	*/

	memcpy_overlap((char*) p, (char*) (p+1), tlen-1);

	memmove((char*) p, (char*) (p+1), tlen-1);

	tstr[len-1]= l2bias + t_ctype0[1]- L2_GARAN +1;

	p--;

	continue;