Commit af5e2a10 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jimw/my/mysql-4.1-6511 

into mysql.com:/home/jimw/my/mysql-4.1-clean


sql/mysql_priv.h:
  Auto merged
sql/sql_cache.cc:
  Auto merged
parents ec12a1f3 395137e1

sql/mysql_priv.h

+1 −0
Original line number Diff line number Diff line
@@ -377,6 +377,7 @@ Item *negate_expression(THD *thd, Item *expr); 
struct Query_cache_query_flags

{

  unsigned int client_long_flag:1;

  unsigned int client_protocol_41:1;

  uint character_set_client_num;

  uint character_set_results_num;

  uint collation_connection_num;

sql/sql_cache.cc

+4 −0
Original line number Diff line number Diff line
@@ -776,6 +776,8 @@ void Query_cache::store_query(THD *thd, TABLE_LIST *tables_used) 
    bzero(&flags, QUERY_CACHE_FLAGS_SIZE);

    flags.client_long_flag= (thd->client_capabilities & CLIENT_LONG_FLAG ?

			     1 : 0);

    flags.client_protocol_41= (thd->client_capabilities & CLIENT_PROTOCOL_41 ?

			     1 : 0);

    flags.character_set_client_num=

      thd->variables.character_set_client->number;

    flags.character_set_results_num=
@@ -968,6 +970,8 @@ Query_cache::send_result_to_client(THD *thd, char *sql, uint query_length) 
  bzero(&flags, QUERY_CACHE_FLAGS_SIZE);

  flags.client_long_flag= (thd->client_capabilities & CLIENT_LONG_FLAG ?

			   1 : 0);

  flags.client_protocol_41= (thd->client_capabilities & CLIENT_PROTOCOL_41 ?

                           1 : 0);

  flags.character_set_client_num= thd->variables.character_set_client->number;

  flags.character_set_results_num=

    (thd->variables.character_set_results ?