bk commit into 5.1 tree (elliot:1.2384)

[Elliot Murphy]

Below is the list of changes that have just been committed into a local
5.1 repository of emurphy. When emurphy does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2384 06/05/02 09:13:58 elliot@stripped +5 -0
  Fix spelling in comments as requested by Osku
  This will make charset code easier to understand

  strings/CHARSET_INFO.txt
    1.5 06/05/02 09:13:52 elliot@stripped +2 -2
    Fix spelling in comments

  sql/sql_string.cc
    1.92 06/05/02 09:13:52 elliot@stripped +1 -1
    Fix spelling in comments

  mysql-test/t/query_cache.test
    1.60 06/05/02 09:13:52 elliot@stripped +1 -1
    Fix spelling in comments

  mysql-test/t/cast.test
    1.32 06/05/02 09:13:52 elliot@stripped +1 -1
    Fix spelling in comments

  include/m_ctype.h
    1.124 06/05/02 09:13:52 elliot@stripped +3 -3
    Fix spelling in comments

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	elliot
# Host:	agony.local
# Root:	/Users/emurphy/src/mysql/bk-clean/mysql-5.1-new

--- 1.123/include/m_ctype.h	2006-04-06 05:36:06 -04:00
+++ 1.124/include/m_ctype.h	2006-05-02 09:13:52 -04:00
@@ -176,7 +176,7 @@
   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 @@
   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 @@
   
   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,

--- 1.91/sql/sql_string.cc	2006-03-23 03:37:49 -05:00
+++ 1.92/sql/sql_string.cc	2006-05-02 09:13:52 -04:00
@@ -331,7 +331,7 @@
   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)

--- 1.4/strings/CHARSET_INFO.txt	2004-10-21 06:18:19 -04:00
+++ 1.5/strings/CHARSET_INFO.txt	2006-05-02 09:13:52 -04:00
@@ -172,7 +172,7 @@
 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 @@
                 the collation rules, e.g. case-insensitivity, 
                 accent sensitivity, etc.
 
- 
\ No newline at end of file
+ 

--- 1.59/mysql-test/t/query_cache.test	2006-02-26 08:11:52 -05:00
+++ 1.60/mysql-test/t/query_cache.test	2006-05-02 09:13:52 -04:00
@@ -207,7 +207,7 @@
 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);

--- 1.31/mysql-test/t/cast.test	2006-04-10 03:31:27 -04:00
+++ 1.32/mysql-test/t/cast.test	2006-05-02 09:13:52 -04:00
@@ -47,7 +47,7 @@
 select cast('' as signed);
 
 #
-# Character set convertion
+# Character set conversion
 #
 set names binary;
 select cast(_latin1'test' as char character set latin2);