diff options
| author | ingo@mysql.com <> | 2005-12-27 19:25:54 +0100 |
|---|---|---|
| committer | ingo@mysql.com <> | 2005-12-27 19:25:54 +0100 |
| commit | bd1b724bbf5244373f46cc5cb03faeff2a7410db (patch) | |
| tree | 404173013ed7b8df07cc63da137e046501df8ea7 /sql | |
| parent | ef52a5941878ade2a27bec81589445b61869fa5e (diff) | |
| parent | cb25f0f039f48c5c29e9a6f74e0dcc6a71d52e75 (diff) | |
| download | mariadb-git-bd1b724bbf5244373f46cc5cb03faeff2a7410db.tar.gz | |
Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-bug5390
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 2705615111a..6e4ab50515b 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -4637,7 +4637,7 @@ Disable with --skip-bdb (will save memory).", {"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}, |