Commit b0a7f602 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr/home/bar/mysql-4.1.b9948 

into  mysql.com:/usr/home/bar/mysql-5.0


sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/mysqld.cc:
  after merge fix
parents 180a9ce7 9bd02618

sql/mysql_priv.h

+1 −0
Original line number Diff line number Diff line
@@ -1147,6 +1147,7 @@ extern bool opt_using_transactions, mysqld_embedded; 
extern bool using_update_log, opt_large_files, server_id_supplied;

extern bool opt_log, opt_update_log, opt_bin_log, opt_slow_log, opt_error_log;

extern bool opt_disable_networking, opt_skip_show_db;

extern bool opt_character_set_client_handshake;

extern bool volatile abort_loop, shutdown_in_progress, grant_option;

extern bool mysql_proc_table_exists;

extern uint volatile thread_count, thread_running, global_read_lock;

sql/mysqld.cc

+8 −0
Original line number Diff line number Diff line
@@ -338,6 +338,8 @@ static my_bool opt_sync_bdb_logs; 
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_character_set_client_handshake= 1;

bool lower_case_table_names_used= 0;

bool server_id_supplied = 0;

bool opt_endinfo,using_udf_functions, locked_in_memory;

bool opt_using_transactions, using_update_log;
@@ -4410,6 +4412,7 @@ enum options_mysqld 
  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,
@@ -4511,6 +4514,11 @@ Disable with --skip-bdb (will save memory).", 
   0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"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.",

   (gptr*) &opt_character_set_client_handshake,

   (gptr*) &opt_character_set_client_handshake,

    0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},

  {"character-set-server", 'C', "Set the default character set.",

   (gptr*) &default_character_set_name, (gptr*) &default_character_set_name,

   0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },

sql/sql_parse.cc

+3 −1
Original line number Diff line number Diff line
@@ -875,11 +875,13 @@ static int check_connection(THD *thd) 
    DBUG_PRINT("info", ("client_character_set: %d", (uint) net->read_pos[8]));

    /*

      Use server character set and collation if

      - opt_character_set_client_handshake is not 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_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,