database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new

Browse Source 
into  big_geek.:C:/Work/mysql/mysql-5.1


include/config-win.h:
  Auto merged
include/m_string.h:
  Auto merged
include/my_base.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/my_tree.h:
  Auto merged
mysys/mf_keycache.c:
  Auto merged
mysys/my_init.c:
  Auto merged
mysys/my_open.c:
  Auto merged
mysys/my_access.c:
  adjusted defines from merge
This commit is contained in:
unknown
2006-05-08 15:15:05 -05:00
parent 94c6f6dc48 ec82432941
commit 4f908f248e
22 changed files with 27 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/m_string.h
View File

@@ -106,12 +106,6 @@ extern char NEAR _dig_vec_lower[];
#define memcpy_fixed(A,B,C) memcpy((A),(B),(C))
#endif
#ifdef MSDOS
#undef bmove_align
#define bmove512(A,B,C) bmove_align(A,B,C)
extern void bmove_align(gptr dst,const gptr src,uint len);
#endif
#if (!defined(USE_BMOVE512) || defined(HAVE_purify)) && !defined(bmove512)
#define bmove512(A,B,C) memcpy(A,B,C)
#endif