Commit c0b5b3cd authored by elliot@mysql.com's avatar elliot@mysql.com

Fix spelling in comments as requested by Osku

This will make charset code easier to understand
parent 19de86dd
...@@ -176,7 +176,7 @@ typedef struct my_charset_handler_st ...@@ -176,7 +176,7 @@ typedef struct my_charset_handler_st
uint (*lengthsp)(struct charset_info_st *, const char *ptr, uint length); uint (*lengthsp)(struct charset_info_st *, const char *ptr, uint length);
uint (*numcells)(struct charset_info_st *, const char *b, const char *e); uint (*numcells)(struct charset_info_st *, const char *b, const char *e);
/* Unicode convertion */ /* Unicode conversion */
int (*mb_wc)(struct charset_info_st *cs,my_wc_t *wc, int (*mb_wc)(struct charset_info_st *cs,my_wc_t *wc,
const unsigned char *s,const unsigned char *e); const unsigned char *s,const unsigned char *e);
int (*wc_mb)(struct charset_info_st *cs,my_wc_t wc, int (*wc_mb)(struct charset_info_st *cs,my_wc_t wc,
...@@ -186,7 +186,7 @@ typedef struct my_charset_handler_st ...@@ -186,7 +186,7 @@ typedef struct my_charset_handler_st
int (*ctype)(struct charset_info_st *cs, int *ctype, int (*ctype)(struct charset_info_st *cs, int *ctype,
const unsigned char *s, const unsigned char *e); const unsigned char *s, const unsigned char *e);
/* Functions for case and sort convertion */ /* Functions for case and sort conversion */
void (*caseup_str)(struct charset_info_st *, char *); void (*caseup_str)(struct charset_info_st *, char *);
void (*casedn_str)(struct charset_info_st *, char *); void (*casedn_str)(struct charset_info_st *, char *);
uint (*caseup)(struct charset_info_st *, char *src, uint srclen, uint (*caseup)(struct charset_info_st *, char *src, uint srclen,
...@@ -204,7 +204,7 @@ typedef struct my_charset_handler_st ...@@ -204,7 +204,7 @@ typedef struct my_charset_handler_st
void (*fill)(struct charset_info_st *, char *to, uint len, int fill); void (*fill)(struct charset_info_st *, char *to, uint len, int fill);
/* String-to-number convertion routines */ /* String-to-number conversion routines */
long (*strntol)(struct charset_info_st *, const char *s, uint l, long (*strntol)(struct charset_info_st *, const char *s, uint l,
int base, char **e, int *err); int base, char **e, int *err);
ulong (*strntoul)(struct charset_info_st *, const char *s, uint l, ulong (*strntoul)(struct charset_info_st *, const char *s, uint l,
......
...@@ -47,7 +47,7 @@ select cast('1a' as signed); ...@@ -47,7 +47,7 @@ select cast('1a' as signed);
select cast('' as signed); select cast('' as signed);
# #
# Character set convertion # Character set conversion
# #
set names binary; set names binary;
select cast(_latin1'test' as char character set latin2); select cast(_latin1'test' as char character set latin2);
......
...@@ -207,7 +207,7 @@ show status like "Qcache_queries_in_cache"; ...@@ -207,7 +207,7 @@ show status like "Qcache_queries_in_cache";
drop table t1; drop table t1;
# #
# Charset convertion (cp1251_koi8 always present) # Charset conversion (cp1251_koi8 always present)
# #
create table t1 (a char(1) not null collate koi8r_general_ci); create table t1 (a char(1) not null collate koi8r_general_ci);
insert into t1 values(_koi8r""); insert into t1 values(_koi8r"");
......
...@@ -331,7 +331,7 @@ bool String::set_or_copy_aligned(const char *str,uint32 arg_length, ...@@ -331,7 +331,7 @@ bool String::set_or_copy_aligned(const char *str,uint32 arg_length,
return copy_aligned(str, arg_length, offset, cs); return copy_aligned(str, arg_length, offset, cs);
} }
/* Copy with charset convertion */ /* Copy with charset conversion */
bool String::copy(const char *str, uint32 arg_length, bool String::copy(const char *str, uint32 arg_length,
CHARSET_INFO *from_cs, CHARSET_INFO *to_cs, uint *errors) CHARSET_INFO *from_cs, CHARSET_INFO *to_cs, uint *errors)
......
...@@ -172,7 +172,7 @@ mb_wc - converts the left multibyte sequence into it Unicode code. ...@@ -172,7 +172,7 @@ mb_wc - converts the left multibyte sequence into it Unicode code.
mc_mb - converts the given Unicode code into multibyte sequence. mc_mb - converts the given Unicode code into multibyte sequence.
Case and sort convertion Case and sort conversion
------------------------ ------------------------
caseup_str - converts the given 0-terminated string into the upper case caseup_str - converts the given 0-terminated string into the upper case
casedn_str - converts the given 0-terminated string into the lower case casedn_str - converts the given 0-terminated string into the lower case
...@@ -227,4 +227,4 @@ hash_sort() - calculates hash value taking in account ...@@ -227,4 +227,4 @@ hash_sort() - calculates hash value taking in account
the collation rules, e.g. case-insensitivity, the collation rules, e.g. case-insensitivity,
accent sensitivity, etc. accent sensitivity, etc.
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment