1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
into  mysql.com:/usr/home/bar/mysql-4.1.b12476
This commit is contained in:
bar@mysql.com 2005-10-13 13:38:15 +05:00
commit 4e0b80d9af
3 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/m_string.h
View File

@ -122,15 +122,6 @@ extern void bmove_align(gptr dst,const gptr src,uint len);
#define bmove512(A,B,C) memcpy(A,B,C) #define bmove512(A,B,C) memcpy(A,B,C)
#endif #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 */ /* Prototypes for string functions */
#if !defined(bfill) && !defined(HAVE_BFILL) #if !defined(bfill) && !defined(HAVE_BFILL)

2
myisam/mi_search.c
View File

@ -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", DBUG_PRINT("info",("key: %lx from: %lx length: %u",
(long) key, (long) from, length)); (long) key, (long) from, length));
memcpy_overlap((byte*) key, (byte*) from, (size_t) length); memmove((byte*) key, (byte*) from, (size_t) length);
key+=length; key+=length;
from+=length; from+=length;
} }

2
strings/ctype-tis620.c
View File

@ -498,7 +498,7 @@ static uint thai2sortable(uchar *tstr, uint len)
l2bias use to control position weight of l2char l2bias use to control position weight of l2char
example (*=l2char) XX*X must come before X*XX 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; tstr[len-1]= l2bias + t_ctype0[1]- L2_GARAN +1;
p--; p--;
continue; continue;