diff options
author | unknown <petr@mysql.com> | 2005-05-16 03:01:05 +0400 |
---|---|---|
committer | unknown <petr@mysql.com> | 2005-05-16 03:01:05 +0400 |
commit | 577f140e3f0010c2a50c988f523d66b9d5d27303 (patch) | |
tree | 56d4f80052ccf888c59433be52b8ea30b5a79fb1 /libmysql | |
parent | 04b56a3efabc24e721cd2438b5df9f9585634cc6 (diff) | |
parent | 6b4dbcb4db8236d5226284ff87af9126aa83f5b6 (diff) | |
download | mariadb-git-577f140e3f0010c2a50c988f523d66b9d5d27303.tar.gz |
Merge
include/my_sys.h:
Auto merged
libmysql/Makefile.shared:
Auto merged
mysys/default.c:
SCCS 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 204c833dd21..bcd2ec6c057 100644 --- a/libmysql/Makefile.shared +++ b/libmysql/Makefile.shared @@ -67,7 +67,7 @@ mysysobjects1 = my_init.lo my_static.lo my_malloc.lo my_realloc.lo \ mf_iocache2.lo my_seek.lo my_sleep.lo \ my_pread.lo mf_cache.lo md5.lo sha1.lo \ my_getopt.lo my_gethostbyname.lo my_port.lo \ - my_rename.lo + my_rename.lo my_chsize.lo sqlobjects = net.lo sql_cmn_objects = pack.lo client.lo my_time.lo |