diff options
| author | bar@bar.mysql.r18.ru <> | 2003-01-15 18:06:07 +0400 |
|---|---|---|
| committer | bar@bar.mysql.r18.ru <> | 2003-01-15 18:06:07 +0400 |
| commit | 5743f94b57b55ee463edb0ac36727f01f1d3e403 (patch) | |
| tree | 28abe09358bc3559959668ba83188945f02eee94 /strings/ctype-simple.c | |
| parent | 809af00b0672242cc1b0fee114a34f414ec9055a (diff) | |
| download | mariadb-git-5743f94b57b55ee463edb0ac36727f01f1d3e403.tar.gz | |
All charsets now have strnxfrm.
Some function names have been renamed to be more self-descriptive
Diffstat (limited to 'strings/ctype-simple.c')
| -rw-r--r-- | strings/ctype-simple.c | 7 |
1 files changed, 4 insertions, 3 deletions
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]; |