diff options
| author | unknown <monty@hundin.mysql.fi> | 2003-01-17 21:41:38 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2003-01-17 21:41:38 +0200 |
| commit | 0ee64eb3d2daccd29478832ef9ce86f0ea086e9d (patch) | |
| tree | f9446dcd62886ac99db52d3b51b1c26e3cbdd336 /libmysql/Makefile.shared | |
| parent | 0adfa1eef906d5f55ee5cb8d34bb81c13aae8ec9 (diff) | |
| parent | 63efa1331ee03aef71dd9aa4c8cbdc3f6de45b23 (diff) | |
| download | mariadb-git-0ee64eb3d2daccd29478832ef9ce86f0ea086e9d.tar.gz | |
merge
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'libmysql/Makefile.shared')
| -rw-r--r-- | libmysql/Makefile.shared | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libmysql/Makefile.shared b/libmysql/Makefile.shared index 4d8b703fb2d..47b582bc78e 100644 --- a/libmysql/Makefile.shared +++ b/libmysql/Makefile.shared @@ -37,12 +37,12 @@ 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 \ ctype-gb2312.lo ctype-gbk.lo ctype-latin1_de.lo \ - ctype-sjis.lo ctype-tis620.lo ctype-ujis.lo + ctype-sjis.lo ctype-tis620.lo ctype-ujis.lo xml.lo mystringsextra= strto.c dbugobjects = dbug.lo # IT IS IN SAFEMALLOC.C sanity.lo @@ -58,9 +58,9 @@ mysysobjects1 = my_init.lo my_static.lo my_malloc.lo my_realloc.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 \ - charset.lo xml.lo hash.lo mf_iocache.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 |