diff options
| author | unknown <monty@work.mysql.com> | 2001-06-01 03:13:02 +0200 |
|---|---|---|
| committer | unknown <monty@work.mysql.com> | 2001-06-01 03:13:02 +0200 |
| commit | 2085b1950d18594d714bc929f761005ed0edde33 (patch) | |
| tree | 78a2d6b0528d04c729f1139a6abfd588ee1ef9e1 /libmysql | |
| parent | a2458dd71eaf7d49562f4f719fcf034014ef3652 (diff) | |
| parent | 7032533d4cf4484d3e2dc214d6d982ceefbab65d (diff) | |
| download | mariadb-git-2085b1950d18594d714bc929f761005ed0edde33.tar.gz | |
Merge work.mysql.com:/home/bk/mysql
into work.mysql.com:/home/bk/mysql-4.0
BitKeeper/etc/logging_ok:
auto-union
Docs/manual.texi:
Auto merged
include/my_sys.h:
Auto merged
libmysql/Makefile.shared:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_repl.cc:
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 e1ae1fa1ea6..0710484cbbe 100644 --- a/libmysql/Makefile.shared +++ b/libmysql/Makefile.shared @@ -51,7 +51,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_fstream.lo \ + my_symlink.lo my_fstream.lo \ mf_loadpath.lo my_pthread.lo my_thr_init.lo \ thr_mutex.lo mulalloc.lo string.lo default.lo \ my_compress.lo array.lo my_once.lo list.lo my_net.lo \ |