diff options
| author | unknown <jimw@mysql.com> | 2005-08-02 16:50:09 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-08-02 16:50:09 -0700 |
| commit | 937f46fb049c15a632319254d5222ea31a0849d2 (patch) | |
| tree | df3a47a65858bc803df1e3897de1738ce72265a2 /libmysql | |
| parent | 88105618c5eba3714189875a8d799cb7503bd657 (diff) | |
| parent | f56dd2a0fa24b154aa71307e12283e43c7ff0914 (diff) | |
| download | mariadb-git-937f46fb049c15a632319254d5222ea31a0849d2.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-5.0-7003
into mysql.com:/home/jimw/my/mysql-5.0-clean
VC++Files/client/mysqlclient.dsp:
Auto merged
VC++Files/client/mysqlclient_ia64.dsp:
Auto merged
VC++Files/libmysql/libmysql.dsp:
Auto merged
VC++Files/libmysql/libmysql_ia64.dsp:
Auto merged
VC++Files/libmysqld/libmysqld.dsp:
Auto merged
libmysql/Makefile.shared:
Auto merged
sql/mysqld.cc:
Auto merged
strings/Makefile.am:
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 fab1a402c1e..a4d616f936a 100644 --- a/libmysql/Makefile.shared +++ b/libmysql/Makefile.shared @@ -46,7 +46,7 @@ mystringsobjects = strmov.lo strxmov.lo strxnmov.lo strnmov.lo \ ctype-win1250ch.lo ctype-utf8.lo ctype-extra.lo \ ctype-ucs2.lo ctype-gb2312.lo ctype-gbk.lo \ ctype-sjis.lo ctype-tis620.lo ctype-ujis.lo \ - ctype-uca.lo xml.lo my_strtoll10.lo + ctype-uca.lo xml.lo my_strtoll10.lo str_alloc.lo mystringsextra= strto.c dbugobjects = dbug.lo # IT IS IN SAFEMALLOC.C sanity.lo |