mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

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


myisam/mi_search.c:
  Auto merged
include/m_string.h:
  SCCS merged
This commit is contained in:
unknown 2005-10-13 12:48:30 +05:00
commit 5de7ba46e8
2 changed files with 1 additions and 10 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)
#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)

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",
(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;
}