Some SHOW VARIABLES have been renamed:

collation_client  -> character_set_client
collation_results -> character_set_results
character_set     -> character_set_server

SET NAMES now doesn't start client->server conversion
SET CHARACTER SET now starts both client->server and server->client conversion

4 files changed, 34 insertions, 96 deletions

diff --git a/mysql-test/r/ctype_collate.result b/mysql-test/r/ctype_collate.result
index 6e09cff7fd8..e06651da30e 100644
--- a/mysql-test/r/ctype_collate.result
+++ b/mysql-test/r/ctype_collate.result
@@ -4,7 +4,7 @@ CREATE TABLE t1 (
 latin1_f CHAR(32) CHARACTER SET latin1 NOT NULL
 );
 CREATE TABLE t2 (
-latin1_f CHAR(32) CHARACTER SET latin1 COLLATE koi8r NOT NULL
+latin1_f CHAR(32) CHARACTER SET latin1 COLLATE koi8r_general_ci NOT NULL
 );
 COLLATION 'koi8r_general_ci' is not valid for CHARACTER SET 'latin1'
 INSERT INTO t1 (latin1_f) VALUES (_latin1'A');
@@ -63,7 +63,7 @@ z
 Ä
 ä
 ß
-SELECT latin1_f FROM t1 ORDER BY latin1_f COLLATE latin1;
+SELECT latin1_f FROM t1 ORDER BY latin1_f COLLATE latin1_swedish_ci;
 latin1_f
 A
 a
@@ -179,9 +179,9 @@ z
 ä
 å
 ü
-SELECT latin1_f FROM t1 ORDER BY latin1_f COLLATE koi8r;
-COLLATION 'koi8r' is not valid for CHARACTER SET 'latin1'
-SELECT latin1_f COLLATE latin1            AS latin1_f_as FROM t1 ORDER BY latin1_f_as;
+SELECT latin1_f FROM t1 ORDER BY latin1_f COLLATE koi8r_general_ci;
+COLLATION 'koi8r_general_ci' is not valid for CHARACTER SET 'latin1'
+SELECT latin1_f COLLATE latin1_swedish_ci AS latin1_f_as FROM t1 ORDER BY latin1_f_as;
 latin1_f_as
 A
 a
@@ -297,8 +297,8 @@ z
 ä
 å
 ü
-SELECT latin1_f COLLATE koi8r             AS latin1_f_as FROM t1 ORDER BY latin1_f_as;
-COLLATION 'koi8r' is not valid for CHARACTER SET 'latin1'
+SELECT latin1_f COLLATE koi8r_general_ci  AS latin1_f_as FROM t1 ORDER BY latin1_f_as;
+COLLATION 'koi8r_general_ci' is not valid for CHARACTER SET 'latin1'
 SELECT latin1_f,count(*) FROM t1 GROUP BY latin1_f;
 latin1_f	count(*)
 A	2
@@ -314,7 +314,7 @@ Z	2
 Å	2
 Ä	2
 ß	1
-SELECT latin1_f,count(*) FROM t1 GROUP BY latin1_f COLLATE latin1;
+SELECT latin1_f,count(*) FROM t1 GROUP BY latin1_f COLLATE latin1_swedish_ci;
 latin1_f	count(*)
 A	2
 AD	2
@@ -389,8 +389,8 @@ z	1
 ä	1
 å	1
 ü	1
-SELECT latin1_f,count(*) FROM t1 GROUP BY latin1_f COLLATE koi8r;
-COLLATION 'koi8r' is not valid for CHARACTER SET 'latin1'
+SELECT latin1_f,count(*) FROM t1 GROUP BY latin1_f COLLATE koi8r_general_ci;
+COLLATION 'koi8r_general_ci' is not valid for CHARACTER SET 'latin1'
 SELECT DISTINCT latin1_f                           FROM t1;
 latin1_f
 A
@@ -406,8 +406,8 @@ UE
 SS
 ß
 Z
-SELECT DISTINCT latin1_f COLLATE latin1            FROM t1;
-latin1_f COLLATE latin1
+SELECT DISTINCT latin1_f COLLATE latin1_swedish_ci FROM t1;
+latin1_f COLLATE latin1_swedish_ci
 A
 AD
 AE
@@ -511,64 +511,18 @@ 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 'collation_client';
-Variable_name	Value
-collation_client	latin1_swedish_ci
-SET CHARACTER SET latin1;
-SHOW VARIABLES LIKE 'collation_client';
-Variable_name	Value
-collation_client	latin1_swedish_ci
-SHOW VARIABLES LIKE 'collation_client';
-Variable_name	Value
-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 'collation_client';
-Variable_name	Value
-collation_client	latin1_bin
-SET CHARACTER SET LATIN1 COLLATE Latin1_Bin;
-SHOW VARIABLES LIKE 'collation_client';
+SHOW VARIABLES LIKE 'character_set_client';
 Variable_name	Value
-collation_client	latin1_bin
-SET CHARACTER SET 'latin1' COLLATE 'latin1_bin';
-SHOW VARIABLES LIKE 'collation_client';
-Variable_name	Value
-collation_client	latin1_bin
+character_set_client	latin1
 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 'collation_client';
 Variable_name	Value
-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 'collation_client';
-Variable_name	Value
-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 'collation_client';
-Variable_name	Value
-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 'collation_client';
-Variable_name	Value
-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 koi8r;
-COLLATION 'koi8r_general_ci' is not valid for CHARACTER SET 'latin1'
 SET CHARACTER SET 'DEFAULT';
 Unknown character set: 'DEFAULT'
 DROP TABLE t1;
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result
index 5e613418ea1..f1afcedac83 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 "collation_client";
+show variables like "character_set_client";
 Variable_name	Value
-collation_client	cp1251_bulgarian_ci
+character_set_client	cp1251
 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 collation_client=UNKNOWN_CHARACTER_SET;
+set character_set_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 0b32c3ccf88..0cf531156a9 100644
--- a/mysql-test/t/ctype_collate.test
+++ b/mysql-test/t/ctype_collate.test
@@ -9,7 +9,7 @@ CREATE TABLE t1 (
 
 --error 1251
 CREATE TABLE t2 (
-  latin1_f CHAR(32) CHARACTER SET latin1 COLLATE koi8r NOT NULL
+  latin1_f CHAR(32) CHARACTER SET latin1 COLLATE koi8r_general_ci NOT NULL
 );
 
 
@@ -57,39 +57,39 @@ INSERT INTO t1 (latin1_f) VALUES (_latin1'z');
 -- ORDER BY
 
 SELECT latin1_f FROM t1 ORDER BY latin1_f;
-SELECT latin1_f FROM t1 ORDER BY latin1_f COLLATE latin1;
+SELECT latin1_f FROM t1 ORDER BY latin1_f COLLATE latin1_swedish_ci;
 SELECT latin1_f FROM t1 ORDER BY latin1_f COLLATE latin1_german2_ci;
 SELECT latin1_f FROM t1 ORDER BY latin1_f COLLATE latin1_general_ci;
 SELECT latin1_f FROM t1 ORDER BY latin1_f COLLATE latin1_bin;
 --error 1251
-SELECT latin1_f FROM t1 ORDER BY latin1_f COLLATE koi8r;
+SELECT latin1_f FROM t1 ORDER BY latin1_f COLLATE koi8r_general_ci;
 
 --SELECT latin1_f COLLATE koi8r FROM t1 ;
 
 -- AS + ORDER BY
-SELECT latin1_f COLLATE latin1            AS latin1_f_as FROM t1 ORDER BY latin1_f_as;
+SELECT latin1_f COLLATE latin1_swedish_ci AS latin1_f_as FROM t1 ORDER BY latin1_f_as;
 SELECT latin1_f COLLATE latin1_german2_ci AS latin1_f_as FROM t1 ORDER BY latin1_f_as;
 SELECT latin1_f COLLATE latin1_general_ci AS latin1_f_as FROM t1 ORDER BY latin1_f_as;
 SELECT latin1_f COLLATE latin1_bin        AS latin1_f_as FROM t1 ORDER BY latin1_f_as;
 --error 1251
-SELECT latin1_f COLLATE koi8r             AS latin1_f_as FROM t1 ORDER BY latin1_f_as;
+SELECT latin1_f COLLATE koi8r_general_ci  AS latin1_f_as FROM t1 ORDER BY latin1_f_as;
 
 
 -- GROUP BY
 
 SELECT latin1_f,count(*) FROM t1 GROUP BY latin1_f;
-SELECT latin1_f,count(*) FROM t1 GROUP BY latin1_f COLLATE latin1;
+SELECT latin1_f,count(*) FROM t1 GROUP BY latin1_f COLLATE latin1_swedish_ci;
 SELECT latin1_f,count(*) FROM t1 GROUP BY latin1_f COLLATE latin1_german2_ci;
 SELECT latin1_f,count(*) FROM t1 GROUP BY latin1_f COLLATE latin1_general_ci;
 SELECT latin1_f,count(*) FROM t1 GROUP BY latin1_f COLLATE latin1_bin;
 --error 1251
-SELECT latin1_f,count(*) FROM t1 GROUP BY latin1_f COLLATE koi8r;
+SELECT latin1_f,count(*) FROM t1 GROUP BY latin1_f COLLATE koi8r_general_ci;
 
 
 --  DISTINCT
 
 SELECT DISTINCT latin1_f                           FROM t1;
-SELECT DISTINCT latin1_f COLLATE latin1            FROM t1;
+SELECT DISTINCT latin1_f COLLATE latin1_swedish_ci FROM t1;
 SELECT DISTINCT latin1_f COLLATE latin1_german2_ci FROM t1;
 SELECT DISTINCT latin1_f COLLATE latin1_general_ci FROM t1;
 SELECT DISTINCT latin1_f COLLATE latin1_bin        FROM t1;
@@ -127,35 +127,19 @@ ALTER TABLE t1 CHARACTER SET latin1 COLLATE latin1_bin;
 SHOW CREATE TABLE t1;
 SHOW FIELDS FROM  t1;
 
+#
+# Check SET CHARACTER SET
+#
+
 SET CHARACTER SET 'latin1';
-SHOW VARIABLES LIKE 'collation_client';
-SET CHARACTER SET latin1;
-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 'collation_client';
-SET CHARACTER SET LATIN1 COLLATE Latin1_Bin;
-SHOW VARIABLES LIKE 'collation_client';
-SET CHARACTER SET 'latin1' COLLATE 'latin1_bin';
-SHOW VARIABLES LIKE 'collation_client';
+SHOW VARIABLES LIKE 'character_set_client';
 SELECT charset('a'),collation('a'),coercibility('a'),'a'='A';
+
 SET CHARACTER SET koi8r;
 SHOW VARIABLES LIKE 'collation_client';
 SELECT charset('a'),collation('a'),coercibility('a'),'a'='A';
-SET CHARACTER SET koi8r COLLATE koi8r_bin;
-SHOW VARIABLES LIKE 'collation_client';
-SELECT charset('a'),collation('a'),coercibility('a'),'a'='A';
-SET CHARACTER SET koi8r COLLATE DEFAULT;
-SHOW VARIABLES LIKE 'collation_client';
-SELECT charset('a'),collation('a'),coercibility('a'),'a'='A';
-SET CHARACTER SET DEFAULT;
-SHOW VARIABLES LIKE 'collation_client';
-SELECT charset('a'),collation('a'),coercibility('a'),'a'='A';
---error 1251
-SET CHARACTER SET latin1 COLLATE koi8r;
+
 --error 1115
 SET CHARACTER SET 'DEFAULT';
 
-
 DROP TABLE t1;
diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test
index d1c8df64be2..32e7db12136 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 "collation_client";
+show variables like "character_set_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 collation_client=UNKNOWN_CHARACTER_SET;
+set character_set_client=UNKNOWN_CHARACTER_SET;
 --error 1228
 set global autocommit=1;
 --error 1228