diff options
| author | unknown <reggie@big_geek.> | 2006-05-08 15:15:05 -0500 |
|---|---|---|
| committer | unknown <reggie@big_geek.> | 2006-05-08 15:15:05 -0500 |
| commit | 4f908f248e148fc015f3f82450a003b88bdca98d (patch) | |
| tree | 45e25c571bea2101f73fff090266209606f600ae /mysys/mf_keycache.c | |
| parent | 94c6f6dc4888166b3677f38b534502156ef50d49 (diff) | |
| parent | ec82432941f7f6ef3d60b8d578883633dcaa6f26 (diff) | |
| download | mariadb-git-4f908f248e148fc015f3f82450a003b88bdca98d.tar.gz | |
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
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
Diffstat (limited to 'mysys/mf_keycache.c')
| -rw-r--r-- | mysys/mf_keycache.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c index 1dab9a47ed8..71d73048a7b 100644 --- a/mysys/mf_keycache.c +++ b/mysys/mf_keycache.c @@ -84,14 +84,6 @@ #define KEYCACHE_DEBUG_LOG "my_key_cache_debug.log" */ -#if defined(MSDOS) && !defined(M_IC80386) -/* we nead much memory */ -#undef my_malloc_lock -#undef my_free_lock -#define my_malloc_lock(A,B) halloc((long) (A/IO_SIZE),IO_SIZE) -#define my_free_lock(A,B) hfree(A) -#endif /* defined(MSDOS) && !defined(M_IC80386) */ - #define STRUCT_PTR(TYPE, MEMBER, a) \ (TYPE *) ((char *) (a) - offsetof(TYPE, MEMBER)) |