diff options
| author | unknown <tsmith@ramayana.hindu.god> | 2007-11-07 16:26:29 -0700 |
|---|---|---|
| committer | unknown <tsmith@ramayana.hindu.god> | 2007-11-07 16:26:29 -0700 |
| commit | 3a7e070f53565c225b19bd633effbd21d2822b10 (patch) | |
| tree | 985e1a3104a72b480c88c6f6ee954c6a627ecd64 /libmysql | |
| parent | 7bb73945459e71bdd8fa1297dc3fd313306235cc (diff) | |
| parent | 707f42a6b988d94630f3e43dad410311f40ac4f8 (diff) | |
| download | mariadb-git-3a7e070f53565c225b19bd633effbd21d2822b10.tar.gz | |
Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50
into ramayana.hindu.god:/home/tsmith/m/bk/build/b20748/50
include/my_sys.h:
Auto merged
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/Makefile.shared | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysql/Makefile.shared b/libmysql/Makefile.shared index dc6d658fcdf..7839c117432 100644 --- a/libmysql/Makefile.shared +++ b/libmysql/Makefile.shared @@ -59,7 +59,7 @@ mysysobjects1 = my_init.lo my_static.lo my_malloc.lo my_realloc.lo \ mf_pack.lo my_messnc.lo mf_dirname.lo mf_fn_ext.lo\ mf_wcomp.lo typelib.lo safemalloc.lo my_alloc.lo \ mf_format.lo mf_path.lo mf_unixpath.lo my_fopen.lo \ - my_symlink.lo my_fstream.lo \ + my_symlink.lo my_fstream.lo mf_arr_appstr.lo \ mf_loadpath.lo my_pthread.lo my_thr_init.lo \ thr_mutex.lo mulalloc.lo string.lo \ default.lo default_modify.lo \ |