bk commit into 5.0 tree (paul:1.1960)

[paul]

Below is the list of changes that have just been committed into a local
5.0 repository of paul. When paul 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.1960 05/09/10 12:31:57 paul@stripped +1 -0
  comp_err.c:
    Fix some comments.

  extra/comp_err.c
    1.20 05/09/10 12:31:26 paul@stripped +8 -8
    Fix some 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:	paul
# Host:	snake-hub.snake.net
# Root:	/src/extern/MySQL/bk/mysql-5.0

--- 1.19/extra/comp_err.c	2005-02-25 08:53:14 -06:00
+++ 1.20/extra/comp_err.c	2005-09-10 12:31:26 -05:00
@@ -51,7 +51,7 @@
 
 const char *empty_string= "";			/* For empty states */
 /*
-  Default values for command line options. See getopt structure for defintions
+  Default values for command line options. See getopt structure for definitions
   for these.
 */
 
@@ -227,7 +227,7 @@
   {
     /*
        generating mysqld_error.h
-       fprintf() will automaticly add \r on windows
+       fprintf() will automatically add \r on windows
     */
     fprintf(er_definef, "#define %s %d\n", tmp_error->er_name,
 	    tmp_error->d_code);
@@ -518,14 +518,14 @@
 }
 
 
-/* Parsing of the default language line. e.g. "default-lanuage eng" */
+/* Parsing of the default language line. e.g. "default-language eng" */
 
 static char *parse_default_language(char *str)
 {
   char *slang;
 
   DBUG_ENTER("parse_default_language");
-  /* skipping the "default_language" keyword */
+  /* skipping the "default-language" keyword */
   str= find_end_of_word(str);
   /* skipping space(s) and/or tabs after the keyword */
   str= skip_delimiters(str);
@@ -556,7 +556,7 @@
 
 
 /*
-  For given error finds message on given language, if does not exist,
+  For given error, finds message in given language; if does not exist,
   returns english.
 */
 
@@ -697,7 +697,7 @@
   DBUG_ENTER("parse_error_string");
   DBUG_PRINT("enter", ("str: %s", str));
 
-  /* create a new a element */
+  /* create a new element */
   new_error= (struct errors *) my_malloc(sizeof(*new_error), MYF(MY_WME));
 
   if (my_init_dynamic_array(&new_error->msg, sizeof(struct message), 0, 0))
@@ -762,7 +762,7 @@
 
 
 /* 
-  Parsing the string with charset/full lang name/short lang name;
+  Parsing the string with full lang name/short lang name/charset;
   returns pointer to the language structure
 */
 
@@ -814,7 +814,7 @@
       DBUG_RETURN(0);				/* Fatal error */
     DBUG_PRINT("info", ("charset: %s", new_lang->charset));
 
-    /* skipping space, tub or "," */
+    /* skipping space, tab or "," */
     str= skip_delimiters(str);
   }
   while (*str != ';' && *str);