From e8770dfe76a1244fccf2ca55e44e5b7b4eb5875d Mon Sep 17 00:00:00 2001 From: unknown <elliot@mysql.com> Date: Tue, 2 May 2006 09:13:58 -0400 Subject: [PATCH] Fix spelling in comments as requested by Osku This will make charset code easier to understand include/m_ctype.h: Fix spelling in comments mysql-test/t/cast.test: Fix spelling in comments mysql-test/t/query_cache.test: Fix spelling in comments sql/sql_string.cc: Fix spelling in comments strings/CHARSET_INFO.txt: Fix spelling in comments --- include/m_ctype.h | 6 +++--- mysql-test/t/cast.test | 2 +- mysql-test/t/query_cache.test | 2 +- sql/sql_string.cc | 2 +- strings/CHARSET_INFO.txt | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/m_ctype.h b/include/m_ctype.h index 913272b2a1..40cadad001 100644 --- a/include/m_ctype.h +++ b/include/m_ctype.h @@ -176,7 +176,7 @@ typedef struct my_charset_handler_st uint (*lengthsp)(struct charset_info_st *, const char *ptr, uint length); 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, const unsigned char *s,const unsigned char *e); int (*wc_mb)(struct charset_info_st *cs,my_wc_t wc, @@ -186,7 +186,7 @@ typedef struct my_charset_handler_st int (*ctype)(struct charset_info_st *cs, int *ctype, 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 (*casedn_str)(struct charset_info_st *, char *); uint (*caseup)(struct charset_info_st *, char *src, uint srclen, @@ -204,7 +204,7 @@ typedef struct my_charset_handler_st 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, int base, char **e, int *err); ulong (*strntoul)(struct charset_info_st *, const char *s, uint l, diff --git a/mysql-test/t/cast.test b/mysql-test/t/cast.test index 533da54285..b733a23f39 100644 --- a/mysql-test/t/cast.test +++ b/mysql-test/t/cast.test @@ -47,7 +47,7 @@ select cast('1a' as signed); select cast('' as signed); # -# Character set convertion +# Character set conversion # set names binary; select cast(_latin1'test' as char character set latin2); diff --git a/mysql-test/t/query_cache.test b/mysql-test/t/query_cache.test index 7596a7ba70..e2ff20e6ec 100644 --- a/mysql-test/t/query_cache.test +++ b/mysql-test/t/query_cache.test @@ -207,7 +207,7 @@ show status like "Qcache_queries_in_cache"; 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); insert into t1 values(_koi8r"รก"); diff --git a/sql/sql_string.cc b/sql/sql_string.cc index 79228be8a7..19ee9f259d 100644 --- a/sql/sql_string.cc +++ b/sql/sql_string.cc @@ -331,7 +331,7 @@ bool String::set_or_copy_aligned(const char *str,uint32 arg_length, 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, CHARSET_INFO *from_cs, CHARSET_INFO *to_cs, uint *errors) diff --git a/strings/CHARSET_INFO.txt b/strings/CHARSET_INFO.txt index f7a10f9588..40f171440a 100644 --- a/strings/CHARSET_INFO.txt +++ b/strings/CHARSET_INFO.txt @@ -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. -Case and sort convertion +Case and sort conversion ------------------------ caseup_str - converts the given 0-terminated string into the upper 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 the collation rules, e.g. case-insensitivity, accent sensitivity, etc. - \ No newline at end of file + -- 2.30.9