diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-05-27 23:52:21 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-05-27 23:52:21 +0300 |
| commit | 766038f27750b0243a6147c9aaa97b2d8dea114f (patch) | |
| tree | ce0149ca9ce44752aec0e31495476c57b4047278 /mysys/Makefile.am | |
| parent | 37db9f71bae8f09a3ca99ce1438aa4131756efd8 (diff) | |
| parent | 940a8a4020442f0d19d0137a8a847429af3f8a05 (diff) | |
| download | mariadb-git-766038f27750b0243a6147c9aaa97b2d8dea114f.tar.gz | |
merge with 3.23.51
BitKeeper/etc/logging_ok:
auto-union
BUILD/SETUP.sh:
Auto merged
Docs/manual.texi:
Auto merged
extra/resolveip.c:
Auto merged
include/my_sys.h:
Auto merged
mysql-test/t/type_enum.test:
Auto merged
mysys/mf_strip.c:
Auto merged
mysys/raid.cc:
Auto merged
include/my_net.h:
merge
mysql-test/r/type_enum.result:
merge
mysql-test/t/type_decimal.test:
merge
mysys/Makefile.am:
merge
sql/sql_db.cc:
merge
sql/sql_parse.cc:
merge
Diffstat (limited to 'mysys/Makefile.am')
| -rw-r--r-- | mysys/Makefile.am | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mysys/Makefile.am b/mysys/Makefile.am index 9e458331619..0630d663fe5 100644 --- a/mysys/Makefile.am +++ b/mysys/Makefile.am @@ -35,7 +35,7 @@ libmysys_a_SOURCES = my_init.c my_getwd.c mf_getdate.c\ my_error.c errors.c my_div.c my_messnc.c \ mf_format.c mf_same.c mf_dirname.c mf_fn_ext.c \ my_symlink.c my_symlink2.c \ - mf_pack.c mf_unixpath.c mf_stripp.c \ + mf_pack.c mf_unixpath.c mf_strip.c \ mf_casecnv.c mf_soundex.c mf_wcomp.c mf_wfile.c \ mf_qsort.c mf_qsort2.c mf_sort.c \ ptr_cmp.c mf_radix.c queues.c \ @@ -45,7 +45,8 @@ libmysys_a_SOURCES = my_init.c my_getwd.c mf_getdate.c\ my_chsize.c my_lread.c my_lwrite.c my_clock.c \ my_quick.c my_lockmem.c my_static.c \ my_getopt.c getvar.c my_mkdir.c \ - default.c my_compress.c checksum.c raid.cc my_net.c \ + default.c my_compress.c checksum.c raid.cc raid2.c \ + my_net.c \ my_vsnprintf.c charset.c my_bitmap.c my_bit.c md5.c \ my_gethostbyname.c EXTRA_DIST = thr_alarm.c thr_lock.c my_pthread.c my_thr_init.c \ |