From 4b021e6ea99ac80745875118ccbde5621588890b Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 27 Nov 2002 15:47:39 +0400 Subject: [PATCH] Preparing to use better string-to-number functions to avoid c_ptr() call, wich is slower and is not ucs2 compatible --- include/m_ctype.h | 30 ++--- mysys/charset.c | 9 +- sql/gstream.cc | 2 +- strings/ctype-big5.c | 10 +- strings/ctype-bin.c | 10 +- strings/ctype-czech.c | 10 +- strings/ctype-euc_kr.c | 10 +- strings/ctype-gb2312.c | 10 +- strings/ctype-gbk.c | 10 +- strings/ctype-latin1_de.c | 10 +- strings/ctype-simple.c | 30 ++--- strings/ctype-sjis.c | 10 +- strings/ctype-tis620.c | 10 +- strings/ctype-ujis.c | 10 +- strings/ctype-utf8.c | 50 ++++----- strings/ctype-win1250ch.c | 10 +- strings/ctype.c | 230 +++++++++++++++++++------------------- 17 files changed, 231 insertions(+), 230 deletions(-) diff --git a/include/m_ctype.h b/include/m_ctype.h index b16db5cde97..deba69700a2 100644 --- a/include/m_ctype.h +++ b/include/m_ctype.h @@ -125,11 +125,11 @@ typedef struct charset_info_st /* Charset dependant snprintf() */ int (*snprintf)(struct charset_info_st *, char *to, uint n, const char *fmt, ...); - long (*strtol)(struct charset_info_st *, const char *s, char **e, int base); - ulong (*strtoul)(struct charset_info_st *, const char *s, char **e, int base); - longlong (*strtoll)(struct charset_info_st *, const char *s, char **e, int base); - ulonglong (*strtoull)(struct charset_info_st *, const char *s, char **e, int base); - double (*strtod)(struct charset_info_st *, const char *s, char **e); + long (*strntol)(struct charset_info_st *, const char *s, uint l,char **e, int base); + ulong (*strntoul)(struct charset_info_st *, const char *s, uint l, char **e, int base); + longlong (*strntoll)(struct charset_info_st *, const char *s, uint l, char **e, int base); + ulonglong (*strntoull)(struct charset_info_st *, const char *s, uint l, char **e, int base); + double (*strntod)(struct charset_info_st *, const char *s, uint l, char **e); } CHARSET_INFO; @@ -169,11 +169,11 @@ int my_wc_mb_8bit(CHARSET_INFO *cs,my_wc_t wc, uchar *s, uchar *e); int my_snprintf_8bit(struct charset_info_st *, char *to, uint n, const char *fmt, ...); -long my_strtol_8bit(CHARSET_INFO *, const char *s, char **e, int base); -ulong my_strtoul_8bit(CHARSET_INFO *, const char *s, char **e, int base); -longlong my_strtoll_8bit(CHARSET_INFO *, const char *s, char **e, int base); -ulonglong my_strtoull_8bit(CHARSET_INFO *, const char *s, char **e, int base); -double my_strtod_8bit(CHARSET_INFO *, const char *s, char **e); +long my_strntol_8bit(CHARSET_INFO *, const char *s, uint l,char **e, int base); +ulong my_strntoul_8bit(CHARSET_INFO *, const char *s, uint l,char **e, int base); +longlong my_strntoll_8bit(CHARSET_INFO *, const char *s, uint l,char **e, int base); +ulonglong my_strntoull_8bit(CHARSET_INFO *, const char *s, uint l,char **e, int base); +double my_strntod_8bit(CHARSET_INFO *, const char *s, uint l,char **e); my_bool my_like_range_simple(CHARSET_INFO *cs, const char *ptr, uint ptr_length, @@ -257,11 +257,11 @@ int my_wildcmp_mb(CHARSET_INFO *, #define my_strcasecmp(s, a, b) ((s)->strcasecmp((s), (a), (b))) #define my_strncasecmp(s, a, b, l) ((s)->strncasecmp((s), (a), (b), (l))) -#define my_strtol(s, a, b, c) ((s)->strtol((s),(a),(b),(c))) -#define my_strtoul(s, a, b, c) ((s)->strtoul((s),(a),(b),(c))) -#define my_strtoll(s, a, b, c) ((s)->strtoll((s),(a),(b),(c))) -#define my_strtoull(s, a, b, c) ((s)->strtoull((s),(a),(b),(c))) -#define my_strtod(s, a, b) ((s)->strtod((s),(a),(b))) +#define my_strtol(s, a, b, c, d) ((s)->strtol((s),(a),(b),(c),(d))) +#define my_strtoul(s, a, b, c, d) ((s)->strtoul((s),(a),(b),(c),(d))) +#define my_strtoll(s, a, b, c, d) ((s)->strtoll((s),(a),(b),(c),(d))) +#define my_strtoull(s, a, b, c,d) ((s)->strtoull((s),(a),(b),(c),(d))) +#define my_strtod(s, a, b, c ) ((s)->strtod((s),(a),(b),(c))) /* XXX: still need to take care of this one */ diff --git a/mysys/charset.c b/mysys/charset.c index 91bae04046b..cf0628495fc 100644 --- a/mysys/charset.c +++ b/mysys/charset.c @@ -391,10 +391,11 @@ static CHARSET_INFO *add_charset(CHARSET_INFO *cs, myf flags) cs->hash_caseup = my_hash_caseup_simple; cs->hash_sort = my_hash_sort_simple; cs->snprintf = my_snprintf_8bit; - cs->strtol = my_strtol_8bit; - cs->strtoul = my_strtoul_8bit; - cs->strtoll = my_strtoll_8bit; - cs->strtoull = my_strtoull_8bit; + cs->strntol = my_strntol_8bit; + cs->strntoul = my_strntoul_8bit; + cs->strntoll = my_strntoll_8bit; + cs->strntoull = my_strntoull_8bit; + cs->strntod = my_strntod_8bit; cs->mbmaxlen = 1; set_max_sort_char(cs); diff --git a/sql/gstream.cc b/sql/gstream.cc index bd2345212c3..5a58fef6744 100644 --- a/sql/gstream.cc +++ b/sql/gstream.cc @@ -99,7 +99,7 @@ int GTextReadStream::get_next_number(double *d) char *endptr; - *d = my_strtod(my_charset_latin1, cur, &endptr); + *d = strtod(cur, &endptr); if(endptr) { diff --git a/strings/ctype-big5.c b/strings/ctype-big5.c index 39ddee854ff..b41ed82aeae 100644 --- a/strings/ctype-big5.c +++ b/strings/ctype-big5.c @@ -6249,11 +6249,11 @@ CHARSET_INFO my_charset_big5 = my_hash_sort_simple, 0, my_snprintf_8bit, - my_strtol_8bit, - my_strtoul_8bit, - my_strtoll_8bit, - my_strtoull_8bit, - my_strtod_8bit + my_strntol_8bit, + my_strntoul_8bit, + my_strntoll_8bit, + my_strntoull_8bit, + my_strntod_8bit }; diff --git a/strings/ctype-bin.c b/strings/ctype-bin.c index 2573ec89660..29784acab16 100644 --- a/strings/ctype-bin.c +++ b/strings/ctype-bin.c @@ -270,11 +270,11 @@ static CHARSET_INFO my_charset_bin_st = my_hash_sort_bin, /* hash_sort */ 255, /* max_sort_char */ my_snprintf_8bit, /* snprintf */ - my_strtol_8bit, - my_strtoul_8bit, - my_strtoll_8bit, - my_strtoull_8bit, - my_strtod_8bit + my_strntol_8bit, + my_strntoul_8bit, + my_strntoll_8bit, + my_strntoull_8bit, + my_strntod_8bit }; diff --git a/strings/ctype-czech.c b/strings/ctype-czech.c index ea3cc702abd..837545ce70f 100644 --- a/strings/ctype-czech.c +++ b/strings/ctype-czech.c @@ -627,11 +627,11 @@ CHARSET_INFO my_charset_czech = my_hash_sort_simple, 0, my_snprintf_8bit, - my_strtol_8bit, - my_strtoul_8bit, - my_strtoll_8bit, - my_strtoull_8bit, - my_strtod_8bit + my_strntol_8bit, + my_strntoul_8bit, + my_strntoll_8bit, + my_strntoull_8bit, + my_strntod_8bit }; #endif diff --git a/strings/ctype-euc_kr.c b/strings/ctype-euc_kr.c index 8a614851fe3..57d237364f6 100644 --- a/strings/ctype-euc_kr.c +++ b/strings/ctype-euc_kr.c @@ -8667,11 +8667,11 @@ CHARSET_INFO my_charset_euc_kr = my_hash_sort_simple, 0, my_snprintf_8bit, - my_strtol_8bit, - my_strtoul_8bit, - my_strtoll_8bit, - my_strtoull_8bit, - my_strtod_8bit + my_strntol_8bit, + my_strntoul_8bit, + my_strntoll_8bit, + my_strntoull_8bit, + my_strntod_8bit }; #endif diff --git a/strings/ctype-gb2312.c b/strings/ctype-gb2312.c index 7a8e9f011a0..205b7c2a1da 100644 --- a/strings/ctype-gb2312.c +++ b/strings/ctype-gb2312.c @@ -5717,11 +5717,11 @@ CHARSET_INFO my_charset_gb2312 = my_hash_sort_simple, 0, my_snprintf_8bit, - my_strtol_8bit, - my_strtoul_8bit, - my_strtoll_8bit, - my_strtoull_8bit, - my_strtod_8bit + my_strntol_8bit, + my_strntoul_8bit, + my_strntoll_8bit, + my_strntoull_8bit, + my_strntod_8bit }; #endif diff --git a/strings/ctype-gbk.c b/strings/ctype-gbk.c index 504039a4e59..aec38e8dfa8 100644 --- a/strings/ctype-gbk.c +++ b/strings/ctype-gbk.c @@ -9904,11 +9904,11 @@ CHARSET_INFO my_charset_gbk = my_hash_sort_simple, 0, my_snprintf_8bit, - my_strtol_8bit, - my_strtoul_8bit, - my_strtoll_8bit, - my_strtoull_8bit, - my_strtod_8bit + my_strntol_8bit, + my_strntoul_8bit, + my_strntoll_8bit, + my_strntoull_8bit, + my_strntod_8bit }; diff --git a/strings/ctype-latin1_de.c b/strings/ctype-latin1_de.c index 13a35e3c82e..696fa0f6192 100644 --- a/strings/ctype-latin1_de.c +++ b/strings/ctype-latin1_de.c @@ -445,11 +445,11 @@ CHARSET_INFO my_charset_latin1_de = my_hash_sort_simple, 0, my_snprintf_8bit, - my_strtol_8bit, - my_strtoul_8bit, - my_strtoll_8bit, - my_strtoull_8bit, - my_strtod_8bit + my_strntol_8bit, + my_strntoul_8bit, + my_strntoll_8bit, + my_strntoull_8bit, + my_strntod_8bit }; #endif diff --git a/strings/ctype-simple.c b/strings/ctype-simple.c index f9a9caad206..6ae305bbf7d 100644 --- a/strings/ctype-simple.c +++ b/strings/ctype-simple.c @@ -244,34 +244,34 @@ void my_hash_sort_simple(CHARSET_INFO *cs, } } -long my_strtol_8bit(CHARSET_INFO *cs __attribute__((unused)), - const char *s, char **e, int base) +long my_strntol_8bit(CHARSET_INFO *cs __attribute__((unused)), + const char *s, uint l, char **e, int base) { - return strtol(s,e,base); + return 0; } -ulong my_strtoul_8bit(CHARSET_INFO *cs __attribute__((unused)), - const char *s, char **e, int base) +ulong my_strntoul_8bit(CHARSET_INFO *cs __attribute__((unused)), + const char *s, uint l, char **e, int base) { - return strtoul(s,e,base); + return 0; } -longlong my_strtoll_8bit(CHARSET_INFO *cs __attribute__((unused)), - const char *s, char **e, int base) +longlong my_strntoll_8bit(CHARSET_INFO *cs __attribute__((unused)), + const char *s, uint l, char **e, int base) { - return strtoll(s,e,base); + return 0; } -ulonglong my_strtoull_8bit(CHARSET_INFO *cs __attribute__((unused)), - const char *s, char **e, int base) +ulonglong my_strntoull_8bit(CHARSET_INFO *cs __attribute__((unused)), + const char *s, uint l, char **e, int base) { - return strtoul(s,e,base); + return 0; } -double my_strtod_8bit(CHARSET_INFO *cs __attribute__((unused)), - const char *s, char **e) +double my_strntod_8bit(CHARSET_INFO *cs __attribute__((unused)), + const char *s, uint l, char **e) { - return strtod(s,e); + return 0; } diff --git a/strings/ctype-sjis.c b/strings/ctype-sjis.c index 91a9fae55fa..1ccf0b1d8f2 100644 --- a/strings/ctype-sjis.c +++ b/strings/ctype-sjis.c @@ -4491,11 +4491,11 @@ CHARSET_INFO my_charset_sjis = my_hash_sort_simple, 0, my_snprintf_8bit, - my_strtol_8bit, - my_strtoul_8bit, - my_strtoll_8bit, - my_strtoull_8bit, - my_strtod_8bit + my_strntol_8bit, + my_strntoul_8bit, + my_strntoll_8bit, + my_strntoull_8bit, + my_strntod_8bit }; #endif diff --git a/strings/ctype-tis620.c b/strings/ctype-tis620.c index 86056e4f55c..3852589659b 100644 --- a/strings/ctype-tis620.c +++ b/strings/ctype-tis620.c @@ -719,11 +719,11 @@ CHARSET_INFO my_charset_tis620 = my_hash_sort_simple, 0, my_snprintf_8bit, - my_strtol_8bit, - my_strtoul_8bit, - my_strtoll_8bit, - my_strtoull_8bit, - my_strtod_8bit + my_strntol_8bit, + my_strntoul_8bit, + my_strntoll_8bit, + my_strntoull_8bit, + my_strntod_8bit }; diff --git a/strings/ctype-ujis.c b/strings/ctype-ujis.c index 7ae229c0135..0f4d8f5dfe2 100644 --- a/strings/ctype-ujis.c +++ b/strings/ctype-ujis.c @@ -8461,11 +8461,11 @@ CHARSET_INFO my_charset_ujis = my_hash_sort_simple, 0, my_snprintf_8bit, - my_strtol_8bit, - my_strtoul_8bit, - my_strtoll_8bit, - my_strtoull_8bit, - my_strtod_8bit + my_strntol_8bit, + my_strntoul_8bit, + my_strntoll_8bit, + my_strntoull_8bit, + my_strntod_8bit }; diff --git a/strings/ctype-utf8.c b/strings/ctype-utf8.c index b471a37a852..e55a6a717e5 100644 --- a/strings/ctype-utf8.c +++ b/strings/ctype-utf8.c @@ -1986,11 +1986,11 @@ CHARSET_INFO my_charset_utf8 = my_hash_sort_utf8, /* hash_sort */ 0, my_snprintf_8bit, - my_strtol_8bit, - my_strtoul_8bit, - my_strtoll_8bit, - my_strtoull_8bit, - my_strtod_8bit + my_strntol_8bit, + my_strntoul_8bit, + my_strntoll_8bit, + my_strntoull_8bit, + my_strntod_8bit }; @@ -2439,34 +2439,34 @@ static int my_snprintf_ucs2(CHARSET_INFO *cs __attribute__((unused)) } -static long my_strtol_ucs2(CHARSET_INFO *cs __attribute__((unused)), - const char *s, char **e, int base) +static long my_strntol_ucs2(CHARSET_INFO *cs __attribute__((unused)), + const char *s, uint l, char **e, int base) { - return strtol(s,e,base); + return 0; } -static ulong my_strtoul_ucs2(CHARSET_INFO *cs __attribute__((unused)), - const char *s, char **e, int base) +static ulong my_strntoul_ucs2(CHARSET_INFO *cs __attribute__((unused)), + const char *s, uint l, char **e, int base) { - return strtoul(s,e,base); + return 0; } -static longlong my_strtoll_ucs2(CHARSET_INFO *cs __attribute__((unused)), - const char *s, char **e, int base) +static longlong my_strntoll_ucs2(CHARSET_INFO *cs __attribute__((unused)), + const char *s, uint l, char **e, int base) { - return strtoll(s,e,base); + return 0; } -static ulonglong my_strtoull_ucs2(CHARSET_INFO *cs __attribute__((unused)), - const char *s, char **e, int base) +static ulonglong my_strntoull_ucs2(CHARSET_INFO *cs __attribute__((unused)), + const char *s, uint l, char **e, int base) { - return strtoul(s,e,base); + return 0; } -double my_strtod_ucs2(CHARSET_INFO *cs __attribute__((unused)), - const char *s, char **e) +double my_strntod_ucs2(CHARSET_INFO *cs __attribute__((unused)), + const char *s, uint l, char **e) { - return strtod(s,e); + return 0; } @@ -2504,11 +2504,11 @@ CHARSET_INFO my_charset_ucs2 = my_hash_sort_ucs2, /* hash_sort */ 0, my_snprintf_ucs2, - my_strtol_ucs2, - my_strtoul_ucs2, - my_strtoll_ucs2, - my_strtoull_ucs2, - my_strtod_ucs2 + my_strntol_ucs2, + my_strntoul_ucs2, + my_strntoll_ucs2, + my_strntoull_ucs2, + my_strntod_ucs2 }; diff --git a/strings/ctype-win1250ch.c b/strings/ctype-win1250ch.c index 73e4a5745af..ae7ab6067f8 100644 --- a/strings/ctype-win1250ch.c +++ b/strings/ctype-win1250ch.c @@ -653,11 +653,11 @@ CHARSET_INFO my_charset_win1250ch = my_hash_sort_simple, 0, my_snprintf_8bit, - my_strtol_8bit, - my_strtoul_8bit, - my_strtoll_8bit, - my_strtoull_8bit, - my_strtod_8bit + my_strntol_8bit, + my_strntoul_8bit, + my_strntoll_8bit, + my_strntoull_8bit, + my_strntod_8bit }; diff --git a/strings/ctype.c b/strings/ctype.c index 7ce259bc00f..43a9be3ab4b 100644 --- a/strings/ctype.c +++ b/strings/ctype.c @@ -2841,11 +2841,11 @@ static CHARSET_INFO compiled_charsets[] = { my_hash_sort_simple, 0, my_snprintf_8bit, - my_strtol_8bit, - my_strtoul_8bit, - my_strtoll_8bit, - my_strtoull_8bit, - my_strtod_8bit + my_strntol_8bit, + my_strntoul_8bit, + my_strntoll_8bit, + my_strntoull_8bit, + my_strntod_8bit }, #endif @@ -2884,11 +2884,11 @@ static CHARSET_INFO compiled_charsets[] = { my_hash_sort_simple, 0, my_snprintf_8bit - my_strtol_8bit, - my_strtoul_8bit, - my_strtoll_8bit, - my_strtoull_8bit, - my_strtod_8bit + my_strntol_8bit, + my_strntoul_8bit, + my_strntoll_8bit, + my_strntoull_8bit, + my_strntod_8bit }, #endif @@ -2926,11 +2926,11 @@ static CHARSET_INFO compiled_charsets[] = { my_hash_sort_simple, 0, my_snprintf_8bit - my_strtol_8bit, - my_strtoul_8bit, - my_strtoll_8bit, - my_strtoull_8bit, - my_strtod_8bit + my_strntol_8bit, + my_strntoul_8bit, + my_strntoll_8bit, + my_strntoull_8bit, + my_strntod_8bit }, #endif @@ -2968,11 +2968,11 @@ static CHARSET_INFO compiled_charsets[] = { my_hash_sort_simple, 0, my_snprintf_8bit - my_strtol_8bit, - my_strtoul_8bit, - my_strtoll_8bit, - my_strtoull_8bit, - my_strtod_8bit + my_strntol_8bit, + my_strntoul_8bit, + my_strntoll_8bit, + my_strntoull_8bit, + my_strntod_8bit }, #endif @@ -3011,11 +3011,11 @@ static CHARSET_INFO compiled_charsets[] = { my_hash_sort_simple, 0, my_snprintf_8bit - my_strtol_8bit, - my_strtoul_8bit, - my_strtoll_8bit, - my_strtoull_8bit, - my_strtod_8bit + my_strntol_8bit, + my_strntoul_8bit, + my_strntoll_8bit, + my_strntoull_8bit, + my_strntod_8bit }, #endif @@ -3053,11 +3053,11 @@ static CHARSET_INFO compiled_charsets[] = { my_hash_sort_simple, 0, my_snprintf_8bit - my_strtol_8bit, - my_strtoul_8bit, - my_strtoll_8bit, - my_strtoull_8bit, - my_strtod_8bit + my_strntol_8bit, + my_strntoul_8bit, + my_strntoll_8bit, + my_strntoull_8bit, + my_strntod_8bit }, #endif @@ -3095,11 +3095,11 @@ static CHARSET_INFO compiled_charsets[] = { my_hash_sort_simple, 0, my_snprintf_8bit - my_strtol_8bit, - my_strtoul_8bit, - my_strtoll_8bit, - my_strtoull_8bit, - my_strtod_8bit + my_strntol_8bit, + my_strntoul_8bit, + my_strntoll_8bit, + my_strntoull_8bit, + my_strntod_8bit }, #endif @@ -3137,11 +3137,11 @@ static CHARSET_INFO compiled_charsets[] = { my_hash_sort_simple, 0, my_snprintf_8bit - my_strtol_8bit, - my_strtoul_8bit, - my_strtoll_8bit, - my_strtoull_8bit, - my_strtod_8bit + my_strntol_8bit, + my_strntoul_8bit, + my_strntoll_8bit, + my_strntoull_8bit, + my_strntod_8bit }, #endif @@ -3180,11 +3180,11 @@ static CHARSET_INFO compiled_charsets[] = { my_hash_sort_simple, 0, my_snprintf_8bit - my_strtol_8bit, - my_strtoul_8bit, - my_strtoll_8bit, - my_strtoull_8bit, - my_strtod_8bit + my_strntol_8bit, + my_strntoul_8bit, + my_strntoll_8bit, + my_strntoull_8bit, + my_strntod_8bit }, #endif @@ -3222,11 +3222,11 @@ static CHARSET_INFO compiled_charsets[] = { my_hash_sort_simple, 0, my_snprintf_8bit - my_strtol_8bit, - my_strtoul_8bit, - my_strtoll_8bit, - my_strtoull_8bit, - my_strtod_8bit + my_strntol_8bit, + my_strntoul_8bit, + my_strntoll_8bit, + my_strntoull_8bit, + my_strntod_8bit }, #endif @@ -3264,11 +3264,11 @@ static CHARSET_INFO compiled_charsets[] = { my_hash_sort_simple, 0, my_snprintf_8bit - my_strtol_8bit, - my_strtoul_8bit, - my_strtoll_8bit, - my_strtoull_8bit, - my_strtod_8bit + my_strntol_8bit, + my_strntoul_8bit, + my_strntoll_8bit, + my_strntoull_8bit, + my_strntod_8bit }, #endif @@ -3306,11 +3306,11 @@ static CHARSET_INFO compiled_charsets[] = { my_hash_sort_simple, 0, my_snprintf_8bit - my_strtol_8bit, - my_strtoul_8bit, - my_strtoll_8bit, - my_strtoull_8bit, - my_strtod_8bit + my_strntol_8bit, + my_strntoul_8bit, + my_strntoll_8bit, + my_strntoull_8bit, + my_strntod_8bit }, #endif @@ -3348,11 +3348,11 @@ static CHARSET_INFO compiled_charsets[] = { my_hash_sort_simple, 0, my_snprintf_8bit - my_strtol_8bit, - my_strtoul_8bit, - my_strtoll_8bit, - my_strtoull_8bit, - my_strtod_8bit + my_strntol_8bit, + my_strntoul_8bit, + my_strntoll_8bit, + my_strntoull_8bit, + my_strntod_8bit }, #endif @@ -3390,11 +3390,11 @@ static CHARSET_INFO compiled_charsets[] = { my_hash_sort_simple, 0, my_snprintf_8bit - my_strtol_8bit, - my_strtoul_8bit, - my_strtoll_8bit, - my_strtoull_8bit, - my_strtod_8bit + my_strntol_8bit, + my_strntoul_8bit, + my_strntoll_8bit, + my_strntoull_8bit, + my_strntod_8bit }, #endif @@ -3432,11 +3432,11 @@ static CHARSET_INFO compiled_charsets[] = { my_hash_sort_simple, 0, my_snprintf_8bit - my_strtol_8bit, - my_strtoul_8bit, - my_strtoll_8bit, - my_strtoull_8bit, - my_strtod_8bit + my_strntol_8bit, + my_strntoul_8bit, + my_strntoll_8bit, + my_strntoull_8bit, + my_strntod_8bit }, #endif @@ -3475,11 +3475,11 @@ static CHARSET_INFO compiled_charsets[] = { my_hash_sort_simple, 0, my_snprintf_8bit - my_strtol_8bit, - my_strtoul_8bit, - my_strtoll_8bit, - my_strtoull_8bit, - my_strtod_8bit + my_strntol_8bit, + my_strntoul_8bit, + my_strntoll_8bit, + my_strntoull_8bit, + my_strntod_8bit }, #endif @@ -3517,11 +3517,11 @@ static CHARSET_INFO compiled_charsets[] = { my_hash_sort_simple, 0, my_snprintf_8bit - my_strtol_8bit, - my_strtoul_8bit, - my_strtoll_8bit, - my_strtoull_8bit, - my_strtod_8bit + my_strntol_8bit, + my_strntoul_8bit, + my_strntoll_8bit, + my_strntoull_8bit, + my_strntod_8bit }, #endif @@ -3560,11 +3560,11 @@ static CHARSET_INFO compiled_charsets[] = { my_hash_sort_simple, 0, my_snprintf_8bit - my_strtol_8bit, - my_strtoul_8bit, - my_strtoll_8bit, - my_strtoull_8bit, - my_strtod_8bit + my_strntol_8bit, + my_strntoul_8bit, + my_strntoll_8bit, + my_strntoull_8bit, + my_strntod_8bit }, #endif @@ -3603,11 +3603,11 @@ static CHARSET_INFO compiled_charsets[] = { my_hash_sort_simple, 0, my_snprintf_8bit - my_strtol_8bit, - my_strtoul_8bit, - my_strtoll_8bit, - my_strtoull_8bit, - my_strtod_8bit + my_strntol_8bit, + my_strntoul_8bit, + my_strntoll_8bit, + my_strntoull_8bit, + my_strntod_8bit }, #endif @@ -3645,11 +3645,11 @@ static CHARSET_INFO compiled_charsets[] = { my_hash_sort_simple, 0, my_snprintf_8bit - my_strtol_8bit, - my_strtoul_8bit, - my_strtoll_8bit, - my_strtoull_8bit, - my_strtod_8bit + my_strntol_8bit, + my_strntoul_8bit, + my_strntoll_8bit, + my_strntoull_8bit, + my_strntod_8bit }, #endif @@ -3687,11 +3687,11 @@ static CHARSET_INFO compiled_charsets[] = { my_hash_sort_simple, 0, my_snprintf_8bit - my_strtol_8bit, - my_strtoul_8bit, - my_strtoll_8bit, - my_strtoull_8bit, - my_strtod_8bit + my_strntol_8bit, + my_strntoul_8bit, + my_strntoll_8bit, + my_strntoull_8bit, + my_strntod_8bit }, #endif @@ -3729,11 +3729,11 @@ static CHARSET_INFO compiled_charsets[] = { my_hash_sort_simple, 0, my_snprintf_8bit - my_strtol_8bit, - my_strtoul_8bit, - my_strtoll_8bit, - my_strtoull_8bit, - my_strtod_8bit + my_strntol_8bit, + my_strntoul_8bit, + my_strntoll_8bit, + my_strntoull_8bit, + my_strntod_8bit }, #endif @@ -3771,11 +3771,11 @@ static CHARSET_INFO compiled_charsets[] = { my_hash_sort_simple, 0, my_snprintf_8bit - my_strtol_8bit, - my_strtoul_8bit, - my_strtoll_8bit, - my_strtoull_8bit, - my_strtod_8bit + my_strntol_8bit, + my_strntoul_8bit, + my_strntoll_8bit, + my_strntoull_8bit, + my_strntod_8bit }, #endif