Variable names have been renamed:

  client_collation -> collation_client
  result_collation -> collation_results
  connection_collation -> collation_connection

8 files changed, 80 insertions, 82 deletions

diff --git a/sql/item.cc b/sql/item.cc
index 2e9866fcd58..2bb9fa62ff4 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -172,7 +172,7 @@ bool Item::get_time(TIME *ltime)
 
 CHARSET_INFO * Item::default_charset() const
 {
-  return current_thd->variables.connection_collation;
+  return current_thd->variables.collation_connection;
 }
 
 bool Item::set_charset(CHARSET_INFO *cs1, enum coercion co1,
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index f04ca371c60..ea0311bafc6 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -2092,9 +2092,9 @@ static int init_common_variables(const char *conf_file_name, int argc,
 #endif
   if (!(default_charset_info= get_charset_by_name(sys_charset.value, MYF(MY_WME))))
     return 1;
-  global_system_variables.result_collation= default_charset_info;
-  global_system_variables.client_collation= default_charset_info;
-  global_system_variables.connection_collation= default_charset_info;
+  global_system_variables.collation_results= default_charset_info;
+  global_system_variables.collation_client= default_charset_info;
+  global_system_variables.collation_connection= default_charset_info;
 
   charsets_list= list_charsets(MYF(MY_CS_COMPILED | MY_CS_CONFIG));
 
@@ -4575,9 +4575,9 @@ static void set_options(void)
 		 sizeof(mysql_real_data_home)-1);
 
   /* Set default values for some variables */
-  global_system_variables.result_collation= default_charset_info;
-  global_system_variables.client_collation= default_charset_info;
-  global_system_variables.connection_collation= default_charset_info;
+  global_system_variables.collation_results= default_charset_info;
+  global_system_variables.collation_client= default_charset_info;
+  global_system_variables.collation_connection= default_charset_info;
   global_system_variables.table_type=   DB_TYPE_MYISAM;
   global_system_variables.tx_isolation= ISO_REPEATABLE_READ;
   global_system_variables.select_limit= (ulonglong) HA_POS_ERROR;
diff --git a/sql/protocol.cc b/sql/protocol.cc
index 99b815a7840..d00ecb5dbc4 100644
--- a/sql/protocol.cc
+++ b/sql/protocol.cc
@@ -724,7 +724,7 @@ bool Protocol_simple::store(const char *from, uint length,
 bool Protocol_simple::store(const char *from, uint length,
 			    CHARSET_INFO *fromcs)
 {
-  CHARSET_INFO *tocs= this->thd->variables.result_collation;
+  CHARSET_INFO *tocs= this->thd->variables.collation_results;
 #ifndef DEBUG_OFF
   DBUG_ASSERT(field_types == 0 ||
 	      field_types[field_pos] == MYSQL_TYPE_DECIMAL ||
diff --git a/sql/set_var.cc b/sql/set_var.cc
index 46fc35e11cf..ea0b569f05d 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -105,12 +105,13 @@ sys_var_str		sys_charset("character_set",
 				    sys_check_charset,
 				    sys_update_charset,
 				    sys_set_default_charset);
-sys_var_client_collation sys_client_collation("client_collation");
+sys_var_collation_client sys_collation_client("collation_client");
+sys_var_collation_connection sys_collation_connection("collation_connection");
+sys_var_collation_results sys_collation_results("collation_results");
 sys_var_bool_ptr	sys_concurrent_insert("concurrent_insert",
 					      &myisam_concurrent_insert);
 sys_var_long_ptr	sys_connect_timeout("connect_timeout",
 					    &connect_timeout);
-sys_var_connection_collation sys_connection_collation("connection_collation");
 sys_var_enum		sys_delay_key_write("delay_key_write",
 					    &delay_key_write_options,
 					    &delay_key_write_typelib,
@@ -200,7 +201,6 @@ sys_var_thd_ulong	sys_read_buff_size("read_buffer_size",
 					   &SV::read_buff_size);
 sys_var_thd_ulong	sys_read_rnd_buff_size("read_rnd_buffer_size",
 					       &SV::read_rnd_buff_size);
-sys_var_result_collation sys_result_collation("result_collation");
 sys_var_long_ptr	sys_rpl_recovery_rank("rpl_recovery_rank",
 					      &rpl_recovery_rank);
 sys_var_long_ptr	sys_query_cache_size("query_cache_size",
@@ -343,10 +343,11 @@ sys_var *sys_variables[]=
   &sys_binlog_cache_size,
   &sys_buffer_results,
   &sys_bulk_insert_buff_size,
-  &sys_client_collation,
+  &sys_collation_client,
+  &sys_collation_connection,
+  &sys_collation_results,
   &sys_concurrent_insert,
   &sys_connect_timeout,
-  &sys_connection_collation,
   &sys_default_week_format,
   &sys_delay_key_write,
   &sys_delayed_insert_limit,
@@ -406,7 +407,6 @@ sys_var *sys_variables[]=
   &sys_rand_seed2,
   &sys_read_buff_size,
   &sys_read_rnd_buff_size,
-  &sys_result_collation,
   &sys_rpl_recovery_rank,
   &sys_safe_updates,
   &sys_select_limit,
@@ -455,10 +455,11 @@ struct show_var_st init_vars[]= {
   {sys_bulk_insert_buff_size.name,(char*) &sys_bulk_insert_buff_size,SHOW_SYS},
   {sys_charset.name, 	      (char*) &sys_charset,		     SHOW_SYS},
   {"character_sets",          (char*) &charsets_list,               SHOW_CHAR_PTR},
-  {sys_client_collation.name, (char*) &sys_client_collation,	    SHOW_SYS},
+  {sys_collation_client.name, (char*) &sys_collation_client,	    SHOW_SYS},
+  {sys_collation_connection.name,(char*) &sys_collation_connection, SHOW_SYS},
+  {sys_collation_results.name, (char*) &sys_collation_results,	    SHOW_SYS},
   {sys_concurrent_insert.name,(char*) &sys_concurrent_insert,       SHOW_SYS},
   {sys_connect_timeout.name,  (char*) &sys_connect_timeout,         SHOW_SYS},
-  {sys_connection_collation.name,(char*) &sys_connection_collation, SHOW_SYS},
   {"datadir",                 mysql_real_data_home,                 SHOW_CHAR},
   {"default_week_format",     (char*) &sys_default_week_format,     SHOW_SYS},
   {sys_delay_key_write.name,  (char*) &sys_delay_key_write,         SHOW_SYS},
@@ -562,7 +563,6 @@ struct show_var_st init_vars[]= {
   {sys_pseudo_thread_id.name, (char*) &sys_pseudo_thread_id,        SHOW_SYS},
   {sys_read_buff_size.name,   (char*) &sys_read_buff_size,	    SHOW_SYS},
   {sys_read_rnd_buff_size.name,(char*) &sys_read_rnd_buff_size,	    SHOW_SYS},
-  {sys_result_collation.name, (char*) &sys_result_collation,	    SHOW_SYS},
   {sys_rpl_recovery_rank.name,(char*) &sys_rpl_recovery_rank,       SHOW_SYS},
 #ifdef HAVE_QUERY_CACHE
   {sys_query_cache_limit.name,(char*) &sys_query_cache_limit,	    SHOW_SYS},
@@ -1210,86 +1210,86 @@ bool sys_var_collation::check(THD *thd, set_var *var)
   return 0;
 }
 
-bool sys_var_client_collation::update(THD *thd, set_var *var)
+bool sys_var_collation_client::update(THD *thd, set_var *var)
 {
   if (var->type == OPT_GLOBAL)
-    global_system_variables.client_collation= var->save_result.charset;
+    global_system_variables.collation_client= var->save_result.charset;
   else
   {
-    thd->variables.client_collation= var->save_result.charset;
+    thd->variables.collation_client= var->save_result.charset;
     thd->protocol_simple.init(thd);
     thd->protocol_prep.init(thd);
   }
   return 0;
 }
 
-byte *sys_var_client_collation::value_ptr(THD *thd, enum_var_type type)
+byte *sys_var_collation_client::value_ptr(THD *thd, enum_var_type type)
 {
   CHARSET_INFO *cs= ((type == OPT_GLOBAL) ?
-		  global_system_variables.client_collation :
-		  thd->variables.client_collation);
+		  global_system_variables.collation_client :
+		  thd->variables.collation_client);
   return cs ? (byte*) cs->name : (byte*) "";
 }
 
-void sys_var_client_collation::set_default(THD *thd, enum_var_type type)
+void sys_var_collation_client::set_default(THD *thd, enum_var_type type)
 {
  if (type == OPT_GLOBAL)
-   global_system_variables.client_collation= default_charset_info;
+   global_system_variables.collation_client= default_charset_info;
  else
  {
-   thd->variables.client_collation= global_system_variables.client_collation;
+   thd->variables.collation_client= global_system_variables.collation_client;
  }
 }
 
 
-bool sys_var_connection_collation::update(THD *thd, set_var *var)
+bool sys_var_collation_connection::update(THD *thd, set_var *var)
 {
   if (var->type == OPT_GLOBAL)
-    global_system_variables.connection_collation= var->save_result.charset;
+    global_system_variables.collation_connection= var->save_result.charset;
   else
-    thd->variables.connection_collation= var->save_result.charset;
+    thd->variables.collation_connection= var->save_result.charset;
   return 0;
 }
 
-byte *sys_var_connection_collation::value_ptr(THD *thd, enum_var_type type)
+byte *sys_var_collation_connection::value_ptr(THD *thd, enum_var_type type)
 {
   CHARSET_INFO *cs= ((type == OPT_GLOBAL) ?
-		  global_system_variables.connection_collation :
-		  thd->variables.connection_collation);
+		  global_system_variables.collation_connection :
+		  thd->variables.collation_connection);
   return cs ? (byte*) cs->name : (byte*) "";
 }
 
-void sys_var_connection_collation::set_default(THD *thd, enum_var_type type)
+void sys_var_collation_connection::set_default(THD *thd, enum_var_type type)
 {
  if (type == OPT_GLOBAL)
-   global_system_variables.connection_collation= default_charset_info;
+   global_system_variables.collation_connection= default_charset_info;
  else
-   thd->variables.connection_collation= global_system_variables.connection_collation;
+   thd->variables.collation_connection= global_system_variables.collation_connection;
 }
 
-bool sys_var_result_collation::update(THD *thd, set_var *var)
+bool sys_var_collation_results::update(THD *thd, set_var *var)
 {
   if (var->type == OPT_GLOBAL)
-    global_system_variables.result_collation= var->save_result.charset;
+    global_system_variables.collation_results= var->save_result.charset;
   else
-    thd->variables.result_collation= var->save_result.charset;
+    thd->variables.collation_results= var->save_result.charset;
   return 0;
 }
 
-byte *sys_var_result_collation::value_ptr(THD *thd, enum_var_type type)
+byte *sys_var_collation_results::value_ptr(THD *thd, enum_var_type type)
 {
   CHARSET_INFO *cs= ((type == OPT_GLOBAL) ?
-		  global_system_variables.result_collation :
-		  thd->variables.result_collation);
+		  global_system_variables.collation_results :
+		  thd->variables.collation_results);
   return cs ? (byte*) cs->name : (byte*) "";
 }
 
-void sys_var_result_collation::set_default(THD *thd, enum_var_type type)
+void sys_var_collation_results::set_default(THD *thd, enum_var_type type)
 {
  if (type == OPT_GLOBAL)
-   global_system_variables.result_collation= default_charset_info;
+   global_system_variables.collation_results= default_charset_info;
  else
-   thd->variables.result_collation= global_system_variables.result_collation;
+   thd->variables.collation_results= global_system_variables.collation_results;
 }
 
 
@@ -1297,16 +1297,16 @@ void sys_var_result_collation::set_default(THD *thd, enum_var_type type)
   Functions to handle SET NAMES and SET CHARACTER SET
 *****************************************************************************/
 
-int set_var_client_collation::check(THD *thd)
+int set_var_collation_client::check(THD *thd)
 {
   return 0;
 }
 
-int set_var_client_collation::update(THD *thd)
+int set_var_collation_client::update(THD *thd)
 {
-  thd->variables.client_collation=  client_collation;
-  thd->variables.connection_collation= connection_collation;
-  thd->variables.result_collation=  result_collation;
+  thd->variables.collation_client= collation_client;
+  thd->variables.collation_connection= collation_connection;
+  thd->variables.collation_results= collation_results;
   thd->protocol_simple.init(thd);
   thd->protocol_prep.init(thd);
   return 0;
diff --git a/sql/set_var.h b/sql/set_var.h
index f236f8f850c..fbd20228d24 100644
--- a/sql/set_var.h
+++ b/sql/set_var.h
@@ -420,28 +420,28 @@ SHOW_TYPE type() { return SHOW_CHAR; }
   virtual void set_default(THD *thd, enum_var_type type)= 0;
 };
 
-class sys_var_client_collation :public sys_var_collation
+class sys_var_collation_client :public sys_var_collation
 {
 public:
-  sys_var_client_collation(const char *name_arg) :sys_var_collation(name_arg) {}
+  sys_var_collation_client(const char *name_arg) :sys_var_collation(name_arg) {}
   bool update(THD *thd, set_var *var);
   void set_default(THD *thd, enum_var_type type);
   byte *value_ptr(THD *thd, enum_var_type type);
 };
 
-class sys_var_connection_collation :public sys_var_collation
+class sys_var_collation_connection :public sys_var_collation
 {
 public:
-  sys_var_connection_collation(const char *name_arg) :sys_var_collation(name_arg) {}
+  sys_var_collation_connection(const char *name_arg) :sys_var_collation(name_arg) {}
   bool update(THD *thd, set_var *var);
   void set_default(THD *thd, enum_var_type type);
   byte *value_ptr(THD *thd, enum_var_type type);
 };
 
-class sys_var_result_collation :public sys_var_collation
+class sys_var_collation_results :public sys_var_collation
 {
 public:
-  sys_var_result_collation(const char *name_arg) :sys_var_collation(name_arg) {}
+  sys_var_collation_results(const char *name_arg) :sys_var_collation(name_arg) {}
   bool update(THD *thd, set_var *var);
   void set_default(THD *thd, enum_var_type type);
   byte *value_ptr(THD *thd, enum_var_type type);
@@ -553,18 +553,18 @@ public:
 
 /* For SET NAMES and SET CHARACTER SET */
 
-class set_var_client_collation: public set_var_base
+class set_var_collation_client: public set_var_base
 {
-  CHARSET_INFO *client_collation;
-  CHARSET_INFO *connection_collation;
-  CHARSET_INFO *result_collation;
+  CHARSET_INFO *collation_client;
+  CHARSET_INFO *collation_connection;
+  CHARSET_INFO *collation_results;
 public:
-  set_var_client_collation(CHARSET_INFO *client_coll_arg,
+  set_var_collation_client(CHARSET_INFO *client_coll_arg,
   			   CHARSET_INFO *connection_coll_arg,
   			   CHARSET_INFO *result_coll_arg)
-    :client_collation(client_coll_arg),
-     connection_collation(connection_coll_arg),
-     result_collation(result_coll_arg)
+    :collation_client(client_coll_arg),
+     collation_connection(connection_coll_arg),
+     collation_results(result_coll_arg)
   {}
   int check(THD *thd);
   int update(THD *thd);
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 31159dc259f..f579b02ee50 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -207,7 +207,6 @@ void THD::init(void)
 {
   pthread_mutex_lock(&LOCK_global_system_variables);
   variables= global_system_variables;
-  variables.client_collation= default_charset_info;
   pthread_mutex_unlock(&LOCK_global_system_variables);
   server_status= SERVER_STATUS_AUTOCOMMIT;
   options= thd_startup_options;
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 58f27bf2bcb..d3cb843ad85 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -382,9 +382,9 @@ struct system_variables
   my_bool low_priority_updates;
   my_bool new_mode;
   
-  CHARSET_INFO 	*client_collation;
-  CHARSET_INFO  *connection_collation;
-  CHARSET_INFO  *result_collation;
+  CHARSET_INFO 	*collation_client;
+  CHARSET_INFO  *collation_connection;
+  CHARSET_INFO  *collation_results;
 };
 
 void free_tmp_table(THD *thd, TABLE *entry);
@@ -665,7 +665,7 @@ public:
     net.report_error= 1; 
     DBUG_PRINT("error",("Fatal error set"));
   }
-  inline CHARSET_INFO *charset() { return variables.client_collation; }
+  inline CHARSET_INFO *charset() { return variables.collation_client; }
 };
 
 /*
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 5664c46349a..71035a75084 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -3924,7 +3924,7 @@ text_literal:
 	TEXT_STRING_literal
 	{
 	  THD *thd= YYTHD;
-	  $$ = new Item_string($1.str,$1.length,thd->variables.connection_collation);
+	  $$ = new Item_string($1.str,$1.length,thd->variables.collation_connection);
 	}
 	| NCHAR_STRING
 	{ $$=  new Item_string($1.str,$1.length,national_charset_info); }
@@ -3936,7 +3936,7 @@ text_literal:
 
 text_string:
 	TEXT_STRING_literal
-	{ $$=  new String($1.str,$1.length,YYTHD->variables.connection_collation); }
+	{ $$=  new String($1.str,$1.length,YYTHD->variables.collation_connection); }
 	| HEX_NUM
 	  {
 	    Item *tmp = new Item_varbinary($1.str,$1.length);
@@ -4106,14 +4106,14 @@ TEXT_STRING_literal:
 	TEXT_STRING
 	{
 	  THD *thd= YYTHD;
-	  if (my_charset_same(thd->charset(),thd->variables.connection_collation))
+	  if (my_charset_same(thd->charset(),thd->variables.collation_connection))
 	  {
 	    $$=$1;
 	  }
 	  else
 	  {
 	    String ident;
-	    ident.copy($1.str,$1.length,thd->charset(),thd->variables.connection_collation);
+	    ident.copy($1.str,$1.length,thd->charset(),thd->variables.collation_connection);
 	    $$.str= thd->strmake(ident.ptr(),ident.length());
 	    $$.length= ident.length();
 	  }
@@ -4405,28 +4405,27 @@ option_value:
 	{
 	  THD *thd= YYTHD;
 	  LEX *lex= Lex;
-	  $2= $2 ? $2: global_system_variables.client_collation;
+	  $2= $2 ? $2: global_system_variables.collation_client;
 	  $3= $3 ? $3 : $2;
 	  if (!my_charset_same($2,$3))
 	  {
-	      net_printf(YYTHD,ER_COLLATION_CHARSET_MISMATCH,
-			 $3->name,$2->csname);
-	      YYABORT;
+	    net_printf(thd,ER_COLLATION_CHARSET_MISMATCH,$3->name,$2->csname);
+	    YYABORT;
 	  }
-	  lex->var_list.push_back(new set_var_client_collation($3,thd->db_charset,$3));
+	  lex->var_list.push_back(new set_var_collation_client($3,thd->db_charset,$3));
 	}
 	| NAMES_SYM charset_name_or_default opt_collate
 	{
+	  THD *thd= YYTHD;
 	  LEX *lex= Lex;
-	  $2= $2 ? $2 : global_system_variables.client_collation;
+	  $2= $2 ? $2 : global_system_variables.collation_client;
 	  $3= $3 ? $3 : $2;
 	  if (!my_charset_same($2,$3))
 	  {
-	      net_printf(YYTHD,ER_COLLATION_CHARSET_MISMATCH,
-			 $3->name,$2->csname);
-	      YYABORT;
+	    net_printf(thd,ER_COLLATION_CHARSET_MISMATCH,$3->name,$2->csname);
+	    YYABORT;
 	  }
-	  lex->var_list.push_back(new set_var_client_collation($3,$3,$3));
+	  lex->var_list.push_back(new set_var_collation_client($3,$3,$3));
 	}
 	| PASSWORD equal text_or_password
 	  {