Variable names have been renamed:

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


BitKeeper/etc/ignore:
  Added client/ssl_test to the ignore list

4 files changed, 35 insertions, 35 deletions

diff --git a/mysql-test/r/ctype_collate.result b/mysql-test/r/ctype_collate.result
index af231bb7930..c8163a8a289 100644
--- a/mysql-test/r/ctype_collate.result
+++ b/mysql-test/r/ctype_collate.result
@@ -511,59 +511,59 @@ SHOW FIELDS FROM  t1;
 Field	Type	Collation	Null	Key	Default	Extra
 latin1_f	char(32)	latin1_bin	YES		NULL	
 SET CHARACTER SET 'latin1';
-SHOW VARIABLES LIKE 'client_collation';
+SHOW VARIABLES LIKE 'collation_client';
 Variable_name	Value
-client_collation	latin1_swedish_ci
+collation_client	latin1_swedish_ci
 SET CHARACTER SET latin1;
-SHOW VARIABLES LIKE 'client_collation';
+SHOW VARIABLES LIKE 'collation_client';
 Variable_name	Value
-client_collation	latin1_swedish_ci
-SHOW VARIABLES LIKE 'client_collation';
+collation_client	latin1_swedish_ci
+SHOW VARIABLES LIKE 'collation_client';
 Variable_name	Value
-client_collation	latin1_swedish_ci
+collation_client	latin1_swedish_ci
 SELECT charset('a'),collation('a'),coercibility('a'),'a'='A';
 charset('a')	collation('a')	coercibility('a')	'a'='A'
 latin1	latin1_swedish_ci	3	1
 SET CHARACTER SET latin1 COLLATE latin1_bin;
-SHOW VARIABLES LIKE 'client_collation';
+SHOW VARIABLES LIKE 'collation_client';
 Variable_name	Value
-client_collation	latin1_bin
+collation_client	latin1_bin
 SET CHARACTER SET LATIN1 COLLATE Latin1_Bin;
-SHOW VARIABLES LIKE 'client_collation';
+SHOW VARIABLES LIKE 'collation_client';
 Variable_name	Value
-client_collation	latin1_bin
+collation_client	latin1_bin
 SET CHARACTER SET 'latin1' COLLATE 'latin1_bin';
-SHOW VARIABLES LIKE 'client_collation';
+SHOW VARIABLES LIKE 'collation_client';
 Variable_name	Value
-client_collation	latin1_bin
+collation_client	latin1_bin
 SELECT charset('a'),collation('a'),coercibility('a'),'a'='A';
 charset('a')	collation('a')	coercibility('a')	'a'='A'
 latin1	latin1_swedish_ci	3	1
 SET CHARACTER SET koi8r;
-SHOW VARIABLES LIKE 'client_collation';
+SHOW VARIABLES LIKE 'collation_client';
 Variable_name	Value
-client_collation	koi8r_general_ci
+collation_client	koi8r_general_ci
 SELECT charset('a'),collation('a'),coercibility('a'),'a'='A';
 charset('a')	collation('a')	coercibility('a')	'a'='A'
 latin1	latin1_swedish_ci	3	1
 SET CHARACTER SET koi8r COLLATE koi8r_bin;
-SHOW VARIABLES LIKE 'client_collation';
+SHOW VARIABLES LIKE 'collation_client';
 Variable_name	Value
-client_collation	koi8r_bin
+collation_client	koi8r_bin
 SELECT charset('a'),collation('a'),coercibility('a'),'a'='A';
 charset('a')	collation('a')	coercibility('a')	'a'='A'
 latin1	latin1_swedish_ci	3	1
 SET CHARACTER SET koi8r COLLATE DEFAULT;
-SHOW VARIABLES LIKE 'client_collation';
+SHOW VARIABLES LIKE 'collation_client';
 Variable_name	Value
-client_collation	koi8r_general_ci
+collation_client	koi8r_general_ci
 SELECT charset('a'),collation('a'),coercibility('a'),'a'='A';
 charset('a')	collation('a')	coercibility('a')	'a'='A'
 latin1	latin1_swedish_ci	3	1
 SET CHARACTER SET DEFAULT;
-SHOW VARIABLES LIKE 'client_collation';
+SHOW VARIABLES LIKE 'collation_client';
 Variable_name	Value
-client_collation	latin1_swedish_ci
+collation_client	latin1_swedish_ci
 SELECT charset('a'),collation('a'),coercibility('a'),'a'='A';
 charset('a')	collation('a')	coercibility('a')	'a'='A'
 latin1	latin1_swedish_ci	3	1
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result
index b709d135ee1..8d45c5cf5e9 100644
--- a/mysql-test/r/variables.result
+++ b/mysql-test/r/variables.result
@@ -156,9 +156,9 @@ show variables like 'net_buffer_length';
 Variable_name	Value
 net_buffer_length	1048576
 set character set cp1251_koi8;
-show variables like "client_collation";
+show variables like "collation_client";
 Variable_name	Value
-client_collation	cp1251_bulgarian_ci
+collation_client	cp1251_bulgarian_ci
 select @@timestamp>0;
 @@timestamp>0
 1
@@ -185,7 +185,7 @@ set SESSION query_cache_size=10000;
 Variable 'query_cache_size' is a GLOBAL variable and should be set with SET GLOBAL
 set GLOBAL table_type=DEFAULT;
 Variable 'table_type' doesn't have a default value
-set client_collation=UNKNOWN_CHARACTER_SET;
+set collation_client=UNKNOWN_CHARACTER_SET;
 Unknown character set: 'UNKNOWN_CHARACTER_SET'
 set global autocommit=1;
 Variable 'autocommit' is a LOCAL variable and can't be used with SET GLOBAL
diff --git a/mysql-test/t/ctype_collate.test b/mysql-test/t/ctype_collate.test
index 431799ac65c..0b32c3ccf88 100644
--- a/mysql-test/t/ctype_collate.test
+++ b/mysql-test/t/ctype_collate.test
@@ -128,29 +128,29 @@ SHOW CREATE TABLE t1;
 SHOW FIELDS FROM  t1;
 
 SET CHARACTER SET 'latin1';
-SHOW VARIABLES LIKE 'client_collation';
+SHOW VARIABLES LIKE 'collation_client';
 SET CHARACTER SET latin1;
-SHOW VARIABLES LIKE 'client_collation';
-SHOW VARIABLES LIKE 'client_collation';
+SHOW VARIABLES LIKE 'collation_client';
+SHOW VARIABLES LIKE 'collation_client';
 SELECT charset('a'),collation('a'),coercibility('a'),'a'='A';
 SET CHARACTER SET latin1 COLLATE latin1_bin;
-SHOW VARIABLES LIKE 'client_collation';
+SHOW VARIABLES LIKE 'collation_client';
 SET CHARACTER SET LATIN1 COLLATE Latin1_Bin;
-SHOW VARIABLES LIKE 'client_collation';
+SHOW VARIABLES LIKE 'collation_client';
 SET CHARACTER SET 'latin1' COLLATE 'latin1_bin';
-SHOW VARIABLES LIKE 'client_collation';
+SHOW VARIABLES LIKE 'collation_client';
 SELECT charset('a'),collation('a'),coercibility('a'),'a'='A';
 SET CHARACTER SET koi8r;
-SHOW VARIABLES LIKE 'client_collation';
+SHOW VARIABLES LIKE 'collation_client';
 SELECT charset('a'),collation('a'),coercibility('a'),'a'='A';
 SET CHARACTER SET koi8r COLLATE koi8r_bin;
-SHOW VARIABLES LIKE 'client_collation';
+SHOW VARIABLES LIKE 'collation_client';
 SELECT charset('a'),collation('a'),coercibility('a'),'a'='A';
 SET CHARACTER SET koi8r COLLATE DEFAULT;
-SHOW VARIABLES LIKE 'client_collation';
+SHOW VARIABLES LIKE 'collation_client';
 SELECT charset('a'),collation('a'),coercibility('a'),'a'='A';
 SET CHARACTER SET DEFAULT;
-SHOW VARIABLES LIKE 'client_collation';
+SHOW VARIABLES LIKE 'collation_client';
 SELECT charset('a'),collation('a'),coercibility('a'),'a'='A';
 --error 1251
 SET CHARACTER SET latin1 COLLATE koi8r;
diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test
index bb94ab17b77..d1c8df64be2 100644
--- a/mysql-test/t/variables.test
+++ b/mysql-test/t/variables.test
@@ -92,7 +92,7 @@ set net_buffer_length=2000000000;
 show variables like 'net_buffer_length';
 
 set character set cp1251_koi8;
-show variables like "client_collation";
+show variables like "collation_client";
 select @@timestamp>0;
 
 set @@rand_seed1=10000000,@@rand_seed2=1000000;
@@ -119,7 +119,7 @@ set SESSION query_cache_size=10000;
 --error 1230
 set GLOBAL table_type=DEFAULT;
 --error 1115
-set client_collation=UNKNOWN_CHARACTER_SET;
+set collation_client=UNKNOWN_CHARACTER_SET;
 --error 1228
 set global autocommit=1;
 --error 1228