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 /libmysql/Makefile.shared | |
| 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 'libmysql/Makefile.shared')
| -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 3a2559921f9..02855532e41 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 \ |