From: Date: August 31 2005 10:03am
Subject: bk commit into 4.1 tree (bar:1.2399) BUG#9948
List-Archive: http://lists.mysql.com/internals/29083
X-Bug: 9948
Message-Id: <200508310803.j7V83U7m070755@bar.intranet.mysql.r18.ru>

Below is the list of changes that have just been committed into a local
4.1 repository of bar. When bar 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.2399 05/08/31 13:03:24 bar@stripped +2 -0
  
    bug#9948 changed client-charset behavior in 4.1.x libmysql, which issue BC prob
  
  sql_parse.cc:
  mysqld.cc:
  
    Added --skip-client-character-set-handshake.
    When this option is activated, client side character set
    (which is sent in handshake) is ignored, and server side
    default-character-set value is used for character_set_client
    and character_set_results, thus reprodicing 4.0 behaviour.

  sql/sql_parse.cc
    1.462 05/08/31 13:00:08 bar@stripped +3 -1
    bug#9948 changed client-charset behavior in 4.1.x libmysql, which issue BC prob
    Added --skip-client-character-set-handshake,
    to reproduce 4.0 behaviour.

  sql/mysqld.cc
    1.591 05/08/31 12:59:34 bar@stripped +7 -0
    bug#9948 changed client-charset behavior in 4.1.x libmysql, which issue BC prob
    Added --skip-client-character-set-handshake, 
    to reproduce 4.0 behaviour.

# 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:	bar
# Host:	bar.intranet.mysql.r18.ru
# Root:	/usr/home/bar/mysql-4.1

--- 1.590/sql/mysqld.cc	2005-08-28 07:52:09 +05:00
+++ 1.591/sql/mysqld.cc	2005-08-31 12:59:34 +05:00
@@ -271,6 +271,7 @@
 bool opt_log, opt_update_log, opt_bin_log, opt_slow_log;
 bool opt_error_log= IF_WIN(1,0);
 bool opt_disable_networking=0, opt_skip_show_db=0;
+bool opt_skip_character_set_client_handshake= 0;
 bool lower_case_table_names_used= 0;
 bool server_id_supplied = 0;
 bool opt_endinfo,using_udf_functions, locked_in_memory;
@@ -4216,6 +4217,7 @@
   OPT_EXPIRE_LOGS_DAYS,
   OPT_GROUP_CONCAT_MAX_LEN,
   OPT_DEFAULT_COLLATION,
+  OPT_CHARACTER_SET_CLIENT_HANDSHAKE,
   OPT_INIT_CONNECT,
   OPT_INIT_SLAVE,
   OPT_SECURE_AUTH,
@@ -4753,6 +4755,11 @@
    "Show user and password in SHOW SLAVE HOSTS on this master",
    (gptr*) &opt_show_slave_auth_info, (gptr*) &opt_show_slave_auth_info, 0,
    GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+  {"skip-character-set-client-handshake", OPT_CHARACTER_SET_CLIENT_HANDSHAKE,
+   "Don't use client side character set value sent during handshake.",
+   (gptr*) &opt_skip_character_set_client_handshake,
+   (gptr*) &opt_skip_character_set_client_handshake,
+    0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"skip-grant-tables", OPT_SKIP_GRANT,
    "Start without grant tables. This gives all users FULL ACCESS to all tables!",
    (gptr*) &opt_noacl, (gptr*) &opt_noacl, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0,

--- 1.461/sql/sql_parse.cc	2005-08-29 19:54:29 +05:00
+++ 1.462/sql/sql_parse.cc	2005-08-31 13:00:08 +05:00
@@ -811,11 +811,13 @@
     DBUG_PRINT("info", ("client_character_set: %d", (uint) net->read_pos[8]));
     /*
       Use server character set and collation if
+      - opt_skip_character_set_client_handshake is set
       - client has not specified a character set
       - client character set is the same as the servers
       - client character set doesn't exists in server
     */
-    if (!(thd->variables.character_set_client=
+    if (opt_skip_character_set_client_handshake ||
+        !(thd->variables.character_set_client=
 	  get_charset((uint) net->read_pos[8], MYF(0))) ||
 	!my_strcasecmp(&my_charset_latin1,
 		       global_system_variables.character_set_client->name,