From 5743f94b57b55ee463edb0ac36727f01f1d3e403 Mon Sep 17 00:00:00 2001 From: "bar@bar.mysql.r18.ru" <> Date: Wed, 15 Jan 2003 18:06:07 +0400 Subject: [PATCH] All charsets now have strnxfrm. Some function names have been renamed to be more self-descriptive --- include/m_ctype.h | 11 ++--- mysys/charset.c | 1 + sql/field.cc | 20 ++++----- sql/sql_string.cc | 4 +- strings/ctype-big5.c | 6 +-- strings/ctype-bin.c | 15 +++++-- strings/ctype-czech.c | 6 +-- strings/ctype-euc_kr.c | 6 +-- strings/ctype-gb2312.c | 6 +-- strings/ctype-gbk.c | 6 +-- strings/ctype-latin1_de.c | 6 +-- strings/ctype-simple.c | 7 +-- strings/ctype-sjis.c | 6 +-- strings/ctype-tis620.c | 6 +-- strings/ctype-ujis.c | 6 +-- strings/ctype-utf8.c | 8 ++-- strings/ctype-win1250ch.c | 6 +-- strings/ctype.c | 92 +++++++++++++++++++-------------------- 18 files changed, 114 insertions(+), 104 deletions(-) diff --git a/include/m_ctype.h b/include/m_ctype.h index d99fda8d2b9..cd6bfc15f8a 100644 --- a/include/m_ctype.h +++ b/include/m_ctype.h @@ -57,6 +57,7 @@ typedef struct unicase_info_st { #define MY_CS_LOADED 8 /* sets that are currently loaded */ #define MY_CS_BINSORT 16 /* if binary sort order */ #define MY_CS_PRIMARY 32 /* if primary collation */ +#define MY_CS_STRNXFRM 64 /* if strnxfrm is used for sort */ #define MY_CHARSET_UNDEFINED 0 #define MY_CHARSET_CURRENT (default_charset_info->number) @@ -133,8 +134,8 @@ typedef struct charset_info_st /* Charset dependant snprintf() */ int (*snprintf)(struct charset_info_st *, char *to, uint n, const char *fmt, ...); - int (*l10tostr)(struct charset_info_st *, char *to, uint n, int radix, long int val); - int (*ll10tostr)(struct charset_info_st *, char *to, uint n, int radix, longlong val); + int (*long10_to_str)(struct charset_info_st *, char *to, uint n, int radix, long int val); + int (*longlong10_to_str)(struct charset_info_st *, char *to, uint n, int radix, longlong val); /* String-to-number convertion routines */ long (*strntol)(struct charset_info_st *, const char *s, uint l,char **e, int base); @@ -188,8 +189,8 @@ longlong my_strntoll_8bit(CHARSET_INFO *, const char *s, uint l,char **e, int ulonglong my_strntoull_8bit(CHARSET_INFO *, const char *s, uint l,char **e, int base); double my_strntod_8bit(CHARSET_INFO *, char *s, uint l,char **e); -int my_l10tostr_8bit(CHARSET_INFO *, char *to, uint l, int radix, long int val); -int my_ll10tostr_8bit(CHARSET_INFO *, char *to, uint l, int radix, longlong val); +int my_long10_to_str_8bit(CHARSET_INFO *, char *to, uint l, int radix, long int val); +int my_longlong10_to_str_8bit(CHARSET_INFO *, char *to, uint l, int radix, longlong val); my_bool my_like_range_simple(CHARSET_INFO *cs, const char *ptr, uint ptr_length, @@ -253,7 +254,7 @@ int my_wildcmp_mb(CHARSET_INFO *, #define my_isvar(s,c) (my_isalnum(s,c) || (c) == '_') #define my_isvar_start(s,c) (my_isalpha(s,c) || (c) == '_') -#define use_strnxfrm(s) ((s)->strnxfrm != NULL) +#define use_strnxfrm(s) ((s)->state & MY_CS_STRNXFRM) #define my_strnxfrm(s, a, b, c, d) ((s)->strnxfrm((s), (a), (b), (c), (d))) #define my_strnncoll(s, a, b, c, d) ((s)->strnncoll((s), (a), (b), (c), (d))) #define my_like_range(s, a, b, c, d, e, f, g, h, i, j) \ diff --git a/mysys/charset.c b/mysys/charset.c index c89e1d60c7e..865441444bc 100644 --- a/mysys/charset.c +++ b/mysys/charset.c @@ -47,6 +47,7 @@ static void simple_cs_init_functions(CHARSET_INFO *cs) { cs->like_range = my_like_range_simple; cs->wildcmp = my_wildcmp_8bit; + cs->strnxfrm = my_strnxfrm_simple; cs->strnncoll = my_strnncoll_simple; cs->caseup_str = my_caseup_str_8bit; cs->casedn_str = my_casedn_str_8bit; diff --git a/sql/field.cc b/sql/field.cc index 467096a4a71..e789188e552 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -1097,9 +1097,9 @@ String *Field_tiny::val_str(String *val_buffer, char *to=(char*) val_buffer->ptr(); if (unsigned_flag) - length= (uint) cs->l10tostr(cs,to,mlength, 10,(long) *((uchar*) ptr)); + length= (uint) cs->long10_to_str(cs,to,mlength, 10,(long) *((uchar*) ptr)); else - length= (uint) cs->l10tostr(cs,to,mlength,-10,(long) *((signed char*) ptr)); + length= (uint) cs->long10_to_str(cs,to,mlength,-10,(long) *((signed char*) ptr)); val_buffer->length(length); if (zerofill) @@ -1340,9 +1340,9 @@ String *Field_short::val_str(String *val_buffer, shortget(j,ptr); if (unsigned_flag) - length=(uint) cs->l10tostr(cs, to, mlength, 10, (long) (uint16) j); + length=(uint) cs->long10_to_str(cs, to, mlength, 10, (long) (uint16) j); else - length=(uint) cs->l10tostr(cs, to, mlength,-10, (long) j); + length=(uint) cs->long10_to_str(cs, to, mlength,-10, (long) j); val_buffer->length(length); if (zerofill) prepend_zeros(val_buffer); @@ -1577,7 +1577,7 @@ String *Field_medium::val_str(String *val_buffer, char *to=(char*) val_buffer->ptr(); long j= unsigned_flag ? (long) uint3korr(ptr) : sint3korr(ptr); - length=(uint) cs->l10tostr(cs,to,mlength,-10,j); + length=(uint) cs->long10_to_str(cs,to,mlength,-10,j); val_buffer->length(length); if (zerofill) prepend_zeros(val_buffer); /* purecov: inspected */ @@ -1816,9 +1816,9 @@ String *Field_long::val_str(String *val_buffer, longget(j,ptr); if (unsigned_flag) - length=cs->l10tostr(cs,to,mlength, 10,(long) (uint32)j); + length=cs->long10_to_str(cs,to,mlength, 10,(long) (uint32)j); else - length=cs->l10tostr(cs,to,mlength,-10,(long) j); + length=cs->long10_to_str(cs,to,mlength,-10,(long) j); val_buffer->length(length); if (zerofill) prepend_zeros(val_buffer); @@ -2038,7 +2038,7 @@ String *Field_longlong::val_str(String *val_buffer, #endif longlongget(j,ptr); - length=(uint) cs->ll10tostr(cs,to,mlength,unsigned_flag ? 10 : -10, j); + length=(uint) cs->longlong10_to_str(cs,to,mlength,unsigned_flag ? 10 : -10, j); val_buffer->length(length); if (zerofill) prepend_zeros(val_buffer); @@ -3914,7 +3914,7 @@ int Field_string::store(longlong nr) char buff[64]; int l; CHARSET_INFO *cs=charset(); - l=cs->ll10tostr(cs,buff,sizeof(buff),-10,nr); + l=cs->longlong10_to_str(cs,buff,sizeof(buff),-10,nr); return Field_string::store(buff,(uint)l,cs); } @@ -4093,7 +4093,7 @@ int Field_varstring::store(longlong nr) char buff[64]; int l; CHARSET_INFO *cs=charset(); - l=cs->ll10tostr(cs,buff,sizeof(buff),-10,nr); + l=cs->longlong10_to_str(cs,buff,sizeof(buff),-10,nr); return Field_varstring::store(buff,(uint)l,cs); } diff --git a/sql/sql_string.cc b/sql/sql_string.cc index 4c499af8f9e..646621ac2eb 100644 --- a/sql/sql_string.cc +++ b/sql/sql_string.cc @@ -100,7 +100,7 @@ bool String::set(longlong num, CHARSET_INFO *cs) if (alloc(l)) return TRUE; - str_length=(uint32) cs->ll10tostr(cs,Ptr,l,-10,num); + str_length=(uint32) cs->longlong10_to_str(cs,Ptr,l,-10,num); str_charset=cs; return FALSE; } @@ -111,7 +111,7 @@ bool String::set(ulonglong num, CHARSET_INFO *cs) if (alloc(l)) return TRUE; - str_length=(uint32) cs->ll10tostr(cs,Ptr,l,10,num); + str_length=(uint32) cs->longlong10_to_str(cs,Ptr,l,10,num); str_charset=cs; return FALSE; } diff --git a/strings/ctype-big5.c b/strings/ctype-big5.c index 408c7f8fe35..3d26918f1c8 100644 --- a/strings/ctype-big5.c +++ b/strings/ctype-big5.c @@ -6218,7 +6218,7 @@ my_mb_wc_big5(CHARSET_INFO *cs __attribute__((unused)), CHARSET_INFO my_charset_big5 = { 1, /* number */ - MY_CS_COMPILED|MY_CS_PRIMARY, /* state */ + MY_CS_COMPILED|MY_CS_PRIMARY|MY_CS_STRNXFRM, /* state */ "big5", /* cs name */ "big5", /* name */ "", /* comment */ @@ -6250,8 +6250,8 @@ CHARSET_INFO my_charset_big5 = my_hash_sort_simple, 0, my_snprintf_8bit, - my_l10tostr_8bit, - my_ll10tostr_8bit, + my_long10_to_str_8bit, + my_longlong10_to_str_8bit, my_strntol_8bit, my_strntoul_8bit, diff --git a/strings/ctype-bin.c b/strings/ctype-bin.c index e20afff1470..3cf5bb763cd 100644 --- a/strings/ctype-bin.c +++ b/strings/ctype-bin.c @@ -254,7 +254,14 @@ static int my_wildcmp_bin(CHARSET_INFO *cs, return(str != str_end ? 1 : 0); } - +static int my_strnxfrm_bin(CHARSET_INFO *cs __attribute__((unused)), + uchar * dest, uint len, + const uchar *src, + uint srclen __attribute__((unused))) +{ + memcpy(dest,src,len= min(len,srclen)); + return len; +} static CHARSET_INFO my_charset_bin_st = { @@ -271,7 +278,7 @@ static CHARSET_INFO my_charset_bin_st = NULL, /* tab_from_uni */ 0, /* strxfrm_multiply */ my_strnncoll_binary, /* strnncoll */ - NULL, /* strxnfrm */ + my_strnxfrm_bin, /* strxnfrm */ my_like_range_simple, /* like_range */ my_wildcmp_bin, /* wildcmp */ 1, /* mbmaxlen */ @@ -291,8 +298,8 @@ static CHARSET_INFO my_charset_bin_st = my_hash_sort_bin, /* hash_sort */ 255, /* max_sort_char */ my_snprintf_8bit, /* snprintf */ - my_l10tostr_8bit, - my_ll10tostr_8bit, + my_long10_to_str_8bit, + my_longlong10_to_str_8bit, my_strntol_8bit, my_strntoul_8bit, my_strntoll_8bit, diff --git a/strings/ctype-czech.c b/strings/ctype-czech.c index bb0afe98032..8feb83cbeb4 100644 --- a/strings/ctype-czech.c +++ b/strings/ctype-czech.c @@ -596,7 +596,7 @@ static MY_UNI_IDX idx_uni_8859_2[]={ CHARSET_INFO my_charset_czech = { 2, /* number */ - MY_CS_COMPILED, /* state */ + MY_CS_COMPILED|MY_CS_STRNXFRM, /* state */ "latin2", /* cs name */ "czech", /* name */ "", /* comment */ @@ -628,8 +628,8 @@ CHARSET_INFO my_charset_czech = my_hash_sort_simple, 0, my_snprintf_8bit, - my_l10tostr_8bit, - my_ll10tostr_8bit, + my_long10_to_str_8bit, + my_longlong10_to_str_8bit, my_strntol_8bit, my_strntoul_8bit, my_strntoll_8bit, diff --git a/strings/ctype-euc_kr.c b/strings/ctype-euc_kr.c index 814f43166c4..ff7d0e9a5ae 100644 --- a/strings/ctype-euc_kr.c +++ b/strings/ctype-euc_kr.c @@ -8648,7 +8648,7 @@ CHARSET_INFO my_charset_euc_kr = NULL, /* tab_from_uni */ 0, /* strxfrm_multiply */ my_strnncoll_simple,/* strnncoll */ - NULL, /* strnxfrm */ + my_strnxfrm_simple, /* strnxfrm */ my_like_range_simple,/* like_range */ my_wildcmp_mb, /* wildcmp */ 2, /* mbmaxlen */ @@ -8668,8 +8668,8 @@ CHARSET_INFO my_charset_euc_kr = my_hash_sort_simple, 0, my_snprintf_8bit, - my_l10tostr_8bit, - my_ll10tostr_8bit, + my_long10_to_str_8bit, + my_longlong10_to_str_8bit, my_strntol_8bit, my_strntoul_8bit, my_strntoll_8bit, diff --git a/strings/ctype-gb2312.c b/strings/ctype-gb2312.c index d575e48a59a..a94778118e3 100644 --- a/strings/ctype-gb2312.c +++ b/strings/ctype-gb2312.c @@ -5698,7 +5698,7 @@ CHARSET_INFO my_charset_gb2312 = NULL, /* tab_from_uni */ 0, /* strxfrm_multiply */ my_strnncoll_simple,/* strnncoll */ - NULL, /* strnxfrm */ + my_strnxfrm_simple, /* strnxfrm */ my_like_range_simple,/* like_range */ my_wildcmp_mb, /* wildcmp */ 2, /* mbmaxlen */ @@ -5718,8 +5718,8 @@ CHARSET_INFO my_charset_gb2312 = my_hash_sort_simple, 0, my_snprintf_8bit, - my_l10tostr_8bit, - my_ll10tostr_8bit, + my_long10_to_str_8bit, + my_longlong10_to_str_8bit, my_strntol_8bit, my_strntoul_8bit, my_strntoll_8bit, diff --git a/strings/ctype-gbk.c b/strings/ctype-gbk.c index 0094a93e5f8..7c48e239f2d 100644 --- a/strings/ctype-gbk.c +++ b/strings/ctype-gbk.c @@ -9873,7 +9873,7 @@ my_mb_wc_gbk(CHARSET_INFO *cs __attribute__((unused)), CHARSET_INFO my_charset_gbk = { 28, /* number */ - MY_CS_COMPILED|MY_CS_PRIMARY, /* state */ + MY_CS_COMPILED|MY_CS_PRIMARY|MY_CS_STRNXFRM, /* state */ "gbk", /* cs name */ "gbk", /* name */ "", /* comment */ @@ -9905,8 +9905,8 @@ CHARSET_INFO my_charset_gbk = my_hash_sort_simple, 0, my_snprintf_8bit, - my_l10tostr_8bit, - my_ll10tostr_8bit, + my_long10_to_str_8bit, + my_longlong10_to_str_8bit, my_strntol_8bit, my_strntoul_8bit, my_strntoll_8bit, diff --git a/strings/ctype-latin1_de.c b/strings/ctype-latin1_de.c index 166e059ef42..6891e4cf944 100644 --- a/strings/ctype-latin1_de.c +++ b/strings/ctype-latin1_de.c @@ -414,7 +414,7 @@ static my_bool my_like_range_latin1_de(CHARSET_INFO *cs __attribute__((unused)), CHARSET_INFO my_charset_latin1_de = { 31, /* number */ - MY_CS_COMPILED, /* state */ + MY_CS_COMPILED|MY_CS_STRNXFRM, /* state */ "latin1", /* cs name */ "latin1_de", /* name */ "", /* comment */ @@ -446,8 +446,8 @@ CHARSET_INFO my_charset_latin1_de = my_hash_sort_simple, 0, my_snprintf_8bit, - my_l10tostr_8bit, - my_ll10tostr_8bit, + my_long10_to_str_8bit, + my_longlong10_to_str_8bit, my_strntol_8bit, my_strntoul_8bit, my_strntoll_8bit, diff --git a/strings/ctype-simple.c b/strings/ctype-simple.c index 9bcafa9f164..44379cdc15a 100644 --- a/strings/ctype-simple.c +++ b/strings/ctype-simple.c @@ -31,9 +31,10 @@ int my_strnxfrm_simple(CHARSET_INFO * cs, uchar *map= cs->sort_order; DBUG_ASSERT(len >= srclen); + len= min(len,srclen); for ( ; len > 0 ; len-- ) *dest++= map[*src++]; - return srclen; + return len; } int my_strnncoll_simple(CHARSET_INFO * cs, const uchar *s, uint slen, @@ -686,7 +687,7 @@ double my_strntod_8bit(CHARSET_INFO *cs __attribute__((unused)), Assume len >= 1 */ -int my_l10tostr_8bit(CHARSET_INFO *cs __attribute__((unused)), +int my_long10_to_str_8bit(CHARSET_INFO *cs __attribute__((unused)), char *dst, uint len, int radix, long int val) { char buffer[66]; @@ -725,7 +726,7 @@ int my_l10tostr_8bit(CHARSET_INFO *cs __attribute__((unused)), } -int my_ll10tostr_8bit(CHARSET_INFO *cs __attribute__((unused)), +int my_longlong10_to_str_8bit(CHARSET_INFO *cs __attribute__((unused)), char *dst, uint len, int radix, longlong val) { char buffer[65]; diff --git a/strings/ctype-sjis.c b/strings/ctype-sjis.c index 3949be5e215..b3d81bb9c8a 100644 --- a/strings/ctype-sjis.c +++ b/strings/ctype-sjis.c @@ -4460,7 +4460,7 @@ my_mb_wc_sjis(CHARSET_INFO *cs __attribute__((unused)), CHARSET_INFO my_charset_sjis = { 13, /* number */ - MY_CS_COMPILED|MY_CS_PRIMARY, /* state */ + MY_CS_COMPILED|MY_CS_PRIMARY|MY_CS_STRNXFRM, /* state */ "sjis", /* cs name */ "sjis", /* name */ "", /* comment */ @@ -4492,8 +4492,8 @@ CHARSET_INFO my_charset_sjis = my_hash_sort_simple, 0, my_snprintf_8bit, - my_l10tostr_8bit, - my_ll10tostr_8bit, + my_long10_to_str_8bit, + my_longlong10_to_str_8bit, my_strntol_8bit, my_strntoul_8bit, my_strntoll_8bit, diff --git a/strings/ctype-tis620.c b/strings/ctype-tis620.c index 7168026eea5..b07b08bba9f 100644 --- a/strings/ctype-tis620.c +++ b/strings/ctype-tis620.c @@ -688,7 +688,7 @@ void ThNormalize(uchar* ptr, uint field_length, const uchar* from, uint length) CHARSET_INFO my_charset_tis620 = { 18, /* number */ - MY_CS_COMPILED|MY_CS_PRIMARY, /* state */ + MY_CS_COMPILED|MY_CS_PRIMARY|MY_CS_STRNXFRM, /* state */ "tis620", /* cs name */ "tis620", /* name */ "", /* comment */ @@ -720,8 +720,8 @@ CHARSET_INFO my_charset_tis620 = my_hash_sort_simple, 0, my_snprintf_8bit, - my_l10tostr_8bit, - my_ll10tostr_8bit, + my_long10_to_str_8bit, + my_longlong10_to_str_8bit, my_strntol_8bit, my_strntoul_8bit, my_strntoll_8bit, diff --git a/strings/ctype-ujis.c b/strings/ctype-ujis.c index 0a0024594e4..eaf39ff0aa7 100644 --- a/strings/ctype-ujis.c +++ b/strings/ctype-ujis.c @@ -8442,7 +8442,7 @@ CHARSET_INFO my_charset_ujis = NULL, /* tab_from_uni */ 0, /* strxfrm_multiply */ NULL, /* strnncoll */ - NULL, /* strnxfrm */ + my_strnxfrm_simple, /* strnxfrm */ my_like_range_simple,/* like_range */ my_wildcmp_mb, /* wildcmp */ 3, /* mbmaxlen */ @@ -8462,8 +8462,8 @@ CHARSET_INFO my_charset_ujis = my_hash_sort_simple, 0, my_snprintf_8bit, - my_l10tostr_8bit, - my_ll10tostr_8bit, + my_long10_to_str_8bit, + my_longlong10_to_str_8bit, my_strntol_8bit, my_strntoul_8bit, my_strntoll_8bit, diff --git a/strings/ctype-utf8.c b/strings/ctype-utf8.c index 4f72a4c2334..7ca3395c2cc 100644 --- a/strings/ctype-utf8.c +++ b/strings/ctype-utf8.c @@ -1958,7 +1958,7 @@ static int my_mbcharlen_utf8(CHARSET_INFO *cs __attribute__((unused)) , uint c) CHARSET_INFO my_charset_utf8 = { 33, /* number */ - MY_CS_COMPILED|MY_CS_PRIMARY, /* state */ + MY_CS_COMPILED|MY_CS_PRIMARY|MY_CS_STRNXFRM, /* state */ "utf8", /* cs name */ "utf8", /* name */ "", /* comment */ @@ -1990,8 +1990,8 @@ CHARSET_INFO my_charset_utf8 = my_hash_sort_utf8, /* hash_sort */ 0, my_snprintf_8bit, - my_l10tostr_8bit, - my_ll10tostr_8bit, + my_long10_to_str_8bit, + my_longlong10_to_str_8bit, my_strntol_8bit, my_strntoul_8bit, my_strntoll_8bit, @@ -3019,7 +3019,7 @@ cnv: CHARSET_INFO my_charset_ucs2 = { 35, /* number */ - MY_CS_COMPILED|MY_CS_PRIMARY, /* state */ + MY_CS_COMPILED|MY_CS_PRIMARY|MY_CS_STRNXFRM, /* state */ "ucs2", /* cs name */ "ucs2", /* name */ "", /* comment */ diff --git a/strings/ctype-win1250ch.c b/strings/ctype-win1250ch.c index 358cede442c..6ec96693fec 100644 --- a/strings/ctype-win1250ch.c +++ b/strings/ctype-win1250ch.c @@ -622,7 +622,7 @@ static my_bool my_like_range_win1250ch(CHARSET_INFO *cs __attribute__((unused)), CHARSET_INFO my_charset_win1250ch = { 34, /* number */ - MY_CS_COMPILED, /* state */ + MY_CS_COMPILED|MY_CS_STRNXFRM, /* state */ "cp1250", /* cs name */ "cp1250_czech", /* name */ "", /* comment */ @@ -654,8 +654,8 @@ CHARSET_INFO my_charset_win1250ch = my_hash_sort_simple, 0, my_snprintf_8bit, - my_l10tostr_8bit, - my_ll10tostr_8bit, + my_long10_to_str_8bit, + my_longlong10_to_str_8bit, my_strntol_8bit, my_strntoul_8bit, my_strntoll_8bit, diff --git a/strings/ctype.c b/strings/ctype.c index c2a7e928493..cafa2542a06 100644 --- a/strings/ctype.c +++ b/strings/ctype.c @@ -2843,8 +2843,8 @@ static CHARSET_INFO compiled_charsets[] = { my_hash_sort_simple, 0, my_snprintf_8bit, - my_l10tostr_8bit, - my_ll10tostr_8bit, + my_long10_to_str_8bit, + my_longlong10_to_str_8bit, my_strntol_8bit, my_strntoul_8bit, my_strntoll_8bit, @@ -2889,8 +2889,8 @@ static CHARSET_INFO compiled_charsets[] = { my_hash_sort_simple, 0, my_snprintf_8bit, - my_l10tostr_8bit, - my_ll10tostr_8bit, + my_long10_to_str_8bit, + my_longlong10_to_str_8bit, my_strntol_8bit, my_strntoul_8bit, my_strntoll_8bit, @@ -2934,8 +2934,8 @@ static CHARSET_INFO compiled_charsets[] = { my_hash_sort_simple, 0, my_snprintf_8bit, - my_l10tostr_8bit, - my_ll10tostr_8bit, + my_long10_to_str_8bit, + my_longlong10_to_str_8bit, my_strntol_8bit, my_strntoul_8bit, my_strntoll_8bit, @@ -2979,8 +2979,8 @@ static CHARSET_INFO compiled_charsets[] = { my_hash_sort_simple, 0, my_snprintf_8bit, - my_l10tostr_8bit, - my_ll10tostr_8bit, + my_long10_to_str_8bit, + my_longlong10_to_str_8bit, my_strntol_8bit, my_strntoul_8bit, my_strntoll_8bit, @@ -3025,8 +3025,8 @@ static CHARSET_INFO compiled_charsets[] = { my_hash_sort_simple, 0, my_snprintf_8bit, - my_l10tostr_8bit, - my_ll10tostr_8bit, + my_long10_to_str_8bit, + my_longlong10_to_str_8bit, my_strntol_8bit, my_strntoul_8bit, my_strntoll_8bit, @@ -3070,8 +3070,8 @@ static CHARSET_INFO compiled_charsets[] = { my_hash_sort_simple, 0, my_snprintf_8bit, - my_l10tostr_8bit, - my_ll10tostr_8bit, + my_long10_to_str_8bit, + my_longlong10_to_str_8bit, my_strntol_8bit, my_strntoul_8bit, my_strntoll_8bit, @@ -3115,8 +3115,8 @@ static CHARSET_INFO compiled_charsets[] = { my_hash_sort_simple, 0, my_snprintf_8bit, - my_l10tostr_8bit, - my_ll10tostr_8bit, + my_long10_to_str_8bit, + my_longlong10_to_str_8bit, my_strntol_8bit, my_strntoul_8bit, my_strntoll_8bit, @@ -3160,8 +3160,8 @@ static CHARSET_INFO compiled_charsets[] = { my_hash_sort_simple, 0, my_snprintf_8bit, - my_l10tostr_8bit, - my_ll10tostr_8bit, + my_long10_to_str_8bit, + my_longlong10_to_str_8bit, my_strntol_8bit, my_strntoul_8bit, my_strntoll_8bit, @@ -3206,8 +3206,8 @@ static CHARSET_INFO compiled_charsets[] = { my_hash_sort_simple, 0, my_snprintf_8bit, - my_l10tostr_8bit, - my_ll10tostr_8bit, + my_long10_to_str_8bit, + my_longlong10_to_str_8bit, my_strntol_8bit, my_strntoul_8bit, my_strntoll_8bit, @@ -3251,8 +3251,8 @@ static CHARSET_INFO compiled_charsets[] = { my_hash_sort_simple, 0, my_snprintf_8bit, - my_l10tostr_8bit, - my_ll10tostr_8bit, + my_long10_to_str_8bit, + my_longlong10_to_str_8bit, my_strntol_8bit, my_strntoul_8bit, my_strntoll_8bit, @@ -3296,8 +3296,8 @@ static CHARSET_INFO compiled_charsets[] = { my_hash_sort_simple, 0, my_snprintf_8bit, - my_l10tostr_8bit, - my_ll10tostr_8bit, + my_long10_to_str_8bit, + my_longlong10_to_str_8bit, my_strntol_8bit, my_strntoul_8bit, my_strntoll_8bit, @@ -3341,8 +3341,8 @@ static CHARSET_INFO compiled_charsets[] = { my_hash_sort_simple, 0, my_snprintf_8bit, - my_l10tostr_8bit, - my_ll10tostr_8bit, + my_long10_to_str_8bit, + my_longlong10_to_str_8bit, my_strntol_8bit, my_strntoul_8bit, my_strntoll_8bit, @@ -3386,8 +3386,8 @@ static CHARSET_INFO compiled_charsets[] = { my_hash_sort_simple, 0, my_snprintf_8bit, - my_l10tostr_8bit, - my_ll10tostr_8bit, + my_long10_to_str_8bit, + my_longlong10_to_str_8bit, my_strntol_8bit, my_strntoul_8bit, my_strntoll_8bit, @@ -3431,8 +3431,8 @@ static CHARSET_INFO compiled_charsets[] = { my_hash_sort_simple, 0, my_snprintf_8bit, - my_l10tostr_8bit, - my_ll10tostr_8bit, + my_long10_to_str_8bit, + my_longlong10_to_str_8bit, my_strntol_8bit, my_strntoul_8bit, my_strntoll_8bit, @@ -3476,8 +3476,8 @@ static CHARSET_INFO compiled_charsets[] = { my_hash_sort_simple, 0, my_snprintf_8bit, - my_l10tostr_8bit, - my_ll10tostr_8bit, + my_long10_to_str_8bit, + my_longlong10_to_str_8bit, my_strntol_8bit, my_strntoul_8bit, my_strntoll_8bit, @@ -3522,8 +3522,8 @@ static CHARSET_INFO compiled_charsets[] = { my_hash_sort_simple, 0, my_snprintf_8bit, - my_l10tostr_8bit, - my_ll10tostr_8bit, + my_long10_to_str_8bit, + my_longlong10_to_str_8bit, my_strntol_8bit, my_strntoul_8bit, my_strntoll_8bit, @@ -3567,8 +3567,8 @@ static CHARSET_INFO compiled_charsets[] = { my_hash_sort_simple, 0, my_snprintf_8bit, - my_l10tostr_8bit, - my_ll10tostr_8bit, + my_long10_to_str_8bit, + my_longlong10_to_str_8bit, my_strntol_8bit, my_strntoul_8bit, my_strntoll_8bit, @@ -3613,8 +3613,8 @@ static CHARSET_INFO compiled_charsets[] = { my_hash_sort_simple, 0, my_snprintf_8bit, - my_l10tostr_8bit, - my_ll10tostr_8bit, + my_long10_to_str_8bit, + my_longlong10_to_str_8bit, my_strntol_8bit, my_strntoul_8bit, my_strntoll_8bit, @@ -3659,8 +3659,8 @@ static CHARSET_INFO compiled_charsets[] = { my_hash_sort_simple, 0, my_snprintf_8bit, - my_l10tostr_8bit, - my_ll10tostr_8bit, + my_long10_to_str_8bit, + my_longlong10_to_str_8bit, my_strntol_8bit, my_strntoul_8bit, my_strntoll_8bit, @@ -3704,8 +3704,8 @@ static CHARSET_INFO compiled_charsets[] = { my_hash_sort_simple, 0, my_snprintf_8bit, - my_l10tostr_8bit, - my_ll10tostr_8bit, + my_long10_to_str_8bit, + my_longlong10_to_str_8bit, my_strntol_8bit, my_strntoul_8bit, my_strntoll_8bit, @@ -3749,8 +3749,8 @@ static CHARSET_INFO compiled_charsets[] = { my_hash_sort_simple, 0, my_snprintf_8bit, - my_l10tostr_8bit, - my_ll10tostr_8bit, + my_long10_to_str_8bit, + my_longlong10_to_str_8bit, my_strntol_8bit, my_strntoul_8bit, my_strntoll_8bit, @@ -3794,8 +3794,8 @@ static CHARSET_INFO compiled_charsets[] = { my_hash_sort_simple, 0, my_snprintf_8bit, - my_l10tostr_8bit, - my_ll10tostr_8bit, + my_long10_to_str_8bit, + my_longlong10_to_str_8bit, my_strntol_8bit, my_strntoul_8bit, my_strntoll_8bit, @@ -3839,8 +3839,8 @@ static CHARSET_INFO compiled_charsets[] = { my_hash_sort_simple, 0, my_snprintf_8bit, - my_l10tostr_8bit, - my_ll10tostr_8bit, + my_long10_to_str_8bit, + my_longlong10_to_str_8bit, my_strntol_8bit, my_strntoul_8bit, my_strntoll_8bit,