SET NAMES doesn't start recoding

SET CHARACTER SET does

4 files changed, 20 insertions, 20 deletions

diff --git a/mysql-test/r/ctype_many.result b/mysql-test/r/ctype_many.result
index 4d31ab6c274..d6b6429d021 100644
--- a/mysql-test/r/ctype_many.result
+++ b/mysql-test/r/ctype_many.result
@@ -1,5 +1,5 @@
 DROP TABLE IF EXISTS t1;
-SET NAMES latin1;
+SET CHARACTER SET latin1;
 CREATE TABLE t1 (
 comment CHAR(32) ASCII NOT NULL,
 koi8_ru_f CHAR(32) CHARACTER SET koi8r NOT NULL
@@ -158,7 +158,7 @@ INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'ψ','CYR CAPIT SOFT SIGN');
 INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'ό','CYR CAPIT E');
 INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'ΰ','CYR CAPIT YU');
 INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'ρ','CYR CAPIT YA');
-SET NAMES utf8;
+SET CHARACTER SET utf8;
 SELECT koi8_ru_f,MIN(comment),COUNT(*) FROM t1 GROUP BY 1;
 koi8_ru_f	MIN(comment)	COUNT(*)
 a	LAT CAPIT A	2
@@ -221,7 +221,7 @@ z	LAT CAPIT Z	2
 я	CYR CAPIT YA	2
 ALTER TABLE t1 ADD utf8_f CHAR(32) CHARACTER SET utf8 NOT NULL;
 UPDATE t1 SET utf8_f=CONVERT(koi8_ru_f USING utf8);
-SET NAMES koi8r;
+SET CHARACTER SET koi8r;
 SELECT * FROM t1;
 comment	koi8_ru_f	utf8_f
 LAT SMALL A	a	a
@@ -1300,7 +1300,7 @@ CYR CAPIT YA	CYR CAPIT YA
 CYR CAPIT YA	CYR SMALL YA
 CYR SMALL YA	CYR CAPIT YA
 CYR SMALL YA	CYR SMALL YA
-SET NAMES utf8;
+SET CHARACTER SET utf8;
 ALTER TABLE t1 ADD ucs2_f CHAR(32) CHARACTER SET ucs2;
 ALTER TABLE t1 CHANGE ucs2_f ucs2_f CHAR(32) UNICODE NOT NULL;
 INSERT INTO t1 (ucs2_f,comment) VALUES (0x0391,'GREEK CAPIT ALPHA');
@@ -1471,7 +1471,7 @@ ARMENIAN SMALL GIM		Υ£		Υ£	Υ£
 ARMENIAN SMALL DA		Υ€		Υ€	Υ€	
 ARMENIAN SMALL ECH		Υ₯		Υ₯	Υ₯	
 ARMENIAN SMALL ZA		Υ¦		Υ¦	Υ¦	
-SET NAMES 'binary';
+SET CHARACTER SET 'binary';
 SELECT * FROM t1;
 comment	koi8_ru_f	utf8_f	bin_f	ucs2_f	armscii8_f	greek_f
 LAT SMALL A	a	a	a	
diff --git a/mysql-test/r/ctype_recoding.result b/mysql-test/r/ctype_recoding.result
index ea4ec8d068c..99e4864bcf6 100644
--- a/mysql-test/r/ctype_recoding.result
+++ b/mysql-test/r/ctype_recoding.result
@@ -6,16 +6,16 @@ CREATE TABLE ΤΑΒΜΙΓΑ
 );
 SHOW TABLES;
 Tables_in_test
-ΤΑΒΜΙΓΑ
+Ρ‚Π°Π±Π»ΠΈΡ†Π°
 SHOW CREATE TABLE ΤΑΒΜΙΓΑ;
 Table	Create Table
-ΤΑΒΜΙΓΑ	CREATE TABLE `ΤΑΒΜΙΓΑ` (
-  `ΠΟΜΕ` char(32) character set koi8r NOT NULL default ''
+Ρ‚Π°Π±Π»ΠΈΡ†Π°	CREATE TABLE `Ρ‚Π°Π±Π»ΠΈΡ†Π°` (
+  `ΠΏΠΎΠ»Π΅` char(32) character set koi8r NOT NULL default ''
 ) TYPE=MyISAM CHARSET=latin1
 SHOW FIELDS FROM ΤΑΒΜΙΓΑ;
 Field	Type	Collation	Null	Key	Default	Extra
-ΠΟΜΕ	char(32) character set koi8r	koi8r_general_ci				
-SET NAMES cp1251;
+ΠΏΠΎΠ»Π΅	char(32) character set koi8r	koi8r_general_ci				
+SET CHARACTER SET cp1251;
 SHOW TABLES;
 Tables_in_test
 ςΰαλθφΰ
@@ -27,7 +27,7 @@ Table	Create Table
 SHOW FIELDS FROM ςΰαλθφΰ;
 Field	Type	Collation	Null	Key	Default	Extra
 οξλε	char(32) character set koi8r	koi8r_general_ci				
-SET NAMES utf8;
+SET CHARACTER SET utf8;
 SHOW TABLES;
 Tables_in_test
 Ρ‚Π°Π±Π»ΠΈΡ†Π°
@@ -39,5 +39,5 @@ Table	Create Table
 SHOW FIELDS FROM Ρ‚Π°Π±Π»ΠΈΡ†Π°;
 Field	Type	Collation	Null	Key	Default	Extra
 ΠΏΠΎΠ»Π΅	char(32) character set koi8r	koi8r_general_ci				
-SET NAMES koi8r;
+SET CHARACTER SET koi8r;
 DROP TABLE ΤΑΒΜΙΓΑ;
diff --git a/mysql-test/t/ctype_many.test b/mysql-test/t/ctype_many.test
index 05f3687d330..8378ef35685 100644
--- a/mysql-test/t/ctype_many.test
+++ b/mysql-test/t/ctype_many.test
@@ -2,7 +2,7 @@
 DROP TABLE IF EXISTS t1;
 --enable_warnings
 
-SET NAMES latin1;
+SET CHARACTER SET latin1;
 
 CREATE TABLE t1 (
   comment CHAR(32) ASCII NOT NULL,
@@ -137,12 +137,12 @@ INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'ό','CYR CAPIT E');
 INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'ΰ','CYR CAPIT YU');
 INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'ρ','CYR CAPIT YA');
 
-SET NAMES utf8;
+SET CHARACTER SET utf8;
 SELECT koi8_ru_f,MIN(comment),COUNT(*) FROM t1 GROUP BY 1;
 
 ALTER TABLE t1 ADD utf8_f CHAR(32) CHARACTER SET utf8 NOT NULL;
 UPDATE t1 SET utf8_f=CONVERT(koi8_ru_f USING utf8);
-SET NAMES koi8r;
+SET CHARACTER SET koi8r;
 SELECT * FROM t1;
 
 ALTER TABLE t1 ADD bin_f CHAR(32) BYTE NOT NULL;
@@ -165,7 +165,7 @@ FROM t1 t11,t1 t12
 WHERE t11.koi8_ru_f=CONVERT(t12.utf8_f USING koi8r)
 ORDER BY t12.utf8_f,t11.comment,t12.comment;
 
-SET NAMES utf8;
+SET CHARACTER SET utf8;
 ALTER TABLE t1 ADD ucs2_f CHAR(32) CHARACTER SET ucs2;
 ALTER TABLE t1 CHANGE ucs2_f ucs2_f CHAR(32) UNICODE NOT NULL;
 
@@ -199,7 +199,7 @@ UPDATE t1 SET armscii8_f=CONVERT(ucs2_f USING armscii8) WHERE comment LIKE _lati
 UPDATE t1 SET utf8_f=CONVERT(ucs2_f USING utf8) WHERE utf8_f=_utf8'';
 UPDATE t1 SET ucs2_f=CONVERT(utf8_f USING ucs2) WHERE ucs2_f=_ucs2'';
 SELECT * FROM t1;
-SET NAMES 'binary';
+SET CHARACTER SET 'binary';
 SELECT * FROM t1;
 SELECT min(comment),count(*) FROM t1 GROUP BY ucs2_f;
 DROP TABLE t1;
diff --git a/mysql-test/t/ctype_recoding.test b/mysql-test/t/ctype_recoding.test
index c0b7139c791..cb5f4997000 100644
--- a/mysql-test/t/ctype_recoding.test
+++ b/mysql-test/t/ctype_recoding.test
@@ -13,16 +13,16 @@ SHOW TABLES;
 SHOW CREATE TABLE ΤΑΒΜΙΓΑ;
 SHOW FIELDS FROM ΤΑΒΜΙΓΑ;
 
-SET NAMES cp1251;
+SET CHARACTER SET cp1251;
 SHOW TABLES;
 SHOW CREATE TABLE ςΰαλθφΰ;
 SHOW FIELDS FROM ςΰαλθφΰ;
 
 
-SET NAMES utf8;
+SET CHARACTER SET utf8;
 SHOW TABLES;
 SHOW CREATE TABLE Ρ‚Π°Π±Π»ΠΈΡ†Π°;
 SHOW FIELDS FROM Ρ‚Π°Π±Π»ΠΈΡ†Π°;
 
-SET NAMES koi8r;
+SET CHARACTER SET koi8r;
 DROP TABLE ΤΑΒΜΙΓΑ;