diff options
| author | unknown <serg@serg.mysql.com> | 2002-10-12 17:40:57 +0000 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2002-10-12 17:40:57 +0000 |
| commit | c05fc7c9bd103cfc80e97e6e664e02b0ff422e6d (patch) | |
| tree | 3f52f19e11025682550ce93b74058f00b3bbecd0 /mysys/Makefile.am | |
| parent | 102cec14653cf1bacbcff81eee9b726a85c145b1 (diff) | |
| parent | a7430f38b30436d00cafcb33ce62f2f2efa0bc19 (diff) | |
| download | mariadb-git-c05fc7c9bd103cfc80e97e6e664e02b0ff422e6d.tar.gz | |
Merge work:/home/bk/mysql-4.1
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
include/my_sys.h:
Auto merged
mysys/Makefile.am:
Auto merged
Diffstat (limited to 'mysys/Makefile.am')
| -rw-r--r-- | mysys/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/Makefile.am b/mysys/Makefile.am index 192b5e7fe37..46f419c561b 100644 --- a/mysys/Makefile.am +++ b/mysys/Makefile.am @@ -31,7 +31,7 @@ libmysys_a_SOURCES = my_init.c my_getwd.c mf_getdate.c\ my_pread.c my_write.c \ mf_keycache.c \ mf_iocache.c mf_iocache2.c mf_cache.c mf_tempfile.c \ - my_lock.c mf_brkhant.c my_alarm.c \ + mf_tempdir.c my_lock.c mf_brkhant.c my_alarm.c \ my_malloc.c my_realloc.c my_once.c mulalloc.c \ my_alloc.c safemalloc.c my_new.cc \ my_fopen.c my_fstream.c \ |