diff options
author | unknown <kent@mysql.com> | 2005-08-26 14:32:38 +0200 |
---|---|---|
committer | unknown <kent@mysql.com> | 2005-08-26 14:32:38 +0200 |
commit | 4fc708a9bb990a93974ec795d64f8be97517d0d7 (patch) | |
tree | 16de00dceb3c9f150bda29fffcab0e3c52e395b3 /mysys | |
parent | e15d338786bec12864af5483210ca77cec074e29 (diff) | |
parent | 45fd1c9a9d0cdb059ae476feb6ae922d24bbffb8 (diff) | |
download | mariadb-git-4fc708a9bb990a93974ec795d64f8be97517d0d7.tar.gz |
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
configure.in:
Auto merged
sql/sp_head.cc:
Auto merged
Diffstat (limited to 'mysys')
-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 868f68096ae..9c58c18cf59 100644 --- a/mysys/Makefile.am +++ b/mysys/Makefile.am @@ -30,7 +30,7 @@ libmysys_a_SOURCES = my_init.c my_getwd.c mf_getdate.c my_mmap.c \ mf_path.c mf_loadpath.c my_file.c \ my_open.c my_create.c my_dup.c my_seek.c my_read.c \ my_pread.c my_write.c \ - mf_keycaches.c my_crc32.c \ + mf_keycache.c mf_keycaches.c my_crc32.c \ mf_iocache.c mf_iocache2.c mf_cache.c mf_tempfile.c \ mf_tempdir.c my_lock.c mf_brkhant.c my_alarm.c \ my_malloc.c my_realloc.c my_once.c mulalloc.c \ |