Merge pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/clean/mysql-5.1-bugteam

into  pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/build_work/test_fix/mysql-5.1-bugteam_35744

mysql-test/extra/rpl_tests/rpl_insert_id.test

@@ -18,6 +18,13 @@ use test;
 drop table if exists t1, t2, t3;
 --enable_warnings
 
+# If concurrent inserts are on, it is not guaranteed that the rows
+# inserted by INSERT are immediately accessible by SELECT in another
+# thread. This would cause problems near the line 'connection master1'
+# below. So we turn off concurrent inserts.
+SET @old_concurrent_insert= @@global.concurrent_insert;
+SET @@global.concurrent_insert= 0;
+
 --echo #
 --echo # See if queries that use both auto_increment and LAST_INSERT_ID()
 --echo # are replicated well
@@ -29,8 +36,8 @@ drop table if exists t1, t2, t3;
 #should work for both SBR and RBR
 
 connection master;
-create table t1(a int auto_increment, key(a));
-create table t2(b int auto_increment, c int, key(b));
+eval create table t1(a int auto_increment, key(a)) engine=$engine_type;
+eval create table t2(b int auto_increment, c int, key(b)) engine=$engine_type;
 insert into t1 values (1),(2),(3);
 insert into t1 values (null);
 insert into t2 values (null,last_insert_id());
@@ -68,8 +75,8 @@ connection master;
 
 drop table t2;
 drop table t1;
-create table t1(a int auto_increment, key(a));
-create table t2(b int auto_increment, c int, key(b));
+eval create table t1(a int auto_increment, key(a)) engine=$engine_type;
+eval create table t2(b int auto_increment, c int, key(b)) engine=$engine_type;
 insert into t1 values (10);
 insert into t1 values (null),(null),(null);
 insert into t2 values (5,0);
@@ -94,7 +101,7 @@ sync_with_master;
 
 connection master;
 SET TIMESTAMP=1000000000;
-CREATE TABLE t1 ( a INT UNIQUE );
+eval CREATE TABLE t1 ( a INT UNIQUE ) engine=$engine_type;
 SET FOREIGN_KEY_CHECKS=0;
 # Duplicate Key Errors
 --error 1022, ER_DUP_ENTRY
@@ -109,8 +116,8 @@ sync_slave_with_master;
 --echo #
 
 connection master;
-create table t1(a int auto_increment, key(a));
-create table t2(a int);
+eval create table t1(a int auto_increment, key(a)) engine=$engine_type;
+eval create table t2(a int) engine=$engine_type;
 insert into t1 (a) values (null);
 insert into t2 (a) select a from t1 where a is null;
 insert into t2 (a) select a from t1 where a is null;
@@ -139,11 +146,11 @@ drop function if exists bug15728_insert;
 drop table if exists t1, t2;
 --enable_warnings
 
-create table t1 (
+eval create table t1 (
   id int not null auto_increment,
   last_id int,
   primary key (id)
-);
+) engine=$engine_type;
 create function bug15728() returns int(11)
   return last_insert_id();
 
@@ -152,11 +159,11 @@ insert into t1 (last_id) values (last_insert_id());
 insert into t1 (last_id) values (bug15728());
 
 # Check that nested call replicates too.
-create table t2 (
+eval create table t2 (
   id int not null auto_increment,
   last_id int,
   primary key (id)
-);
+) engine=$engine_type;
 delimiter |;
 create function bug15728_insert() returns int(11) modifies sql data
 begin
@@ -215,8 +222,8 @@ drop procedure foo;
 # test of BUG#20188 REPLACE or ON DUPLICATE KEY UPDATE in
 # auto_increment breaks binlog
 
-create table t1 (n int primary key auto_increment not null,
-b int, unique(b));
+eval create table t1 (n int primary key auto_increment not null,
+                      b int, unique(b)) engine=$engine_type;
 
 # First, test that we do not call restore_auto_increment() too early
 # in write_record():
@@ -257,8 +264,8 @@ select * from t1 order by n;
 # and now test for the bug:
 connection master;
 drop table t1;
-create table t1 (n int primary key auto_increment not null,
-b int, unique(b));
+eval create table t1 (n int primary key auto_increment not null,
+                      b int, unique(b)) engine=$engine_type;
 insert into t1 values(null,100);
 select * from t1 order by n;
 sync_slave_with_master;
@@ -282,29 +289,29 @@ sync_slave_with_master;
 
 connection master;
 # testcase with INSERT VALUES
-CREATE TABLE t1 (a INT NOT NULL PRIMARY KEY AUTO_INCREMENT, b INT,
-UNIQUE(b));
+eval CREATE TABLE t1 (a INT NOT NULL PRIMARY KEY AUTO_INCREMENT, b INT,
+                      UNIQUE(b)) ENGINE=$engine_type;
 INSERT INTO t1(b) VALUES(1),(1),(2) ON DUPLICATE KEY UPDATE t1.b=10;
-SELECT * FROM t1;
+SELECT * FROM t1 ORDER BY a;
 sync_slave_with_master;
-SELECT * FROM t1;
+SELECT * FROM t1 ORDER BY a;
 connection master;
 drop table t1;
 
 # tescase with INSERT SELECT
-CREATE TABLE t1 (
+eval CREATE TABLE t1 (
   id bigint(20) unsigned NOT NULL auto_increment,
   field_1 int(10) unsigned NOT NULL,
   field_2 varchar(255) NOT NULL,
   field_3 varchar(255) NOT NULL,
   PRIMARY KEY (id),
   UNIQUE KEY field_1 (field_1, field_2)
-);
-CREATE TABLE t2 (
+) ENGINE=$engine_type;
+eval CREATE TABLE t2 (
   field_a int(10) unsigned NOT NULL,
   field_b varchar(255) NOT NULL,
   field_c varchar(255) NOT NULL
-);
+) ENGINE=$engine_type;
 INSERT INTO t2 (field_a, field_b, field_c) VALUES (1, 'a', '1a');
 INSERT INTO t2 (field_a, field_b, field_c) VALUES (2, 'b', '2b');
 INSERT INTO t2 (field_a, field_b, field_c) VALUES (3, 'c', '3c');
@@ -324,9 +331,9 @@ SELECT t2.field_a, t2.field_b, t2.field_c
 FROM t2
 ON DUPLICATE KEY UPDATE
 t1.field_3 = t2.field_c;
-SELECT * FROM t1;
+SELECT * FROM t1 ORDER BY id;
 sync_slave_with_master;
-SELECT * FROM t1;
+SELECT * FROM t1 ORDER BY id;
 connection master;
 drop table t1, t2;
 
@@ -348,17 +355,17 @@ DROP TABLE IF EXISTS t1, t2;
 # Reset result of LAST_INSERT_ID().
 SELECT LAST_INSERT_ID(0);
 
-CREATE TABLE t1 (
+eval CREATE TABLE t1 (
   id INT NOT NULL DEFAULT 0,
   last_id INT,
   PRIMARY KEY (id)
-);
+) ENGINE=$engine_type;
 
-CREATE TABLE t2 (
+eval CREATE TABLE t2 (
   id INT NOT NULL AUTO_INCREMENT,
   last_id INT,
   PRIMARY KEY (id)
-);
+) ENGINE=$engine_type;
 
 delimiter |;
 CREATE PROCEDURE p1()
@@ -369,12 +376,12 @@ END|
 delimiter ;|
 
 CALL p1();
-SELECT * FROM t1;
-SELECT * FROM t2;
+SELECT * FROM t1 ORDER BY id;
+SELECT * FROM t2 ORDER BY id;
 
 sync_slave_with_master;
-SELECT * FROM t1;
-SELECT * FROM t2;
+SELECT * FROM t1 ORDER BY id;
+SELECT * FROM t2 ORDER BY id;
 
 connection master;
 
@@ -394,11 +401,11 @@ DROP FUNCTION IF EXISTS f3;
 DROP TABLE IF EXISTS t1, t2;
 --enable_warnings
 
-CREATE TABLE t1 (
+eval CREATE TABLE t1 (
     i INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
     j INT DEFAULT 0
-);
-CREATE TABLE t2 (i INT);
+) ENGINE=$engine_type;
+eval CREATE TABLE t2 (i INT) ENGINE=$engine_type;
 
 delimiter |;
 CREATE PROCEDURE p1()
@@ -443,14 +450,16 @@ UPDATE t1 SET j= -1 WHERE i IS NULL;
 # Test statement-based replication of function calls.
 INSERT INTO t1 (i) VALUES (NULL);
 
+# Here, we rely on having set @@concurrent_insert= 0 (see comment at
+# the top of this file).
 connection master1;
 INSERT INTO t1 (i) VALUES (NULL);
 
 connection master;
 SELECT f3();
 
-SELECT * FROM t1;
-SELECT * FROM t2;
+SELECT * FROM t1 ORDER BY i;
+SELECT * FROM t2 ORDER BY i;
 
 sync_slave_with_master;
 SELECT * FROM t1;
@@ -472,11 +481,11 @@ sync_slave_with_master;
 
 # Tests in this file are tightly bound together.  Recreate t2.
 connection master;
-create table t2 (
+eval create table t2 (
   id int not null auto_increment,
   last_id int,
   primary key (id)
-);
+) engine=$engine_type;
 
 
 # Test for BUG#20341 "stored function inserting into one
@@ -484,7 +493,8 @@ create table t2 (
 
 connection master;
 truncate table t2;
-create table t1 (id tinyint primary key); # no auto_increment
+# no auto_increment
+eval create table t1 (id tinyint primary key) engine=$engine_type;
 
 delimiter |;
 create function insid() returns int
@@ -504,20 +514,20 @@ insert into t2 (id) values(5),(6),(7);
 delete from t2 where id>=5;
 set sql_log_bin=1;
 insert into t1 select insid();
-select * from t1;
-select * from t2;
+select * from t1 order by id;
+select * from t2 order by id;
 
 sync_slave_with_master;
-select * from t1;
-select * from t2;
+select * from t1 order by id;
+select * from t2 order by id;
 
 connection master;
 drop table t1;
 drop function insid;
 
 truncate table t2;
-create table t1 (n int primary key auto_increment not null,
-b int, unique(b));
+eval create table t1 (n int primary key auto_increment not null,
+                      b int, unique(b)) engine=$engine_type;
 delimiter |;
 create procedure foo()
 begin
@@ -528,14 +538,15 @@ begin
 end|
 delimiter ;|
 call foo();
-select * from t1;
-select * from t2;
+select * from t1 order by n;
+select * from t2 order by id;
 
 sync_slave_with_master;
-select * from t1;
-select * from t2;
+select * from t1 order by n;
+select * from t2 order by id;
 
 connection master;
 drop table t1, t2;
 drop procedure foo;
+SET @@global.concurrent_insert= @old_concurrent_insert;
 sync_slave_with_master;

mysql-test/suite/jp/include/trim_sjis.inc

+#
+# Test TRIM() function with Japanese characters sjis encoding
+#
+
+--source include/have_sjis.inc
+--character_set sjis
+SET NAMES sjis;
+SET character_set_database = sjis;
+
+--disable_warnings
+DROP TABLE IF EXISTS `Ｔ１`;
+DROP TABLE IF EXISTS `Ｔ２`;
+DROP TABLE IF EXISTS `Ｔ３`;
+--enable_warnings
+--replace_result $engine <engine_to_be_tested>
+eval CREATE TABLE `Ｔ１` (`Ｃ１` CHAR(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis ENGINE = $engine;
+--replace_result $engine <engine_to_be_tested>
+eval CREATE TABLE `Ｔ２` (`Ｃ１` CHAR(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis ENGINE = $engine;
+--replace_result $engine <engine_to_be_tested>
+eval CREATE TABLE `Ｔ３` (`Ｃ１` CHAR(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis ENGINE = $engine;
+
+# Nothing to trim
+INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
+# Test data for TRIM(TRAILING [remstr] FROM str)
+INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵｶ');
+INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵｶｶ');
+INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵｶｶｶ');
+# Test data for TRIM(LEADING [remstr] FROM str)
+INSERT INTO `Ｔ１` VALUES ('ｶｱｲｳｴｵ');
+INSERT INTO `Ｔ１` VALUES ('ｶｶｱｲｳｴｵ');
+INSERT INTO `Ｔ１` VALUES ('ｶｶｶｱｲｳｴｵ');
+# Test data for TRIM(BOTH [remstr] FROM str)
+INSERT INTO `Ｔ１` VALUES ('ｶｶｶｱｲｳｴｵｶｶｶ');
+# Test data for TRIM without [remstr] (remove spaces) 
+INSERT INTO `Ｔ１` VALUES ('   ｱｲｳｴｵ   ');
+INSERT INTO `Ｔ２` VALUES ('あいうえお');
+INSERT INTO `Ｔ２` VALUES ('あいうえおか');
+INSERT INTO `Ｔ２` VALUES ('あいうえおかか');
+INSERT INTO `Ｔ２` VALUES ('あいうえおかかか');
+INSERT INTO `Ｔ２` VALUES ('かあいうえお');
+INSERT INTO `Ｔ２` VALUES ('かかあいうえお');
+INSERT INTO `Ｔ２` VALUES ('かかかあいうえお');
+INSERT INTO `Ｔ２` VALUES ('かかかあいうえおかかか');
+INSERT INTO `Ｔ２` VALUES ('   あいうえお   ');
+INSERT INTO `Ｔ３` VALUES ('ソ十表予構');
+INSERT INTO `Ｔ３` VALUES ('ソ十表予構暴');
+INSERT INTO `Ｔ３` VALUES ('ソ十表予構暴暴');
+INSERT INTO `Ｔ３` VALUES ('ソ十表予構暴暴暴');
+INSERT INTO `Ｔ３` VALUES ('暴ソ十表予構');
+INSERT INTO `Ｔ３` VALUES ('暴暴ソ十表予構');
+INSERT INTO `Ｔ３` VALUES ('暴暴暴ソ十表予構');
+INSERT INTO `Ｔ３` VALUES ('暴暴暴ソ十表予構暴暴暴');
+INSERT INTO `Ｔ３` VALUES ('   ソ十表予構   ');
+
+SELECT `Ｃ１`,TRIM(TRAILING 'ｶ' FROM `Ｃ１`) FROM `Ｔ１`;
+SELECT `Ｃ１`,TRIM(LEADING 'ｶ' FROM `Ｃ１`) FROM `Ｔ１`;
+SELECT `Ｃ１`,TRIM(BOTH 'ｶ' FROM `Ｃ１`) FROM `Ｔ１`;
+SELECT `Ｃ１`,TRIM(`Ｃ１`) FROM `Ｔ１`;
+SELECT `Ｃ１`,TRIM(TRAILING 'か' FROM `Ｃ１`) FROM `Ｔ２`;
+SELECT `Ｃ１`,TRIM(LEADING 'か' FROM `Ｃ１`) FROM `Ｔ２`;
+SELECT `Ｃ１`,TRIM(BOTH 'か' FROM `Ｃ１`) FROM `Ｔ２`;
+SELECT `Ｃ１`,TRIM(`Ｃ１`) FROM `Ｔ２`;
+SELECT `Ｃ１`,TRIM(TRAILING '暴' FROM `Ｃ１`) FROM `Ｔ３`;
+SELECT `Ｃ１`,TRIM(LEADING '暴' FROM `Ｃ１`) FROM `Ｔ３`;
+SELECT `Ｃ１`,TRIM(BOTH '暴' FROM `Ｃ１`) FROM `Ｔ３`;
+SELECT `Ｃ１`,TRIM(`Ｃ１`) FROM `Ｔ３`;
+
+DROP TABLE `Ｔ１`;
+DROP TABLE `Ｔ２`;
+DROP TABLE `Ｔ３`;

mysql-test/suite/jp/r/jp_charlength_sjis.result

@@ -7,9 +7,6 @@ drop table if exists `
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 SET NAMES sjis;
 SET character_set_database = sjis;
 CREATE TABLE `Ｔ１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = MEMORY;
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ２` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `Ｔ３` VALUES ('ソ十表予構'),('ソ十表予'),('ソ十表'),('ソ十'),('ソ'),('');
@@ -33,9 +27,6 @@ INSERT INTO `
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `Ｔ９` VALUES ('ソ十表予構'),('ソ十表予'),('ソ十表'),('ソ十'),('ソ'),('');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
-INSERT INTO `Ｔ１２` VALUES ('ソ十表予構'),('ソ十表予'),('ソ十表'),('ソ十'),('ソ'),('');
 SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１`;
 Ｃ１	CHAR_LENGTH(`Ｃ１`)
 	0
@@ -106,30 +97,6 @@ SELECT `
 ソ十表予	4
 ソ十表	3
 ソ十	2
-ソ	1
-	0
-SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１０`;
-Ｃ１	CHAR_LENGTH(`Ｃ１`)
-ｱｲｳｴｵ	5
-ｱｲｳｴ	4
-ｱｲｳ	3
-ｱｲ	2
-ｱ	1
-	0
-SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１１`;
-Ｃ１	CHAR_LENGTH(`Ｃ１`)
-あいうえお	5
-あいうえ	4
-あいう	3
-あい	2
-あ	1
-	0
-SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１２`;
-Ｃ１	CHAR_LENGTH(`Ｃ１`)
-ソ十表予構	5
-ソ十表予	4
-ソ十表	3
-ソ十	2
 ソ	1
 	0
 DROP TABLE `Ｔ１`;
@@ -141,6 +108,3 @@ DROP TABLE `
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;

mysql-test/suite/jp/r/jp_charlength_ucs2.result

@@ -7,9 +7,6 @@ drop table if exists `
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 SET NAMES ujis;
 SET character_set_database = ucs2;
 SET collation_connection = ucs2_general_ci;
@@ -19,12 +16,9 @@ CREATE TABLE `
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ２` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `Ｔ３` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
@@ -34,9 +28,6 @@ INSERT INTO `
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
 SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１`;
 Ｃ１	CHAR_LENGTH(`Ｃ１`)
 	0
@@ -107,30 +98,6 @@ SELECT `
 龔龖龗龞	4
 龔龖龗	3
 龔龖	2
-龔	1
-	0
-SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１０`;
-Ｃ１	CHAR_LENGTH(`Ｃ１`)
-ｱｲｳｴｵ	5
-ｱｲｳｴ	4
-ｱｲｳ	3
-ｱｲ	2
-ｱ	1
-	0
-SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１１`;
-Ｃ１	CHAR_LENGTH(`Ｃ１`)
-あいうえお	5
-あいうえ	4
-あいう	3
-あい	2
-あ	1
-	0
-SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１２`;
-Ｃ１	CHAR_LENGTH(`Ｃ１`)
-龔龖龗龞龡	5
-龔龖龗龞	4
-龔龖龗	3
-龔龖	2
 龔	1
 	0
 DROP TABLE `Ｔ１`;
@@ -142,6 +109,3 @@ DROP TABLE `
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;

mysql-test/suite/jp/r/jp_charlength_ujis.result

@@ -7,9 +7,6 @@ drop table if exists `
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 SET NAMES ujis;
 SET character_set_database = ujis;
 CREATE TABLE `Ｔ１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ujis engine = MEMORY;
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ２` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `Ｔ３` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
@@ -33,9 +27,6 @@ INSERT INTO `
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
 SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１`;
 Ｃ１	CHAR_LENGTH(`Ｃ１`)
 	0
@@ -106,30 +97,6 @@ SELECT `
 龔龖龗龞	4
 龔龖龗	3
 龔龖	2
-龔	1
-	0
-SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１０`;
-Ｃ１	CHAR_LENGTH(`Ｃ１`)
-ｱｲｳｴｵ	5
-ｱｲｳｴ	4
-ｱｲｳ	3
-ｱｲ	2
-ｱ	1
-	0
-SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１１`;
-Ｃ１	CHAR_LENGTH(`Ｃ１`)
-あいうえお	5
-あいうえ	4
-あいう	3
-あい	2
-あ	1
-	0
-SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１２`;
-Ｃ１	CHAR_LENGTH(`Ｃ１`)
-龔龖龗龞龡	5
-龔龖龗龞	4
-龔龖龗	3
-龔龖	2
 龔	1
 	0
 DROP TABLE `Ｔ１`;
@@ -141,6 +108,3 @@ DROP TABLE `
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;

mysql-test/suite/jp/r/jp_charlength_utf8.result

@@ -7,9 +7,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 SET NAMES utf8;
 SET character_set_database = utf8;
 CREATE TABLE `Ｔ１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY;
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ２` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `Ｔ３` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
@@ -33,9 +27,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),(
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
 INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
 SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１`;
 Ｃ１	CHAR_LENGTH(`Ｃ１`)
 	0
@@ -106,30 +97,6 @@ SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ９`;
 龔龖龗龞	4
 龔龖龗	3
 龔龖	2
-龔	1
-	0
-SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１０`;
-Ｃ１	CHAR_LENGTH(`Ｃ１`)
-ｱｲｳｴｵ	5
-ｱｲｳｴ	4
-ｱｲｳ	3
-ｱｲ	2
-ｱ	1
-	0
-SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１１`;
-Ｃ１	CHAR_LENGTH(`Ｃ１`)
-あいうえお	5
-あいうえ	4
-あいう	3
-あい	2
-あ	1
-	0
-SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１２`;
-Ｃ１	CHAR_LENGTH(`Ｃ１`)
-龔龖龗龞龡	5
-龔龖龗龞	4
-龔龖龗	3
-龔龖	2
 龔	1
 	0
 DROP TABLE `Ｔ１`;
@@ -141,6 +108,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;

mysql-test/suite/jp/r/jp_charset_sjis.result

@@ -7,9 +7,6 @@ drop table if exists `
 drop table if exists `sV`;
 drop table if exists `sW`;
 drop table if exists `sX`;
-drop table if exists `sPO`;
-drop table if exists `sPP`;
-drop table if exists `sPQ`;
 SET NAMES sjis;
 SET character_set_database = sjis;
 CREATE TABLE `sP` (`bP` char(20)) DEFAULT CHARSET = sjis engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `
 CREATE TABLE `sS` (`bP` char(20)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `sT` (`bP` char(20)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `sU` (`bP` char(20)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `sV` (`bP` char(20)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `sW` (`bP` char(20)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `sX` (`bP` char(20)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `sPO` (`bP` char(20)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `sPP` (`bP` char(20)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `sPQ` (`bP` char(20)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `sV` (`bP` char(20)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `sW` (`bP` char(20)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `sX` (`bP` char(20)) DEFAULT CHARSET = sjis engine = MEMORY;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `sP`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `sQ`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `sR`;
@@ -33,9 +27,6 @@ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `sV`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `sW`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `sX`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `sPO`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `sPP`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `sPQ`;
 SELECT DISTINCT CHARSET(`bP`) FROM `sP`;
 CHARSET(`bP`)
 sjis
@@ -171,51 +162,6 @@ sjis
 SELECT DISTINCT CHARSET(CONVERT(`bP` USING ujis)) FROM `sX`;
 CHARSET(CONVERT(`bP` USING ujis))
 ujis
-SELECT DISTINCT CHARSET(`bP`) FROM `sPO`;
-CHARSET(`bP`)
-sjis
-SELECT DISTINCT CHARSET(`bP`) FROM `sPP`;
-CHARSET(`bP`)
-sjis
-SELECT DISTINCT CHARSET(`bP`) FROM `sPQ`;
-CHARSET(`bP`)
-sjis
-SELECT DISTINCT CHARSET(CONVERT(`bP` USING utf8)) FROM `sPO`;
-CHARSET(CONVERT(`bP` USING utf8))
-utf8
-SELECT DISTINCT CHARSET(CONVERT(`bP` USING ucs2)) FROM `sPO`;
-CHARSET(CONVERT(`bP` USING ucs2))
-ucs2
-SELECT DISTINCT CHARSET(CONVERT(`bP` USING sjis)) FROM `sPO`;
-CHARSET(CONVERT(`bP` USING sjis))
-sjis
-SELECT DISTINCT CHARSET(CONVERT(`bP` USING ujis)) FROM `sPO`;
-CHARSET(CONVERT(`bP` USING ujis))
-ujis
-SELECT DISTINCT CHARSET(CONVERT(`bP` USING utf8)) FROM `sPP`;
-CHARSET(CONVERT(`bP` USING utf8))
-utf8
-SELECT DISTINCT CHARSET(CONVERT(`bP` USING ucs2)) FROM `sPP`;
-CHARSET(CONVERT(`bP` USING ucs2))
-ucs2
-SELECT DISTINCT CHARSET(CONVERT(`bP` USING sjis)) FROM `sPP`;
-CHARSET(CONVERT(`bP` USING sjis))
-sjis
-SELECT DISTINCT CHARSET(CONVERT(`bP` USING ujis)) FROM `sPP`;
-CHARSET(CONVERT(`bP` USING ujis))
-ujis
-SELECT DISTINCT CHARSET(CONVERT(`bP` USING utf8)) FROM `sPQ`;
-CHARSET(CONVERT(`bP` USING utf8))
-utf8
-SELECT DISTINCT CHARSET(CONVERT(`bP` USING ucs2)) FROM `sPQ`;
-CHARSET(CONVERT(`bP` USING ucs2))
-ucs2
-SELECT DISTINCT CHARSET(CONVERT(`bP` USING sjis)) FROM `sPQ`;
-CHARSET(CONVERT(`bP` USING sjis))
-sjis
-SELECT DISTINCT CHARSET(CONVERT(`bP` USING ujis)) FROM `sPQ`;
-CHARSET(CONVERT(`bP` USING ujis))
-ujis
 drop table `sP`;
 drop table `sQ`;
 drop table `sR`;
@@ -225,6 +171,3 @@ drop table `
 drop table `sV`;
 drop table `sW`;
 drop table `sX`;
-drop table `sPO`;
-drop table `sPP`;
-drop table `sPQ`;

mysql-test/suite/jp/r/jp_charset_ucs2.result

@@ -7,9 +7,6 @@ drop table if exists `
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 SET NAMES ujis;
 SET character_set_database = ucs2;
 CREATE TABLE `Ｔ１` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `
 CREATE TABLE `Ｔ４` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = MEMORY;
 INSERT INTO `Ｔ１` VALUES
 ('PQRSTUVWXYZ[\\]^_')
 ,(' ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ')
@@ -90,28 +84,6 @@ INSERT INTO `
 ,('・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪')
 ,('鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖')
 ,('齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒');
-INSERT INTO `Ｔ１０` VALUES
-('PQRSTUVWXYZ[\\]^_')
-,(' ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ')
-,('ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ')
-,('ﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏ')
-,('ﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ');
-INSERT INTO `Ｔ１１` VALUES
-('ヾゝゞ〃仝々〆〇ー—‐／＼〜‖｜…‥‘’')
-,('“”（）〔〕［］｛｝〈〉《》「」『』【】')
-,('・ぁあぃいぅうぇえぉおかがきぎくぐけげこ')
-,('・ァアィイゥウェエォオカガキギクグケゲコ')
-,('・亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵')
-,('・弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞')
-,('・鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻');
-INSERT INTO `Ｔ１２` VALUES
-('・˛˚~΄΅・・・・・・・・¡¦¿・・・')
-,('乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠')
-,('仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众')
-,('伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘')
-,('・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪')
-,('鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖')
-,('齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒');
 SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ１`;
 CHARSET(`Ｃ１`)
 ucs2
@@ -247,51 +219,6 @@ sjis
 SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ９`;
 CHARSET(CONVERT(`Ｃ１` USING ujis))
 ujis
-SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ１０`;
-CHARSET(`Ｃ１`)
-ucs2
-SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ１１`;
-CHARSET(`Ｃ１`)
-ucs2
-SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ１２`;
-CHARSET(`Ｃ１`)
-ucs2
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ１０`;
-CHARSET(CONVERT(`Ｃ１` USING utf8))
-utf8
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ１０`;
-CHARSET(CONVERT(`Ｃ１` USING ucs2))
-ucs2
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ１０`;
-CHARSET(CONVERT(`Ｃ１` USING sjis))
-sjis
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ１０`;
-CHARSET(CONVERT(`Ｃ１` USING ujis))
-ujis
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ１１`;
-CHARSET(CONVERT(`Ｃ１` USING utf8))
-utf8
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ１１`;
-CHARSET(CONVERT(`Ｃ１` USING ucs2))
-ucs2
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ１１`;
-CHARSET(CONVERT(`Ｃ１` USING sjis))
-sjis
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ１１`;
-CHARSET(CONVERT(`Ｃ１` USING ujis))
-ujis
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ１２`;
-CHARSET(CONVERT(`Ｃ１` USING utf8))
-utf8
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ１２`;
-CHARSET(CONVERT(`Ｃ１` USING ucs2))
-ucs2
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ１２`;
-CHARSET(CONVERT(`Ｃ１` USING sjis))
-sjis
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ１２`;
-CHARSET(CONVERT(`Ｃ１` USING ujis))
-ujis
 drop table `Ｔ１`;
 drop table `Ｔ２`;
 drop table `Ｔ３`;
@@ -301,6 +228,3 @@ drop table `
 drop table `Ｔ７`;
 drop table `Ｔ８`;
 drop table `Ｔ９`;
-drop table `Ｔ１０`;
-drop table `Ｔ１１`;
-drop table `Ｔ１２`;

mysql-test/suite/jp/r/jp_charset_ujis.result

@@ -7,9 +7,6 @@ drop table if exists `
 drop table if exists `ԣ`;
 drop table if exists `ԣ`;
 drop table if exists `ԣ`;
-drop table if exists `ԣ`;
-drop table if exists `ԣ`;
-drop table if exists `ԣ`;
 SET NAMES ujis;
 SET character_set_database = ujis;
 CREATE TABLE `ԣ` (`ã` char(20)) DEFAULT CHARSET = ujis engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `
 CREATE TABLE `ԣ` (`ã` char(20)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `ԣ` (`ã` char(20)) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `ԣ` (`ã` char(20)) DEFAULT CHARSET = ujis engine = myisam;
-CREATE TABLE `ԣ` (`ã` char(20)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `ԣ` (`ã` char(20)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `ԣ` (`ã` char(20)) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `ԣ` (`ã` char(20)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `ԣ` (`ã` char(20)) DEFAULT CHARSET = ujis engine = bdb;
-CREATE TABLE `ԣ` (`ã` char(20)) DEFAULT CHARSET = ujis engine = bdb;
+CREATE TABLE `ԣ` (`ã` char(20)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `ԣ` (`ã` char(20)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `ԣ` (`ã` char(20)) DEFAULT CHARSET = ujis engine = MEMORY;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_ujis.dat' INTO TABLE `ԣ`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_ujis.dat' INTO TABLE `ԣ`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `ԣ`;
@@ -33,9 +27,6 @@ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_ujis.dat' INTO TABLE `ԣ`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_ujis.dat' INTO TABLE `ԣ`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `ԣ`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_ujis.dat' INTO TABLE `ԣ`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_ujis.dat' INTO TABLE `ԣ`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_ujis.dat' INTO TABLE `ԣ`;
 SELECT DISTINCT CHARSET(`ã`) FROM `ԣ`;
 CHARSET(`ã`)
 ujis
@@ -171,51 +162,6 @@ sjis
 SELECT DISTINCT CHARSET(CONVERT(`ã` USING ujis)) FROM `ԣ`;
 CHARSET(CONVERT(`ã` USING ujis))
 ujis
-SELECT DISTINCT CHARSET(`ã`) FROM `ԣ`;
-CHARSET(`ã`)
-ujis
-SELECT DISTINCT CHARSET(`ã`) FROM `ԣ`;
-CHARSET(`ã`)
-ujis
-SELECT DISTINCT CHARSET(`ã`) FROM `ԣ`;
-CHARSET(`ã`)
-ujis
-SELECT DISTINCT CHARSET(CONVERT(`ã` USING utf8)) FROM `ԣ`;
-CHARSET(CONVERT(`ã` USING utf8))
-utf8
-SELECT DISTINCT CHARSET(CONVERT(`ã` USING ucs2)) FROM `ԣ`;
-CHARSET(CONVERT(`ã` USING ucs2))
-ucs2
-SELECT DISTINCT CHARSET(CONVERT(`ã` USING sjis)) FROM `ԣ`;
-CHARSET(CONVERT(`ã` USING sjis))
-sjis
-SELECT DISTINCT CHARSET(CONVERT(`ã` USING ujis)) FROM `ԣ`;
-CHARSET(CONVERT(`ã` USING ujis))
-ujis
-SELECT DISTINCT CHARSET(CONVERT(`ã` USING utf8)) FROM `ԣ`;
-CHARSET(CONVERT(`ã` USING utf8))
-utf8
-SELECT DISTINCT CHARSET(CONVERT(`ã` USING ucs2)) FROM `ԣ`;
-CHARSET(CONVERT(`ã` USING ucs2))
-ucs2
-SELECT DISTINCT CHARSET(CONVERT(`ã` USING sjis)) FROM `ԣ`;
-CHARSET(CONVERT(`ã` USING sjis))
-sjis
-SELECT DISTINCT CHARSET(CONVERT(`ã` USING ujis)) FROM `ԣ`;
-CHARSET(CONVERT(`ã` USING ujis))
-ujis
-SELECT DISTINCT CHARSET(CONVERT(`ã` USING utf8)) FROM `ԣ`;
-CHARSET(CONVERT(`ã` USING utf8))
-utf8
-SELECT DISTINCT CHARSET(CONVERT(`ã` USING ucs2)) FROM `ԣ`;
-CHARSET(CONVERT(`ã` USING ucs2))
-ucs2
-SELECT DISTINCT CHARSET(CONVERT(`ã` USING sjis)) FROM `ԣ`;
-CHARSET(CONVERT(`ã` USING sjis))
-sjis
-SELECT DISTINCT CHARSET(CONVERT(`ã` USING ujis)) FROM `ԣ`;
-CHARSET(CONVERT(`ã` USING ujis))
-ujis
 drop table `ԣ`;
 drop table `ԣ`;
 drop table `ԣ`;
@@ -225,6 +171,3 @@ drop table `
 drop table `ԣ`;
 drop table `ԣ`;
 drop table `ԣ`;
-drop table `ԣ`;
-drop table `ԣ`;
-drop table `ԣ`;

mysql-test/suite/jp/r/jp_charset_utf8.result

@@ -7,9 +7,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 SET NAMES utf8;
 SET character_set_database = utf8;
 CREATE TABLE `Ｔ１` (`Ｃ１` char(20)) DEFAULT CHARSET = utf8 engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(20)) DEFAULT CHARSET = utf8 engine = innodb
 CREATE TABLE `Ｔ４` (`Ｃ１` char(20)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(20)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(20)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(20)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(20)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(20)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(20)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(20)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(20)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(20)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(20)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(20)) DEFAULT CHARSET = utf8 engine = MEMORY;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `Ｔ１`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `Ｔ２`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `Ｔ３`;
@@ -33,9 +27,6 @@ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `Ｔ６`
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `Ｔ７`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `Ｔ８`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `Ｔ９`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `Ｔ１０`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `Ｔ１１`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `Ｔ１２`;
 SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ１`;
 CHARSET(`Ｃ１`)
 utf8
@@ -171,51 +162,6 @@ sjis
 SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ９`;
 CHARSET(CONVERT(`Ｃ１` USING ujis))
 ujis
-SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ１０`;
-CHARSET(`Ｃ１`)
-utf8
-SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ１１`;
-CHARSET(`Ｃ１`)
-utf8
-SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ１２`;
-CHARSET(`Ｃ１`)
-utf8
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ１０`;
-CHARSET(CONVERT(`Ｃ１` USING utf8))
-utf8
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ１０`;
-CHARSET(CONVERT(`Ｃ１` USING ucs2))
-ucs2
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ１０`;
-CHARSET(CONVERT(`Ｃ１` USING sjis))
-sjis
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ１０`;
-CHARSET(CONVERT(`Ｃ１` USING ujis))
-ujis
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ１１`;
-CHARSET(CONVERT(`Ｃ１` USING utf8))
-utf8
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ１１`;
-CHARSET(CONVERT(`Ｃ１` USING ucs2))
-ucs2
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ１１`;
-CHARSET(CONVERT(`Ｃ１` USING sjis))
-sjis
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ１１`;
-CHARSET(CONVERT(`Ｃ１` USING ujis))
-ujis
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ１２`;
-CHARSET(CONVERT(`Ｃ１` USING utf8))
-utf8
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ１２`;
-CHARSET(CONVERT(`Ｃ１` USING ucs2))
-ucs2
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ１２`;
-CHARSET(CONVERT(`Ｃ１` USING sjis))
-sjis
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ１２`;
-CHARSET(CONVERT(`Ｃ１` USING ujis))
-ujis
 drop table `Ｔ１`;
 drop table `Ｔ２`;
 drop table `Ｔ３`;
@@ -225,6 +171,3 @@ drop table `Ｔ６`;
 drop table `Ｔ７`;
 drop table `Ｔ８`;
 drop table `Ｔ９`;
-drop table `Ｔ１０`;
-drop table `Ｔ１１`;
-drop table `Ｔ１２`;

mysql-test/suite/jp/r/jp_create_db_sjis.result

@@ -8,11 +8,12 @@ CREATE DATABASE `
 CREATE DATABASE `ソ十表`;
 SHOW DATABASES;
 Database
-mysql
-test
+information_schema
 ソ十表
 日本語
 ﾆﾎﾝｺﾞ
+mysql
+test
 USE `ﾆﾎﾝｺﾞ`;
 USE `日本語`;
 USE `ソ十表`;

mysql-test/suite/jp/r/jp_create_db_ucs2.result

@@ -9,11 +9,12 @@ CREATE DATABASE `
 CREATE DATABASE `龔龖龗`;
 SHOW DATABASES;
 Database
-mysql
-test
+information_schema
 日本語
 龔龖龗
 ﾆﾎﾝｺﾞ
+mysql
+test
 USE `ﾆﾎﾝｺﾞ`;
 USE `日本語`;
 USE `龔龖龗`;

mysql-test/suite/jp/r/jp_create_db_ujis.result

@@ -8,11 +8,12 @@ CREATE DATABASE `
 CREATE DATABASE `龔龖龗`;
 SHOW DATABASES;
 Database
-mysql
-test
+information_schema
 日本語
 龔龖龗
 ﾆﾎﾝｺﾞ
+mysql
+test
 USE `ﾆﾎﾝｺﾞ`;
 USE `日本語`;
 USE `龔龖龗`;

mysql-test/suite/jp/r/jp_create_db_utf8.result

@@ -8,11 +8,12 @@ CREATE DATABASE `日本語`;
 CREATE DATABASE `龔龖龗`;
 SHOW DATABASES;
 Database
-mysql
-test
+information_schema
 日本語
 龔龖龗
 ﾆﾎﾝｺﾞ
+mysql
+test
 USE `ﾆﾎﾝｺﾞ`;
 USE `日本語`;
 USE `龔龖龗`;