diff options
| author | unknown <kent@mysql.com/kent-amd64.(none)> | 2007-03-12 13:22:02 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com/kent-amd64.(none)> | 2007-03-12 13:22:02 +0100 |
| commit | deeb3ee4258852940e48b0b7b950bc5e951831b4 (patch) | |
| tree | f1eb3ac56ebb042ac46ccacf30780dbba5e96b9b /mysys/Makefile.am | |
| parent | 3c8117277601c48a86302ec40dc789a468a425c9 (diff) | |
| parent | d429f590111698d88cfece92c1f3e059af2be306 (diff) | |
| download | mariadb-git-deeb3ee4258852940e48b0b7b950bc5e951831b4.tar.gz | |
Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build
into mysql.com:/home/kent/bk/tmp/mysql-5.0-build
VC++Files/mysys/mysys.vcproj:
Auto merged
VC++Files/mysys/mysys_ia64.dsp:
Auto merged
mysys/Makefile.am:
Auto merged
BitKeeper/deleted/.del-my_semaphore.c:
Auto merged
VC++Files/mysys/mysys.dsp:
SCCS 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 8f810598a47..d145b7faf86 100644 --- a/mysys/Makefile.am +++ b/mysys/Makefile.am @@ -50,7 +50,7 @@ libmysys_a_SOURCES = my_init.c my_getwd.c mf_getdate.c my_mmap.c \ my_sync.c my_getopt.c my_mkdir.c \ default_modify.c default.c \ my_compress.c checksum.c raid.cc \ - my_net.c my_semaphore.c my_port.c my_sleep.c \ + my_net.c my_port.c my_sleep.c \ charset.c charset-def.c my_bitmap.c my_bit.c md5.c \ my_gethostbyname.c rijndael.c my_aes.c sha1.c \ my_handler.c my_netware.c my_largepage.c \ |