From: Sergei Golubchik
Date: December 23 2005 11:38am
Subject: bk commit into 4.1 tree (serg:1.2466)
List-Archive: http://lists.mysql.com/commits/386
Message-Id: <20051223113833.11258.qmail@serg.mylan>

Below is the list of changes that have just been committed into a local
4.1 repository of serg. When serg 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.2466 05/12/23 12:38:22 serg@stripped +1 -0
  correct help text

  sql/mysqld.cc
    1.608 05/12/23 12:38:14 serg@stripped +1 -1
    correct help text

# 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:	serg
# Host:	serg.mylan
# Root:	/usr/home/serg/Abk/mysql-4.1

--- 1.607/sql/mysqld.cc	Thu Dec  8 16:13:30 2005
+++ 1.608/sql/mysqld.cc	Fri Dec 23 12:38:14 2005
@@ -4370,7 +4370,7 @@ Disable with --skip-bdb (will save memor
   {"bootstrap", OPT_BOOTSTRAP, "Used by mysql installation scripts.", 0, 0, 0,
    GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"character-set-client-handshake", OPT_CHARACTER_SET_CLIENT_HANDSHAKE,
-   "Don't use client side character set value sent during handshake.",
+   "Don't ignore client side character set value sent during handshake.",
    (gptr*) &opt_character_set_client_handshake,
    (gptr*) &opt_character_set_client_handshake,
     0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},