diff options
| author | unknown <cmiller@zippy.(none)> | 2006-05-01 22:50:36 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.(none)> | 2006-05-01 22:50:36 -0400 |
| commit | 4d1cd02ef6fb976b12b0ee9542f49ababc81abeb (patch) | |
| tree | aae6cd99ec61e48a42db408ac62d15a8261284d3 /mysys/Makefile.am | |
| parent | 71c4827b8117f6626371a6389bc91496605ebf3c (diff) | |
| parent | 3010890e589de89d2f5bb4c0e2c3a0b06b827b10 (diff) | |
| download | mariadb-git-4d1cd02ef6fb976b12b0ee9542f49ababc81abeb.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into zippy.(none):/home/cmiller/work/mysql/mysql-5.0__bug17667
mysys/Makefile.am:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'mysys/Makefile.am')
| -rw-r--r-- | mysys/Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysys/Makefile.am b/mysys/Makefile.am index 2de8d7820f5..d046b2fa3f8 100644 --- a/mysys/Makefile.am +++ b/mysys/Makefile.am @@ -55,6 +55,7 @@ libmysys_a_SOURCES = my_init.c my_getwd.c mf_getdate.c my_mmap.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 \ + my_memmem.c \ my_windac.c my_access.c base64.c EXTRA_DIST = thr_alarm.c thr_lock.c my_pthread.c my_thr_init.c \ thr_mutex.c thr_rwlock.c |