diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-01-14 14:33:10 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-01-14 14:33:10 +0200 |
| commit | 8b255948974868d0c5281ab81e17e789c7a0894f (patch) | |
| tree | 8f1edd80f0db85355e2e19efd0034796b55cb32e /libmysql/Makefile.shared | |
| parent | 50989ef2032201d2f969082196d546f8a04368b5 (diff) | |
| parent | 910c125bb6528b08f7c30b7b75650076b7b953fe (diff) | |
| download | mariadb-git-8b255948974868d0c5281ab81e17e789c7a0894f.tar.gz | |
merge
BitKeeper/etc/ignore:
added extra/mysql_waitpid
include/m_ctype.h:
Auto merged
libmysql/Makefile.shared:
Auto merged
mysql-test/r/create.result:
Auto merged
sql/item_strfunc.cc:
Auto merged
Diffstat (limited to 'libmysql/Makefile.shared')
| -rw-r--r-- | libmysql/Makefile.shared | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmysql/Makefile.shared b/libmysql/Makefile.shared index 1aba7bbed43..47b582bc78e 100644 --- a/libmysql/Makefile.shared +++ b/libmysql/Makefile.shared @@ -37,7 +37,7 @@ mystringsobjects = strmov.lo strxmov.lo strxnmov.lo strnmov.lo \ int2str.lo str2int.lo strinstr.lo strcont.lo \ strcend.lo bcmp.lo \ bchange.lo bmove.lo bmove_upp.lo longlong2str.lo \ - strtoull.lo strtoll.lo llstr.lo \ + strtoull.lo strtoll.lo llstr.lo my_vsnprintf.lo \ ctype.lo ctype-simple.lo ctype-bin.lo ctype-mb.lo \ ctype-big5.lo ctype-czech.lo ctype-euc_kr.lo \ ctype-win1250ch.lo ctype-utf8.lo \ @@ -60,7 +60,7 @@ mysysobjects1 = my_init.lo my_static.lo my_malloc.lo my_realloc.lo \ my_compress.lo array.lo my_once.lo list.lo my_net.lo \ charset.lo hash.lo mf_iocache.lo \ mf_iocache2.lo my_seek.lo \ - my_pread.lo mf_cache.lo my_vsnprintf.lo md5.lo sha1.lo\ + my_pread.lo mf_cache.lo md5.lo sha1.lo\ my_getopt.lo my_gethostbyname.lo my_port.lo sqlobjects = net.lo |