From: Date: January 16 2006 5:23pm
Subject: bk commit into 5.0 tree (joerg:1.2018)
List-Archive: http://lists.mysql.com/commits/1151
Message-Id: <20060116162348.5124316EAB@trift2.fambruehe>

Below is the list of changes that have just been committed into a local
5.0 repository of joerg. When joerg 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.2018 06/01/16 17:23:39 joerg@stripped +1 -0
  extra/comp_err.c  :  Fix a merge error.

  extra/comp_err.c
    1.23 06/01/16 17:23:33 joerg@stripped +2 -1
    Fix a merge error (closing '}' was lost), correct formatting (tab -> blanks).

# 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:	joerg
# Host:	trift2.
# Root:	/M50/merge-5.0

--- 1.22/extra/comp_err.c	2006-01-16 16:48:00 +01:00
+++ 1.23/extra/comp_err.c	2006-01-16 17:23:33 +01:00
@@ -542,6 +542,7 @@
     fprintf(stderr,
 	    "Unexpected EOL: No short language name after the keyword\n");
     DBUG_RETURN(0);
+  }
 
   /* reading the short language tag */
   if (!(slang= get_word(&str)))
@@ -877,7 +878,7 @@
   print_version();
   printf("This software comes with ABSOLUTELY NO WARRANTY. "
          "This is free software,\n"
-	 "and you are welcome to modify and redistribute it under the GPL license.\n"
+         "and you are welcome to modify and redistribute it under the GPL license.\n"
          "Usage:\n");
   my_print_help(my_long_options);
   my_print_variables(my_long_options);