diff options
| author | unknown <tsmith@ramayana.hindu.god> | 2007-11-07 15:47:25 -0700 |
|---|---|---|
| committer | unknown <tsmith@ramayana.hindu.god> | 2007-11-07 15:47:25 -0700 |
| commit | f7d4192585ef29b1525f799e7cad4a0e403e90b1 (patch) | |
| tree | b2b8ec8be76873a28415e1a77f069d3a5337dd81 /mysys/Makefile.am | |
| parent | 8680f86e460d8be123ddbbc855c0e744dd749648 (diff) | |
| parent | 707f42a6b988d94630f3e43dad410311f40ac4f8 (diff) | |
| download | mariadb-git-f7d4192585ef29b1525f799e7cad4a0e403e90b1.tar.gz | |
Merge ramayana.hindu.god:/home/tsmith/m/bk/build/b20748/50
into ramayana.hindu.god:/home/tsmith/m/bk/build/b20748/51
libmysql/Makefile.shared:
Auto merged
mysys/CMakeLists.txt:
Auto merged
mysys/Makefile.am:
Auto merged
include/my_sys.h:
Manual merge
mysys/default.c:
Manual merge:
- We don't support OS/2 in MySQL 5.1
- On Unix, we search /etc/mysql/ in MySQL 5.1
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 fca13ab52b8..f06d81da849 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_mmap.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_strip.c \ + mf_pack.c mf_unixpath.c mf_strip.c mf_arr_appstr.c \ mf_wcomp.c mf_wfile.c my_gethwaddr.c \ mf_qsort.c mf_qsort2.c mf_sort.c \ ptr_cmp.c mf_radix.c queues.c my_getncpus.c \ |