diff options
| author | unknown <serg@serg.mylan> | 2004-02-13 15:30:00 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-02-13 15:30:00 +0100 |
| commit | 4c6344ed6632f6f46f679b7194f2358452d5e04b (patch) | |
| tree | b18d35bd6d44eca9b87d18a27bf8c62a767396fa /libmysql | |
| parent | 9a3a0d7d4062982d0977b9268fd599d7b0745c2d (diff) | |
| parent | e05c2a90da83787ed5f3e26fdada9040ec00ab27 (diff) | |
| download | mariadb-git-4c6344ed6632f6f46f679b7194f2358452d5e04b.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
configure.in:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_sum.h:
Auto merged
sql/sql_string.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
strings/ctype-simple.c:
Auto merged
strings/ctype-ucs2.c:
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 1cffae4dc56..678abc91859 100644 --- a/libmysql/Makefile.shared +++ b/libmysql/Makefile.shared @@ -32,7 +32,7 @@ target_sources = libmysql.c password.c manager.c \ get_password.c errmsg.c mystringsobjects = strmov.lo strxmov.lo strxnmov.lo strnmov.lo \ - strmake.lo strend.lo \ + strmake.lo strend.lo strtod.lo \ strnlen.lo strfill.lo is_prefix.lo \ int2str.lo str2int.lo strinstr.lo strcont.lo \ strcend.lo bcmp.lo ctype-latin1.lo \ |