summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <bar@noter.intranet.mysql.r18.ru>2004-09-25 17:20:50 +0500
committerunknown <bar@noter.intranet.mysql.r18.ru>2004-09-25 17:20:50 +0500
commite619a0ae239d0cc7e16a572b1fc89225424f74da (patch)
tree3439f79ee842a1f36a3d0a9505be5d93a834525c
parent8025aaaae50207616308215e24c5e37340ff8e04 (diff)
downloadmariadb-git-e619a0ae239d0cc7e16a572b1fc89225424f74da.tar.gz
Activating the new string->number conversion functions
-rw-r--r--libmysql/Makefile.shared2
-rw-r--r--strings/ctype-simple.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/libmysql/Makefile.shared b/libmysql/Makefile.shared
index 389e8e9ff34..9664fb0abef 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
+ ctype-uca.lo xml.lo my_strtoll10.lo
mystringsextra= strto.c
dbugobjects = dbug.lo # IT IS IN SAFEMALLOC.C sanity.lo
diff --git a/strings/ctype-simple.c b/strings/ctype-simple.c
index a9c2b07d05b..a019665a235 100644
--- a/strings/ctype-simple.c
+++ b/strings/ctype-simple.c
@@ -1286,7 +1286,7 @@ static my_bool my_coll_init_simple(CHARSET_INFO *cs,
longlong my_strtoll10_8bit(CHARSET_INFO *cs __attribute__((unused)),
const char *nptr, char **endptr, int *error)
{
- return 0; /* my_strtoll10(nptr, endptr, error); */
+ return my_strtoll10(nptr, endptr, error);
}