diff options
| author | unknown <pcrews@pcrews-mac-local.local> | 2008-05-15 19:31:15 -0400 |
|---|---|---|
| committer | unknown <pcrews@pcrews-mac-local.local> | 2008-05-15 19:31:15 -0400 |
| commit | 8eaa55fb514f99e14caaa9f92372d6e33ea0008a (patch) | |
| tree | 7c7bb461e2da5022ba5127f113ced77ceb9ff3b9 | |
| parent | 341f9ab2e3ab847cc185f8c189caaabf39d3fe36 (diff) | |
| parent | 19e1bc76046a8bfd4f4ec8e94ffafc0bb01178bc (diff) | |
| download | mariadb-git-8eaa55fb514f99e14caaa9f92372d6e33ea0008a.tar.gz | |
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
228 files changed, 3182 insertions, 18951 deletions
diff --git a/mysql-test/extra/rpl_tests/rpl_insert_id.test b/mysql-test/extra/rpl_tests/rpl_insert_id.test index 8ee98e0bc76..0cc0a343304 100644 --- a/mysql-test/extra/rpl_tests/rpl_insert_id.test +++ b/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; diff --git a/mysql-test/suite/jp/include/trim_sjis.inc b/mysql-test/suite/jp/include/trim_sjis.inc new file mode 100644 index 00000000000..fee31a515a7 --- /dev/null +++ b/mysql-test/suite/jp/include/trim_sjis.inc @@ -0,0 +1,70 @@ +# +# 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 `sP`; +DROP TABLE IF EXISTS `sQ`; +DROP TABLE IF EXISTS `sR`; +--enable_warnings +--replace_result $engine <engine_to_be_tested> +eval CREATE TABLE `sP` (`bP` CHAR(12), INDEX(`bP`)) DEFAULT CHARSET = sjis ENGINE = $engine; +--replace_result $engine <engine_to_be_tested> +eval CREATE TABLE `sQ` (`bP` CHAR(12), INDEX(`bP`)) DEFAULT CHARSET = sjis ENGINE = $engine; +--replace_result $engine <engine_to_be_tested> +eval CREATE TABLE `sR` (`bP` CHAR(12), INDEX(`bP`)) DEFAULT CHARSET = sjis ENGINE = $engine; + +# Nothing to trim +INSERT INTO `sP` VALUES (''); +# Test data for TRIM(TRAILING [remstr] FROM str) +INSERT INTO `sP` VALUES (''); +INSERT INTO `sP` VALUES (''); +INSERT INTO `sP` VALUES (''); +# Test data for TRIM(LEADING [remstr] FROM str) +INSERT INTO `sP` VALUES (''); +INSERT INTO `sP` VALUES (''); +INSERT INTO `sP` VALUES (''); +# Test data for TRIM(BOTH [remstr] FROM str) +INSERT INTO `sP` VALUES (''); +# Test data for TRIM without [remstr] (remove spaces) +INSERT INTO `sP` VALUES (' '); +INSERT INTO `sQ` VALUES (''); +INSERT INTO `sQ` VALUES (''); +INSERT INTO `sQ` VALUES (''); +INSERT INTO `sQ` VALUES (''); +INSERT INTO `sQ` VALUES (''); +INSERT INTO `sQ` VALUES (''); +INSERT INTO `sQ` VALUES (''); +INSERT INTO `sQ` VALUES (''); +INSERT INTO `sQ` VALUES (' '); +INSERT INTO `sR` VALUES ('\\\\\'); +INSERT INTO `sR` VALUES ('\\\\\\'); +INSERT INTO `sR` VALUES ('\\\\\\\'); +INSERT INTO `sR` VALUES ('\\\\\\\\'); +INSERT INTO `sR` VALUES ('\\\\\\'); +INSERT INTO `sR` VALUES ('\\\\\\\'); +INSERT INTO `sR` VALUES ('\\\\\\\\'); +INSERT INTO `sR` VALUES ('\\\\\\\\\\\'); +INSERT INTO `sR` VALUES (' \\\\\ '); + +SELECT `bP`,TRIM(TRAILING '' FROM `bP`) FROM `sP`; +SELECT `bP`,TRIM(LEADING '' FROM `bP`) FROM `sP`; +SELECT `bP`,TRIM(BOTH '' FROM `bP`) FROM `sP`; +SELECT `bP`,TRIM(`bP`) FROM `sP`; +SELECT `bP`,TRIM(TRAILING '' FROM `bP`) FROM `sQ`; +SELECT `bP`,TRIM(LEADING '' FROM `bP`) FROM `sQ`; +SELECT `bP`,TRIM(BOTH '' FROM `bP`) FROM `sQ`; +SELECT `bP`,TRIM(`bP`) FROM `sQ`; +SELECT `bP`,TRIM(TRAILING '\' FROM `bP`) FROM `sR`; +SELECT `bP`,TRIM(LEADING '\' FROM `bP`) FROM `sR`; +SELECT `bP`,TRIM(BOTH '\' FROM `bP`) FROM `sR`; +SELECT `bP`,TRIM(`bP`) FROM `sR`; + +DROP TABLE `sP`; +DROP TABLE `sQ`; +DROP TABLE `sR`; diff --git a/mysql-test/suite/jp/r/jp_alter_sjis.result b/mysql-test/suite/jp/r/jp_alter_sjis.result index f970508229a..85d974df78e 100644 --- a/mysql-test/suite/jp/r/jp_alter_sjis.result +++ b/mysql-test/suite/jp/r/jp_alter_sjis.result @@ -31,17 +31,17 @@ NULL NULL NULL DESC ``; Field Type Null Key Default Extra char(1) YES MUL NULL - char(6) PRI - char(1) YES MUL NULL + char(6) NO PRI + char(1) YES UNI NULL char(1) YES NULL SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL, - `` char(6) NOT NULL default '', - `` char(1) default NULL, - `` char(1) default NULL, - PRIMARY KEY (``), + `` char(1) DEFAULT NULL, + `` char(6) NOT NULL DEFAULT '', + `` char(1) DEFAULT NULL, + `` char(1) DEFAULT NULL, + PRIMARY KEY (``), UNIQUE KEY `` (``), KEY `` (``) ) ENGINE=InnoDB DEFAULT CHARSET=sjis @@ -58,11 +58,11 @@ SELECT * FROM ``; DESC ``; Field Type Null Key Default Extra - char(6) + char(6) NO SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(6) NOT NULL default '' + `` char(6) NOT NULL DEFAULT '' ) ENGINE=InnoDB DEFAULT CHARSET=sjis ALTER TABLE `` ADD `` char(1) FIRST; ALTER TABLE `` ADD `` char(1) AFTER ``; @@ -80,17 +80,17 @@ NULL NULL NULL DESC ``; Field Type Null Key Default Extra char(1) YES MUL NULL - char(6) PRI - char(1) YES MUL NULL + char(6) NO PRI + char(1) YES UNI NULL char(1) YES NULL SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL, - `` char(6) NOT NULL default '', - `` char(1) default NULL, - `` char(1) default NULL, - PRIMARY KEY (``), + `` char(1) DEFAULT NULL, + `` char(6) NOT NULL DEFAULT '', + `` char(1) DEFAULT NULL, + `` char(1) DEFAULT NULL, + PRIMARY KEY (``), UNIQUE KEY `` (``), KEY `` (``) ) ENGINE=InnoDB DEFAULT CHARSET=sjis @@ -107,11 +107,11 @@ SELECT * FROM ``; DESC ``; Field Type Null Key Default Extra - char(6) + char(6) NO SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(6) NOT NULL default '' + `` char(6) NOT NULL DEFAULT '' ) ENGINE=InnoDB DEFAULT CHARSET=sjis ALTER TABLE `\\\` ADD `\\\` char(1) FIRST; ALTER TABLE `\\\` ADD `\\\` char(1) AFTER `\\\`; @@ -129,17 +129,17 @@ NULL \\\\\ NULL NULL DESC `\\\`; Field Type Null Key Default Extra \\ char(1) YES MUL NULL -\\\ char(6) PRI -\\\ char(1) YES MUL NULL +\\\ char(6) NO PRI +\\\ char(1) YES UNI NULL \\\ char(1) YES NULL SHOW CREATE TABLE `\\\`; Table Create Table \\\ CREATE TABLE `\\\` ( - `\\` char(1) default NULL, - `\\\` char(6) NOT NULL default '', - `\\\` char(1) default NULL, - `\\\` char(1) default NULL, - PRIMARY KEY (`\\\`), + `\\` char(1) DEFAULT NULL, + `\\\` char(6) NOT NULL DEFAULT '', + `\\\` char(1) DEFAULT NULL, + `\\\` char(1) DEFAULT NULL, + PRIMARY KEY (`\\\`), UNIQUE KEY `\\\` (`\\\`), KEY `\\\` (`\\`) ) ENGINE=InnoDB DEFAULT CHARSET=sjis @@ -156,11 +156,11 @@ SELECT * FROM `\\\`; \\\\\ DESC `\\\`; Field Type Null Key Default Extra -\\\ char(6) +\\\ char(6) NO SHOW CREATE TABLE `\\\`; Table Create Table \\\ CREATE TABLE `\\\` ( - `\\\` char(6) NOT NULL default '' + `\\\` char(6) NOT NULL DEFAULT '' ) ENGINE=InnoDB DEFAULT CHARSET=sjis DROP TABLE ``; DROP TABLE ``; @@ -193,17 +193,17 @@ NULL NULL NULL DESC ``; Field Type Null Key Default Extra char(1) YES MUL NULL - char(6) PRI - char(1) YES MUL NULL + char(6) NO PRI + char(1) YES UNI NULL char(1) YES NULL SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL, - `` char(6) NOT NULL default '', - `` char(1) default NULL, - `` char(1) default NULL, - PRIMARY KEY (``), + `` char(1) DEFAULT NULL, + `` char(6) NOT NULL DEFAULT '', + `` char(1) DEFAULT NULL, + `` char(1) DEFAULT NULL, + PRIMARY KEY (``), UNIQUE KEY `` (``), KEY `` (``) ) ENGINE=MyISAM DEFAULT CHARSET=sjis @@ -220,11 +220,11 @@ SELECT * FROM ``; DESC ``; Field Type Null Key Default Extra - char(6) + char(6) NO SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(6) NOT NULL default '' + `` char(6) NOT NULL DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=sjis ALTER TABLE `` ADD `` char(1) FIRST; ALTER TABLE `` ADD `` char(1) AFTER ``; @@ -242,17 +242,17 @@ NULL NULL NULL DESC ``; Field Type Null Key Default Extra char(1) YES MUL NULL - char(6) PRI - char(1) YES MUL NULL + char(6) NO PRI + char(1) YES UNI NULL char(1) YES NULL SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL, - `` char(6) NOT NULL default '', - `` char(1) default NULL, - `` char(1) default NULL, - PRIMARY KEY (``), + `` char(1) DEFAULT NULL, + `` char(6) NOT NULL DEFAULT '', + `` char(1) DEFAULT NULL, + `` char(1) DEFAULT NULL, + PRIMARY KEY (``), UNIQUE KEY `` (``), KEY `` (``) ) ENGINE=MyISAM DEFAULT CHARSET=sjis @@ -269,11 +269,11 @@ SELECT * FROM ``; DESC ``; Field Type Null Key Default Extra - char(6) + char(6) NO SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(6) NOT NULL default '' + `` char(6) NOT NULL DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=sjis ALTER TABLE `\\\` ADD `\\\` char(1) FIRST; ALTER TABLE `\\\` ADD `\\\` char(1) AFTER `\\\`; @@ -291,17 +291,17 @@ NULL \\\\\ NULL NULL DESC `\\\`; Field Type Null Key Default Extra \\ char(1) YES MUL NULL -\\\ char(6) PRI -\\\ char(1) YES MUL NULL +\\\ char(6) NO PRI +\\\ char(1) YES UNI NULL \\\ char(1) YES NULL SHOW CREATE TABLE `\\\`; Table Create Table \\\ CREATE TABLE `\\\` ( - `\\` char(1) default NULL, - `\\\` char(6) NOT NULL default '', - `\\\` char(1) default NULL, - `\\\` char(1) default NULL, - PRIMARY KEY (`\\\`), + `\\` char(1) DEFAULT NULL, + `\\\` char(6) NOT NULL DEFAULT '', + `\\\` char(1) DEFAULT NULL, + `\\\` char(1) DEFAULT NULL, + PRIMARY KEY (`\\\`), UNIQUE KEY `\\\` (`\\\`), KEY `\\\` (`\\`) ) ENGINE=MyISAM DEFAULT CHARSET=sjis @@ -318,11 +318,11 @@ SELECT * FROM `\\\`; \\\\\ DESC `\\\`; Field Type Null Key Default Extra -\\\ char(6) +\\\ char(6) NO SHOW CREATE TABLE `\\\`; Table Create Table \\\ CREATE TABLE `\\\` ( - `\\\` char(6) NOT NULL default '' + `\\\` char(6) NOT NULL DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=sjis DROP TABLE ``; DROP TABLE ``; @@ -330,12 +330,12 @@ DROP TABLE ``; DROP TABLE ``; DROP TABLE `\\\`; DROP TABLE `\\\`; -CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = sjis engine=HEAP; -CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = sjis engine=HEAP; -CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = sjis engine=HEAP; -CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = sjis engine=HEAP; -CREATE TABLE `\\\`(`\\\` char(5)) DEFAULT CHARSET = sjis engine=HEAP; -CREATE TABLE `\\\`(`\\\` char(5)) DEFAULT CHARSET = sjis engine=HEAP; +CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = sjis engine=MEMORY; +CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = sjis engine=MEMORY; +CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = sjis engine=MEMORY; +CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = sjis engine=MEMORY; +CREATE TABLE `\\\`(`\\\` char(5)) DEFAULT CHARSET = sjis engine=MEMORY; +CREATE TABLE `\\\`(`\\\` char(5)) DEFAULT CHARSET = sjis engine=MEMORY; INSERT INTO `` VALUES (''),(''),(''); INSERT INTO `` VALUES (''),(''),(''); INSERT INTO `\\\` VALUES ('\\\\\'),('\\\\\'),('\\\\\'); @@ -355,20 +355,20 @@ NULL NULL NULL DESC ``; Field Type Null Key Default Extra char(1) YES MUL NULL - char(6) PRI - char(1) YES MUL NULL + char(6) NO PRI + char(1) YES UNI NULL char(1) YES NULL SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL, - `` char(6) NOT NULL default '', - `` char(1) default NULL, - `` char(1) default NULL, - PRIMARY KEY (``), + `` char(1) DEFAULT NULL, + `` char(6) NOT NULL DEFAULT '', + `` char(1) DEFAULT NULL, + `` char(1) DEFAULT NULL, + PRIMARY KEY (``), UNIQUE KEY `` (``), KEY `` (``) -) ENGINE=HEAP DEFAULT CHARSET=sjis +) ENGINE=MEMORY DEFAULT CHARSET=sjis ALTER TABLE `` DROP INDEX ``; ALTER TABLE `` DROP PRIMARY KEY; ALTER TABLE `` DROP INDEX ``; @@ -382,12 +382,12 @@ SELECT * FROM ``; DESC ``; Field Type Null Key Default Extra - char(6) + char(6) NO SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(6) NOT NULL default '' -) ENGINE=HEAP DEFAULT CHARSET=sjis + `` char(6) NOT NULL DEFAULT '' +) ENGINE=MEMORY DEFAULT CHARSET=sjis ALTER TABLE `` ADD `` char(1) FIRST; ALTER TABLE `` ADD `` char(1) AFTER ``; ALTER TABLE `` ADD `` char(1); @@ -404,20 +404,20 @@ NULL NULL NULL DESC ``; Field Type Null Key Default Extra char(1) YES MUL NULL - char(6) PRI - char(1) YES MUL NULL + char(6) NO PRI + char(1) YES UNI NULL char(1) YES NULL SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL, - `` char(6) NOT NULL default '', - `` char(1) default NULL, - `` char(1) default NULL, - PRIMARY KEY (``), + `` char(1) DEFAULT NULL, + `` char(6) NOT NULL DEFAULT '', + `` char(1) DEFAULT NULL, + `` char(1) DEFAULT NULL, + PRIMARY KEY (``), UNIQUE KEY `` (``), KEY `` (``) -) ENGINE=HEAP DEFAULT CHARSET=sjis +) ENGINE=MEMORY DEFAULT CHARSET=sjis ALTER TABLE `` DROP INDEX ``; ALTER TABLE `` DROP PRIMARY KEY; ALTER TABLE `` DROP INDEX ``; @@ -431,12 +431,12 @@ SELECT * FROM ``; DESC ``; Field Type Null Key Default Extra - char(6) + char(6) NO SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(6) NOT NULL default '' -) ENGINE=HEAP DEFAULT CHARSET=sjis + `` char(6) NOT NULL DEFAULT '' +) ENGINE=MEMORY DEFAULT CHARSET=sjis ALTER TABLE `\\\` ADD `\\\` char(1) FIRST; ALTER TABLE `\\\` ADD `\\\` char(1) AFTER `\\\`; ALTER TABLE `\\\` ADD `\\\` char(1); @@ -453,20 +453,20 @@ NULL \\\\\ NULL NULL DESC `\\\`; Field Type Null Key Default Extra \\ char(1) YES MUL NULL -\\\ char(6) PRI -\\\ char(1) YES MUL NULL +\\\ char(6) NO PRI +\\\ char(1) YES UNI NULL \\\ char(1) YES NULL SHOW CREATE TABLE `\\\`; Table Create Table \\\ CREATE TABLE `\\\` ( - `\\` char(1) default NULL, - `\\\` char(6) NOT NULL default '', - `\\\` char(1) default NULL, - `\\\` char(1) default NULL, - PRIMARY KEY (`\\\`), + `\\` char(1) DEFAULT NULL, + `\\\` char(6) NOT NULL DEFAULT '', + `\\\` char(1) DEFAULT NULL, + `\\\` char(1) DEFAULT NULL, + PRIMARY KEY (`\\\`), UNIQUE KEY `\\\` (`\\\`), KEY `\\\` (`\\`) -) ENGINE=HEAP DEFAULT CHARSET=sjis +) ENGINE=MEMORY DEFAULT CHARSET=sjis ALTER TABLE `\\\` DROP INDEX `\\\`; ALTER TABLE `\\\` DROP PRIMARY KEY; ALTER TABLE `\\\` DROP INDEX `\\\`; @@ -480,165 +480,12 @@ SELECT * FROM `\\\`; \\\\\ DESC `\\\`; Field Type Null Key Default Extra -\\\ char(6) +\\\ char(6) NO SHOW CREATE TABLE `\\\`; Table Create Table \\\ CREATE TABLE `\\\` ( - `\\\` char(6) NOT NULL default '' -) ENGINE=HEAP DEFAULT CHARSET=sjis -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE `\\\`; -DROP TABLE `\\\`; -CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = sjis engine=BDB; -CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = sjis engine=BDB; -CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = sjis engine=BDB; -CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = sjis engine=BDB; -CREATE TABLE `\\\`(`\\\` char(5)) DEFAULT CHARSET = sjis engine=BDB; -CREATE TABLE `\\\`(`\\\` char(5)) DEFAULT CHARSET = sjis engine=BDB; -INSERT INTO `` VALUES (''),(''),(''); -INSERT INTO `` VALUES (''),(''),(''); -INSERT INTO `\\\` VALUES ('\\\\\'),('\\\\\'),('\\\\\'); -ALTER TABLE `` ADD `` char(1) FIRST; -ALTER TABLE `` ADD `` char(1) AFTER ``; -ALTER TABLE `` ADD `` char(1); -ALTER TABLE `` ADD INDEX (``); -ALTER TABLE `` ADD PRIMARY KEY (``); -ALTER TABLE `` CHANGE `` `` char(1); -ALTER TABLE `` MODIFY `` char(6); -SELECT * FROM ``; - -NULL NULL NULL -NULL NULL NULL -NULL NULL NULL -DESC ``; -Field Type Null Key Default Extra - char(1) YES MUL NULL - char(6) PRI - char(1) YES NULL - char(1) YES NULL -SHOW CREATE TABLE ``; -Table Create Table - CREATE TABLE `` ( - `` char(1) default NULL, - `` char(6) NOT NULL default '', - `` char(1) default NULL, - `` char(1) default NULL, - PRIMARY KEY (``), - KEY `` (``) -) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis -ALTER TABLE `` DROP INDEX ``; -ALTER TABLE `` DROP PRIMARY KEY; -ALTER TABLE `` DROP ``; -ALTER TABLE `` DROP ``; -ALTER TABLE `` DROP ``; -SELECT * FROM ``; - - - - -DESC ``; -Field Type Null Key Default Extra - char(6) -SHOW CREATE TABLE ``; -Table Create Table - CREATE TABLE `` ( - `` char(6) NOT NULL default '' -) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis -ALTER TABLE `` ADD `` char(1) FIRST; -ALTER TABLE `` ADD `` char(1) AFTER ``; -ALTER TABLE `` ADD `` char(1); -ALTER TABLE `` ADD INDEX (``); -ALTER TABLE `` ADD PRIMARY KEY (``); -ALTER TABLE `` CHANGE `` `` char(1); -ALTER TABLE `` MODIFY `` char(6); -SELECT * FROM ``; - -NULL NULL NULL -NULL NULL NULL -NULL NULL NULL -DESC ``; -Field Type Null Key Default Extra - char(1) YES MUL NULL - char(6) PRI - char(1) YES NULL - char(1) YES NULL -SHOW CREATE TABLE ``; -Table Create Table - CREATE TABLE `` ( - `` char(1) default NULL, - `` char(6) NOT NULL default '', - `` char(1) default NULL, - `` char(1) default NULL, - PRIMARY KEY (``), - KEY `` (``) -) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis -ALTER TABLE `` DROP INDEX ``; -ALTER TABLE `` DROP PRIMARY KEY; -ALTER TABLE `` DROP ``; -ALTER TABLE `` DROP ``; -ALTER TABLE `` DROP ``; -SELECT * FROM ``; - - - - -DESC ``; -Field Type Null Key Default Extra - char(6) -SHOW CREATE TABLE ``; -Table Create Table - CREATE TABLE `` ( - `` char(6) NOT NULL default '' -) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis -ALTER TABLE `\\\` ADD `\\\` char(1) FIRST; -ALTER TABLE `\\\` ADD `\\\` char(1) AFTER `\\\`; -ALTER TABLE `\\\` ADD `\\\` char(1); -ALTER TABLE `\\\` ADD INDEX (`\\\`); -ALTER TABLE `\\\` ADD PRIMARY KEY (`\\\`); -ALTER TABLE `\\\` CHANGE `\\\` `\\` char(1); -ALTER TABLE `\\\` MODIFY `\\\` char(6); -SELECT * FROM `\\\`; -\\ \\\ \\\ \\\ -NULL \\\\\ NULL NULL -NULL \\\\\ NULL NULL -NULL \\\\\ NULL NULL -DESC `\\\`; -Field Type Null Key Default Extra -\\ char(1) YES MUL NULL -\\\ char(6) PRI -\\\ char(1) YES NULL -\\\ char(1) YES NULL -SHOW CREATE TABLE `\\\`; -Table Create Table -\\\ CREATE TABLE `\\\` ( - `\\` char(1) default NULL, - `\\\` char(6) NOT NULL default '', - `\\\` char(1) default NULL, - `\\\` char(1) default NULL, - PRIMARY KEY (`\\\`), - KEY `\\\` (`\\`) -) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis -ALTER TABLE `\\\` DROP INDEX `\\\`; -ALTER TABLE `\\\` DROP PRIMARY KEY; -ALTER TABLE `\\\` DROP `\\`; -ALTER TABLE `\\\` DROP `\\\`; -ALTER TABLE `\\\` DROP `\\\`; -SELECT * FROM `\\\`; -\\\ -\\\\\ -\\\\\ -\\\\\ -DESC `\\\`; -Field Type Null Key Default Extra -\\\ char(6) -SHOW CREATE TABLE `\\\`; -Table Create Table -\\\ CREATE TABLE `\\\` ( - `\\\` char(6) NOT NULL default '' -) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis + `\\\` char(6) NOT NULL DEFAULT '' +) ENGINE=MEMORY DEFAULT CHARSET=sjis DROP TABLE ``; DROP TABLE ``; DROP TABLE ``; diff --git a/mysql-test/suite/jp/r/jp_alter_ucs2.result b/mysql-test/suite/jp/r/jp_alter_ucs2.result index 2756e5a758d..7cbd8859ac1 100644 --- a/mysql-test/suite/jp/r/jp_alter_ucs2.result +++ b/mysql-test/suite/jp/r/jp_alter_ucs2.result @@ -32,17 +32,17 @@ NULL NULL NULL DESC ``; Field Type Null Key Default Extra char(1) YES MUL NULL - char(6) PRI - char(1) YES MUL NULL + char(6) NO PRI + char(1) YES UNI NULL char(1) YES NULL SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL, - `` char(6) NOT NULL default '', - `` char(1) default NULL, - `` char(1) default NULL, - PRIMARY KEY (``), + `` char(1) DEFAULT NULL, + `` char(6) NOT NULL DEFAULT '', + `` char(1) DEFAULT NULL, + `` char(1) DEFAULT NULL, + PRIMARY KEY (``), UNIQUE KEY `` (``), KEY `` (``) ) ENGINE=InnoDB DEFAULT CHARSET=ucs2 @@ -59,11 +59,11 @@ SELECT * FROM ``; DESC ``; Field Type Null Key Default Extra - char(6) + char(6) NO SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(6) NOT NULL default '' + `` char(6) NOT NULL DEFAULT '' ) ENGINE=InnoDB DEFAULT CHARSET=ucs2 ALTER TABLE `` ADD `` char(1) FIRST; ALTER TABLE `` ADD `` char(1) AFTER ``; @@ -81,17 +81,17 @@ NULL NULL NULL DESC ``; Field Type Null Key Default Extra char(1) YES MUL NULL - char(6) PRI - char(1) YES MUL NULL + char(6) NO PRI + char(1) YES UNI NULL char(1) YES NULL SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL, - `` char(6) NOT NULL default '', - `` char(1) default NULL, - `` char(1) default NULL, - PRIMARY KEY (``), + `` char(1) DEFAULT NULL, + `` char(6) NOT NULL DEFAULT '', + `` char(1) DEFAULT NULL, + `` char(1) DEFAULT NULL, + PRIMARY KEY (``), UNIQUE KEY `` (``), KEY `` (``) ) ENGINE=InnoDB DEFAULT CHARSET=ucs2 @@ -108,11 +108,11 @@ SELECT * FROM ``; DESC ``; Field Type Null Key Default Extra - char(6) + char(6) NO SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(6) NOT NULL default '' + `` char(6) NOT NULL DEFAULT '' ) ENGINE=InnoDB DEFAULT CHARSET=ucs2 ALTER TABLE `ݏݏ` ADD `` char(1) FIRST; ALTER TABLE `ݏݏ` ADD `` char(1) AFTER ``; @@ -130,17 +130,17 @@ NULL NULL NULL DESC `ݏݏ`; Field Type Null Key Default Extra char(1) YES MUL NULL - char(6) PRI - char(1) YES MUL NULL + char(6) NO PRI + char(1) YES UNI NULL char(1) YES NULL SHOW CREATE TABLE `ݏݏ`; Table Create Table ݏݏ CREATE TABLE `ݏݏ` ( - `` char(1) default NULL, - `` char(6) NOT NULL default '', - `` char(1) default NULL, - `` char(1) default NULL, - PRIMARY KEY (``), + `` char(1) DEFAULT NULL, + `` char(6) NOT NULL DEFAULT '', + `` char(1) DEFAULT NULL, + `` char(1) DEFAULT NULL, + PRIMARY KEY (``), UNIQUE KEY `` (``), KEY `` (``) ) ENGINE=InnoDB DEFAULT CHARSET=ucs2 @@ -157,11 +157,11 @@ SELECT * FROM `ݏݏ`; DESC `ݏݏ`; Field Type Null Key Default Extra - char(6) + char(6) NO SHOW CREATE TABLE `ݏݏ`; Table Create Table ݏݏ CREATE TABLE `ݏݏ` ( - `` char(6) NOT NULL default '' + `` char(6) NOT NULL DEFAULT '' ) ENGINE=InnoDB DEFAULT CHARSET=ucs2 DROP TABLE ``; DROP TABLE ``; @@ -194,17 +194,17 @@ NULL NULL NULL DESC ``; Field Type Null Key Default Extra char(1) YES MUL NULL - char(6) PRI - char(1) YES MUL NULL + char(6) NO PRI + char(1) YES UNI NULL char(1) YES NULL SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL, - `` char(6) NOT NULL default '', - `` char(1) default NULL, - `` char(1) default NULL, - PRIMARY KEY (``), + `` char(1) DEFAULT NULL, + `` char(6) NOT NULL DEFAULT '', + `` char(1) DEFAULT NULL, + `` char(1) DEFAULT NULL, + PRIMARY KEY (``), UNIQUE KEY `` (``), KEY `` (``) ) ENGINE=MyISAM DEFAULT CHARSET=ucs2 @@ -221,11 +221,11 @@ SELECT * FROM ``; DESC ``; Field Type Null Key Default Extra - char(6) + char(6) NO SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(6) NOT NULL default '' + `` char(6) NOT NULL DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=ucs2 ALTER TABLE `` ADD `` char(1) FIRST; ALTER TABLE `` ADD `` char(1) AFTER ``; @@ -243,17 +243,17 @@ NULL NULL NULL DESC ``; Field Type Null Key Default Extra char(1) YES MUL NULL - char(6) PRI - char(1) YES MUL NULL + char(6) NO PRI + char(1) YES UNI NULL char(1) YES NULL SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL, - `` char(6) NOT NULL default '', - `` char(1) default NULL, - `` char(1) default NULL, - PRIMARY KEY (``), + `` char(1) DEFAULT NULL, + `` char(6) NOT NULL DEFAULT '', + `` char(1) DEFAULT NULL, + `` char(1) DEFAULT NULL, + PRIMARY KEY (``), UNIQUE KEY `` (``), KEY `` (``) ) ENGINE=MyISAM DEFAULT CHARSET=ucs2 @@ -270,11 +270,11 @@ SELECT * FROM ``; DESC ``; Field Type Null Key Default Extra - char(6) + char(6) NO SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(6) NOT NULL default '' + `` char(6) NOT NULL DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=ucs2 ALTER TABLE `ݏݏ` ADD `` char(1) FIRST; ALTER TABLE `ݏݏ` ADD `` char(1) AFTER ``; @@ -292,17 +292,17 @@ NULL NULL NULL DESC `ݏݏ`; Field Type Null Key Default Extra char(1) YES MUL NULL - char(6) PRI - char(1) YES MUL NULL + char(6) NO PRI + char(1) YES UNI NULL char(1) YES NULL SHOW CREATE TABLE `ݏݏ`; Table Create Table ݏݏ CREATE TABLE `ݏݏ` ( - `` char(1) default NULL, - `` char(6) NOT NULL default '', - `` char(1) default NULL, - `` char(1) default NULL, - PRIMARY KEY (``), + `` char(1) DEFAULT NULL, + `` char(6) NOT NULL DEFAULT '', + `` char(1) DEFAULT NULL, + `` char(1) DEFAULT NULL, + PRIMARY KEY (``), UNIQUE KEY `` (``), KEY `` (``) ) ENGINE=MyISAM DEFAULT CHARSET=ucs2 @@ -319,11 +319,11 @@ SELECT * FROM `ݏݏ`; DESC `ݏݏ`; Field Type Null Key Default Extra - char(6) + char(6) NO SHOW CREATE TABLE `ݏݏ`; Table Create Table ݏݏ CREATE TABLE `ݏݏ` ( - `` char(6) NOT NULL default '' + `` char(6) NOT NULL DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=ucs2 DROP TABLE ``; DROP TABLE ``; @@ -331,12 +331,12 @@ DROP TABLE ``; DROP TABLE ``; DROP TABLE `ݏݏ`; DROP TABLE `ޏޏ`; -CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = ucs2 engine=HEAP; -CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = ucs2 engine=HEAP; -CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = ucs2 engine=HEAP; -CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = ucs2 engine=HEAP; -CREATE TABLE `ݏݏ`(`` char(5)) DEFAULT CHARSET = ucs2 engine=HEAP; -CREATE TABLE `ޏޏ`(`` char(5)) DEFAULT CHARSET = ucs2 engine=HEAP; +CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = ucs2 engine=MEMORY; +CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = ucs2 engine=MEMORY; +CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = ucs2 engine=MEMORY; +CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = ucs2 engine=MEMORY; +CREATE TABLE `ݏݏ`(`` char(5)) DEFAULT CHARSET = ucs2 engine=MEMORY; +CREATE TABLE `ޏޏ`(`` char(5)) DEFAULT CHARSET = ucs2 engine=MEMORY; INSERT INTO `` VALUES (''),(''),(''); INSERT INTO `` VALUES (''),(''),(''); INSERT INTO `ݏݏ` VALUES (''),(''),(''); @@ -356,20 +356,20 @@ NULL NULL NULL DESC ``; Field Type Null Key Default Extra char(1) YES MUL NULL - char(6) PRI - char(1) YES MUL NULL + char(6) NO PRI + char(1) YES UNI NULL char(1) YES NULL SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL, - `` char(6) NOT NULL default '', - `` char(1) default NULL, - `` char(1) default NULL, - PRIMARY KEY (``), + `` char(1) DEFAULT NULL, + `` char(6) NOT NULL DEFAULT '', + `` char(1) DEFAULT NULL, + `` char(1) DEFAULT NULL, + PRIMARY KEY (``), UNIQUE KEY `` (``), KEY `` (``) -) ENGINE=HEAP DEFAULT CHARSET=ucs2 +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 ALTER TABLE `` DROP INDEX ``; ALTER TABLE `` DROP PRIMARY KEY; ALTER TABLE `` DROP INDEX ``; @@ -383,12 +383,12 @@ SELECT * FROM ``; DESC ``; Field Type Null Key Default Extra - char(6) + char(6) NO SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(6) NOT NULL default '' -) ENGINE=HEAP DEFAULT CHARSET=ucs2 + `` char(6) NOT NULL DEFAULT '' +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 ALTER TABLE `` ADD `` char(1) FIRST; ALTER TABLE `` ADD `` char(1) AFTER ``; ALTER TABLE `` ADD `` char(1); @@ -405,20 +405,20 @@ NULL NULL NULL DESC ``; Field Type Null Key Default Extra char(1) YES MUL NULL - char(6) PRI - char(1) YES MUL NULL + char(6) NO PRI + char(1) YES UNI NULL char(1) YES NULL SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL, - `` char(6) NOT NULL default '', - `` char(1) default NULL, - `` char(1) default NULL, - PRIMARY KEY (``), + `` char(1) DEFAULT NULL, + `` char(6) NOT NULL DEFAULT '', + `` char(1) DEFAULT NULL, + `` char(1) DEFAULT NULL, + PRIMARY KEY (``), UNIQUE KEY `` (``), KEY `` (``) -) ENGINE=HEAP DEFAULT CHARSET=ucs2 +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 ALTER TABLE `` DROP INDEX ``; ALTER TABLE `` DROP PRIMARY KEY; ALTER TABLE `` DROP INDEX ``; @@ -432,12 +432,12 @@ SELECT * FROM ``; DESC ``; Field Type Null Key Default Extra - char(6) + char(6) NO SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(6) NOT NULL default '' -) ENGINE=HEAP DEFAULT CHARSET=ucs2 + `` char(6) NOT NULL DEFAULT '' +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 ALTER TABLE `ݏݏ` ADD `` char(1) FIRST; ALTER TABLE `ݏݏ` ADD `` char(1) AFTER ``; ALTER TABLE `ݏݏ` ADD `` char(1); @@ -454,20 +454,20 @@ NULL NULL NULL DESC `ݏݏ`; Field Type Null Key Default Extra char(1) YES MUL NULL - char(6) PRI - char(1) YES MUL NULL + char(6) NO PRI + char(1) YES UNI NULL char(1) YES NULL SHOW CREATE TABLE `ݏݏ`; Table Create Table ݏݏ CREATE TABLE `ݏݏ` ( - `` char(1) default NULL, - `` char(6) NOT NULL default '', - `` char(1) default NULL, - `` char(1) default NULL, - PRIMARY KEY (``), + `` char(1) DEFAULT NULL, + `` char(6) NOT NULL DEFAULT '', + `` char(1) DEFAULT NULL, + `` char(1) DEFAULT NULL, + PRIMARY KEY (``), UNIQUE KEY `` (``), KEY `` (``) -) ENGINE=HEAP DEFAULT CHARSET=ucs2 +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 ALTER TABLE `ݏݏ` DROP INDEX ``; ALTER TABLE `ݏݏ` DROP PRIMARY KEY; ALTER TABLE `ݏݏ` DROP INDEX ``; @@ -481,165 +481,12 @@ SELECT * FROM `ݏݏ`; DESC `ݏݏ`; Field Type Null Key Default Extra - char(6) + char(6) NO SHOW CREATE TABLE `ݏݏ`; Table Create Table ݏݏ CREATE TABLE `ݏݏ` ( - `` char(6) NOT NULL default '' -) ENGINE=HEAP DEFAULT CHARSET=ucs2 -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE `ݏݏ`; -DROP TABLE `ޏޏ`; -CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = ucs2 engine=BDB; -CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = ucs2 engine=BDB; -CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = ucs2 engine=BDB; -CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = ucs2 engine=BDB; -CREATE TABLE `ݏݏ`(`` char(5)) DEFAULT CHARSET = ucs2 engine=BDB; -CREATE TABLE `ޏޏ`(`` char(5)) DEFAULT CHARSET = ucs2 engine=BDB; -INSERT INTO `` VALUES (''),(''),(''); -INSERT INTO `` VALUES (''),(''),(''); -INSERT INTO `ݏݏ` VALUES (''),(''),(''); -ALTER TABLE `` ADD `` char(1) FIRST; -ALTER TABLE `` ADD `` char(1) AFTER ``; -ALTER TABLE `` ADD `` char(1); -ALTER TABLE `` ADD INDEX (``); -ALTER TABLE `` ADD PRIMARY KEY (``); -ALTER TABLE `` CHANGE `` `` char(1); -ALTER TABLE `` MODIFY `` char(6); -SELECT * FROM ``; - -NULL NULL NULL -NULL NULL NULL -NULL NULL NULL -DESC ``; -Field Type Null Key Default Extra - char(1) YES MUL NULL - char(6) PRI - char(1) YES NULL - char(1) YES NULL -SHOW CREATE TABLE ``; -Table Create Table - CREATE TABLE `` ( - `` char(1) default NULL, - `` char(6) NOT NULL default '', - `` char(1) default NULL, - `` char(1) default NULL, - PRIMARY KEY (``), - KEY `` (``) -) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2 -ALTER TABLE `` DROP INDEX ``; -ALTER TABLE `` DROP PRIMARY KEY; -ALTER TABLE `` DROP ``; -ALTER TABLE `` DROP ``; -ALTER TABLE `` DROP ``; -SELECT * FROM ``; - - - - -DESC ``; -Field Type Null Key Default Extra - char(6) -SHOW CREATE TABLE ``; -Table Create Table - CREATE TABLE `` ( - `` char(6) NOT NULL default '' -) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2 -ALTER TABLE `` ADD `` char(1) FIRST; -ALTER TABLE `` ADD `` char(1) AFTER ``; -ALTER TABLE `` ADD `` char(1); -ALTER TABLE `` ADD INDEX (``); -ALTER TABLE `` ADD PRIMARY KEY (``); -ALTER TABLE `` CHANGE `` `` char(1); -ALTER TABLE `` MODIFY `` char(6); -SELECT * FROM ``; - -NULL NULL NULL -NULL NULL NULL -NULL NULL NULL -DESC ``; -Field Type Null Key Default Extra - char(1) YES MUL NULL - char(6) PRI - char(1) YES NULL - char(1) YES NULL -SHOW CREATE TABLE ``; -Table Create Table - CREATE TABLE `` ( - `` char(1) default NULL, - `` char(6) NOT NULL default '', - `` char(1) default NULL, - `` char(1) default NULL, - PRIMARY KEY (``), - KEY `` (``) -) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2 -ALTER TABLE `` DROP INDEX ``; -ALTER TABLE `` DROP PRIMARY KEY; -ALTER TABLE `` DROP ``; -ALTER TABLE `` DROP ``; -ALTER TABLE `` DROP ``; -SELECT * FROM ``; - - - - -DESC ``; -Field Type Null Key Default Extra - char(6) -SHOW CREATE TABLE ``; -Table Create Table - CREATE TABLE `` ( - `` char(6) NOT NULL default '' -) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2 -ALTER TABLE `ݏݏ` ADD `` char(1) FIRST; -ALTER TABLE `ݏݏ` ADD `` char(1) AFTER ``; -ALTER TABLE `ݏݏ` ADD `` char(1); -ALTER TABLE `ݏݏ` ADD INDEX (``); -ALTER TABLE `ݏݏ` ADD PRIMARY KEY (``); -ALTER TABLE `ݏݏ` CHANGE `` `` char(1); -ALTER TABLE `ݏݏ` MODIFY `` char(6); -SELECT * FROM `ݏݏ`; - -NULL NULL NULL -NULL NULL NULL -NULL NULL NULL -DESC `ݏݏ`; -Field Type Null Key Default Extra - char(1) YES MUL NULL - char(6) PRI - char(1) YES NULL - char(1) YES NULL -SHOW CREATE TABLE `ݏݏ`; -Table Create Table -ݏݏ CREATE TABLE `ݏݏ` ( - `` char(1) default NULL, - `` char(6) NOT NULL default '', - `` char(1) default NULL, - `` char(1) default NULL, - PRIMARY KEY (``), - KEY `` (``) -) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2 -ALTER TABLE `ݏݏ` DROP INDEX ``; -ALTER TABLE `ݏݏ` DROP PRIMARY KEY; -ALTER TABLE `ݏݏ` DROP ``; -ALTER TABLE `ݏݏ` DROP ``; -ALTER TABLE `ݏݏ` DROP ``; -SELECT * FROM `ݏݏ`; - - - - -DESC `ݏݏ`; -Field Type Null Key Default Extra - char(6) -SHOW CREATE TABLE `ݏݏ`; -Table Create Table -ݏݏ CREATE TABLE `ݏݏ` ( - `` char(6) NOT NULL default '' -) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2 + `` char(6) NOT NULL DEFAULT '' +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 DROP TABLE ``; DROP TABLE ``; DROP TABLE ``; diff --git a/mysql-test/suite/jp/r/jp_alter_ujis.result b/mysql-test/suite/jp/r/jp_alter_ujis.result index afa3c79cbce..7e4f19342f6 100644 --- a/mysql-test/suite/jp/r/jp_alter_ujis.result +++ b/mysql-test/suite/jp/r/jp_alter_ujis.result @@ -31,17 +31,17 @@ NULL NULL NULL DESC ``; Field Type Null Key Default Extra char(1) YES MUL NULL - char(6) PRI - char(1) YES MUL NULL + char(6) NO PRI + char(1) YES UNI NULL char(1) YES NULL SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL, - `` char(6) NOT NULL default '', - `` char(1) default NULL, - `` char(1) default NULL, - PRIMARY KEY (``), + `` char(1) DEFAULT NULL, + `` char(6) NOT NULL DEFAULT '', + `` char(1) DEFAULT NULL, + `` char(1) DEFAULT NULL, + PRIMARY KEY (``), UNIQUE KEY `` (``), KEY `` (``) ) ENGINE=InnoDB DEFAULT CHARSET=ujis @@ -58,11 +58,11 @@ SELECT * FROM ``; DESC ``; Field Type Null Key Default Extra - char(6) + char(6) NO SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(6) NOT NULL default '' + `` char(6) NOT NULL DEFAULT '' ) ENGINE=InnoDB DEFAULT CHARSET=ujis ALTER TABLE `` ADD `` char(1) FIRST; ALTER TABLE `` ADD `` char(1) AFTER ``; @@ -80,17 +80,17 @@ NULL NULL NULL DESC ``; Field Type Null Key Default Extra char(1) YES MUL NULL - char(6) PRI - char(1) YES MUL NULL + char(6) NO PRI + char(1) YES UNI NULL char(1) YES NULL SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL, - `` char(6) NOT NULL default '', - `` char(1) default NULL, - `` char(1) default NULL, - PRIMARY KEY (``), + `` char(1) DEFAULT NULL, + `` char(6) NOT NULL DEFAULT '', + `` char(1) DEFAULT NULL, + `` char(1) DEFAULT NULL, + PRIMARY KEY (``), UNIQUE KEY `` (``), KEY `` (``) ) ENGINE=InnoDB DEFAULT CHARSET=ujis @@ -107,11 +107,11 @@ SELECT * FROM ``; DESC ``; Field Type Null Key Default Extra - char(6) + char(6) NO SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(6) NOT NULL default '' + `` char(6) NOT NULL DEFAULT '' ) ENGINE=InnoDB DEFAULT CHARSET=ujis ALTER TABLE `ݏݏ` ADD `` char(1) FIRST; ALTER TABLE `ݏݏ` ADD `` char(1) AFTER ``; @@ -129,17 +129,17 @@ NULL NULL NULL DESC `ݏݏ`; Field Type Null Key Default Extra char(1) YES MUL NULL - char(6) PRI - char(1) YES MUL NULL + char(6) NO PRI + char(1) YES UNI NULL char(1) YES NULL SHOW CREATE TABLE `ݏݏ`; Table Create Table ݏݏ CREATE TABLE `ݏݏ` ( - `` char(1) default NULL, - `` char(6) NOT NULL default '', - `` char(1) default NULL, - `` char(1) default NULL, - PRIMARY KEY (``), + `` char(1) DEFAULT NULL, + `` char(6) NOT NULL DEFAULT '', + `` char(1) DEFAULT NULL, + `` char(1) DEFAULT NULL, + PRIMARY KEY (``), UNIQUE KEY `` (``), KEY `` (``) ) ENGINE=InnoDB DEFAULT CHARSET=ujis @@ -156,11 +156,11 @@ SELECT * FROM `ݏݏ`; DESC `ݏݏ`; Field Type Null Key Default Extra - char(6) + char(6) NO SHOW CREATE TABLE `ݏݏ`; Table Create Table ݏݏ CREATE TABLE `ݏݏ` ( - `` char(6) NOT NULL default '' + `` char(6) NOT NULL DEFAULT '' ) ENGINE=InnoDB DEFAULT CHARSET=ujis DROP TABLE ``; DROP TABLE ``; @@ -193,17 +193,17 @@ NULL NULL NULL DESC ``; Field Type Null Key Default Extra char(1) YES MUL NULL - char(6) PRI - char(1) YES MUL NULL + char(6) NO PRI + char(1) YES UNI NULL char(1) YES NULL SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL, - `` char(6) NOT NULL default '', - `` char(1) default NULL, - `` char(1) default NULL, - PRIMARY KEY (``), + `` char(1) DEFAULT NULL, + `` char(6) NOT NULL DEFAULT '', + `` char(1) DEFAULT NULL, + `` char(1) DEFAULT NULL, + PRIMARY KEY (``), UNIQUE KEY `` (``), KEY `` (``) ) ENGINE=MyISAM DEFAULT CHARSET=ujis @@ -220,11 +220,11 @@ SELECT * FROM ``; DESC ``; Field Type Null Key Default Extra - char(6) + char(6) NO SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(6) NOT NULL default '' + `` char(6) NOT NULL DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=ujis ALTER TABLE `` ADD `` char(1) FIRST; ALTER TABLE `` ADD `` char(1) AFTER ``; @@ -242,17 +242,17 @@ NULL NULL NULL DESC ``; Field Type Null Key Default Extra char(1) YES MUL NULL - char(6) PRI - char(1) YES MUL NULL + char(6) NO PRI + char(1) YES UNI NULL char(1) YES NULL SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL, - `` char(6) NOT NULL default '', - `` char(1) default NULL, - `` char(1) default NULL, - PRIMARY KEY (``), + `` char(1) DEFAULT NULL, + `` char(6) NOT NULL DEFAULT '', + `` char(1) DEFAULT NULL, + `` char(1) DEFAULT NULL, + PRIMARY KEY (``), UNIQUE KEY `` (``), KEY `` (``) ) ENGINE=MyISAM DEFAULT CHARSET=ujis @@ -269,11 +269,11 @@ SELECT * FROM ``; DESC ``; Field Type Null Key Default Extra - char(6) + char(6) NO SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(6) NOT NULL default '' + `` char(6) NOT NULL DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=ujis ALTER TABLE `ݏݏ` ADD `` char(1) FIRST; ALTER TABLE `ݏݏ` ADD `` char(1) AFTER ``; @@ -291,17 +291,17 @@ NULL NULL NULL DESC `ݏݏ`; Field Type Null Key Default Extra char(1) YES MUL NULL - char(6) PRI - char(1) YES MUL NULL + char(6) NO PRI + char(1) YES UNI NULL char(1) YES NULL SHOW CREATE TABLE `ݏݏ`; Table Create Table ݏݏ CREATE TABLE `ݏݏ` ( - `` char(1) default NULL, - `` char(6) NOT NULL default '', - `` char(1) default NULL, - `` char(1) default NULL, - PRIMARY KEY (``), + `` char(1) DEFAULT NULL, + `` char(6) NOT NULL DEFAULT '', + `` char(1) DEFAULT NULL, + `` char(1) DEFAULT NULL, + PRIMARY KEY (``), UNIQUE KEY `` (``), KEY `` (``) ) ENGINE=MyISAM DEFAULT CHARSET=ujis @@ -318,11 +318,11 @@ SELECT * FROM `ݏݏ`; DESC `ݏݏ`; Field Type Null Key Default Extra - char(6) + char(6) NO SHOW CREATE TABLE `ݏݏ`; Table Create Table ݏݏ CREATE TABLE `ݏݏ` ( - `` char(6) NOT NULL default '' + `` char(6) NOT NULL DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=ujis DROP TABLE ``; DROP TABLE ``; @@ -330,12 +330,12 @@ DROP TABLE ``; DROP TABLE ``; DROP TABLE `ݏݏ`; DROP TABLE `ޏޏ`; -CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = ujis engine=HEAP; -CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = ujis engine=HEAP; -CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = ujis engine=HEAP; -CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = ujis engine=HEAP; -CREATE TABLE `ݏݏ`(`` char(5)) DEFAULT CHARSET = ujis engine=HEAP; -CREATE TABLE `ޏޏ`(`` char(5)) DEFAULT CHARSET = ujis engine=HEAP; +CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = ujis engine=MEMORY; +CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = ujis engine=MEMORY; +CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = ujis engine=MEMORY; +CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = ujis engine=MEMORY; +CREATE TABLE `ݏݏ`(`` char(5)) DEFAULT CHARSET = ujis engine=MEMORY; +CREATE TABLE `ޏޏ`(`` char(5)) DEFAULT CHARSET = ujis engine=MEMORY; INSERT INTO `` VALUES (''),(''),(''); INSERT INTO `` VALUES (''),(''),(''); INSERT INTO `ݏݏ` VALUES (''),(''),(''); @@ -355,20 +355,20 @@ NULL NULL NULL DESC ``; Field Type Null Key Default Extra char(1) YES MUL NULL - char(6) PRI - char(1) YES MUL NULL + char(6) NO PRI + char(1) YES UNI NULL char(1) YES NULL SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL, - `` char(6) NOT NULL default '', - `` char(1) default NULL, - `` char(1) default NULL, - PRIMARY KEY (``), + `` char(1) DEFAULT NULL, + `` char(6) NOT NULL DEFAULT '', + `` char(1) DEFAULT NULL, + `` char(1) DEFAULT NULL, + PRIMARY KEY (``), UNIQUE KEY `` (``), KEY `` (``) -) ENGINE=HEAP DEFAULT CHARSET=ujis +) ENGINE=MEMORY DEFAULT CHARSET=ujis ALTER TABLE `` DROP INDEX ``; ALTER TABLE `` DROP PRIMARY KEY; ALTER TABLE `` DROP INDEX ``; @@ -382,12 +382,12 @@ SELECT * FROM ``; DESC ``; Field Type Null Key Default Extra - char(6) + char(6) NO SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(6) NOT NULL default '' -) ENGINE=HEAP DEFAULT CHARSET=ujis + `` char(6) NOT NULL DEFAULT '' +) ENGINE=MEMORY DEFAULT CHARSET=ujis ALTER TABLE `` ADD `` char(1) FIRST; ALTER TABLE `` ADD `` char(1) AFTER ``; ALTER TABLE `` ADD `` char(1); @@ -404,20 +404,20 @@ NULL NULL NULL DESC ``; Field Type Null Key Default Extra char(1) YES MUL NULL - char(6) PRI - char(1) YES MUL NULL + char(6) NO PRI + char(1) YES UNI NULL char(1) YES NULL SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL, - `` char(6) NOT NULL default '', - `` char(1) default NULL, - `` char(1) default NULL, - PRIMARY KEY (``), + `` char(1) DEFAULT NULL, + `` char(6) NOT NULL DEFAULT '', + `` char(1) DEFAULT NULL, + `` char(1) DEFAULT NULL, + PRIMARY KEY (``), UNIQUE KEY `` (``), KEY `` (``) -) ENGINE=HEAP DEFAULT CHARSET=ujis +) ENGINE=MEMORY DEFAULT CHARSET=ujis ALTER TABLE `` DROP INDEX ``; ALTER TABLE `` DROP PRIMARY KEY; ALTER TABLE `` DROP INDEX ``; @@ -431,12 +431,12 @@ SELECT * FROM ``; DESC ``; Field Type Null Key Default Extra - char(6) + char(6) NO SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(6) NOT NULL default '' -) ENGINE=HEAP DEFAULT CHARSET=ujis + `` char(6) NOT NULL DEFAULT '' +) ENGINE=MEMORY DEFAULT CHARSET=ujis ALTER TABLE `ݏݏ` ADD `` char(1) FIRST; ALTER TABLE `ݏݏ` ADD `` char(1) AFTER ``; ALTER TABLE `ݏݏ` ADD `` char(1); @@ -453,20 +453,20 @@ NULL NULL NULL DESC `ݏݏ`; Field Type Null Key Default Extra char(1) YES MUL NULL - char(6) PRI - char(1) YES MUL NULL + char(6) NO PRI + char(1) YES UNI NULL char(1) YES NULL SHOW CREATE TABLE `ݏݏ`; Table Create Table ݏݏ CREATE TABLE `ݏݏ` ( - `` char(1) default NULL, - `` char(6) NOT NULL default '', - `` char(1) default NULL, - `` char(1) default NULL, - PRIMARY KEY (``), + `` char(1) DEFAULT NULL, + `` char(6) NOT NULL DEFAULT '', + `` char(1) DEFAULT NULL, + `` char(1) DEFAULT NULL, + PRIMARY KEY (``), UNIQUE KEY `` (``), KEY `` (``) -) ENGINE=HEAP DEFAULT CHARSET=ujis +) ENGINE=MEMORY DEFAULT CHARSET=ujis ALTER TABLE `ݏݏ` DROP INDEX ``; ALTER TABLE `ݏݏ` DROP PRIMARY KEY; ALTER TABLE `ݏݏ` DROP INDEX ``; @@ -480,165 +480,12 @@ SELECT * FROM `ݏݏ`; DESC `ݏݏ`; Field Type Null Key Default Extra - char(6) + char(6) NO SHOW CREATE TABLE `ݏݏ`; Table Create Table ݏݏ CREATE TABLE `ݏݏ` ( - `` char(6) NOT NULL default '' -) ENGINE=HEAP DEFAULT CHARSET=ujis -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE `ݏݏ`; -DROP TABLE `ޏޏ`; -CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = ujis engine=BDB; -CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = ujis engine=BDB; -CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = ujis engine=BDB; -CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = ujis engine=BDB; -CREATE TABLE `ݏݏ`(`` char(5)) DEFAULT CHARSET = ujis engine=BDB; -CREATE TABLE `ޏޏ`(`` char(5)) DEFAULT CHARSET = ujis engine=BDB; -INSERT INTO `` VALUES (''),(''),(''); -INSERT INTO `` VALUES (''),(''),(''); -INSERT INTO `ݏݏ` VALUES (''),(''),(''); -ALTER TABLE `` ADD `` char(1) FIRST; -ALTER TABLE `` ADD `` char(1) AFTER ``; -ALTER TABLE `` ADD `` char(1); -ALTER TABLE `` ADD INDEX (``); -ALTER TABLE `` ADD PRIMARY KEY (``); -ALTER TABLE `` CHANGE `` `` char(1); -ALTER TABLE `` MODIFY `` char(6); -SELECT * FROM ``; - -NULL NULL NULL -NULL NULL NULL -NULL NULL NULL -DESC ``; -Field Type Null Key Default Extra - char(1) YES MUL NULL - char(6) PRI - char(1) YES NULL - char(1) YES NULL -SHOW CREATE TABLE ``; -Table Create Table - CREATE TABLE `` ( - `` char(1) default NULL, - `` char(6) NOT NULL default '', - `` char(1) default NULL, - `` char(1) default NULL, - PRIMARY KEY (``), - KEY `` (``) -) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis -ALTER TABLE `` DROP INDEX ``; -ALTER TABLE `` DROP PRIMARY KEY; -ALTER TABLE `` DROP ``; -ALTER TABLE `` DROP ``; -ALTER TABLE `` DROP ``; -SELECT * FROM ``; - - - - -DESC ``; -Field Type Null Key Default Extra - char(6) -SHOW CREATE TABLE ``; -Table Create Table - CREATE TABLE `` ( - `` char(6) NOT NULL default '' -) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis -ALTER TABLE `` ADD `` char(1) FIRST; -ALTER TABLE `` ADD `` char(1) AFTER ``; -ALTER TABLE `` ADD `` char(1); -ALTER TABLE `` ADD INDEX (``); -ALTER TABLE `` ADD PRIMARY KEY (``); -ALTER TABLE `` CHANGE `` `` char(1); -ALTER TABLE `` MODIFY `` char(6); -SELECT * FROM ``; - -NULL NULL NULL -NULL NULL NULL -NULL NULL NULL -DESC ``; -Field Type Null Key Default Extra - char(1) YES MUL NULL - char(6) PRI - char(1) YES NULL - char(1) YES NULL -SHOW CREATE TABLE ``; -Table Create Table - CREATE TABLE `` ( - `` char(1) default NULL, - `` char(6) NOT NULL default '', - `` char(1) default NULL, - `` char(1) default NULL, - PRIMARY KEY (``), - KEY `` (``) -) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis -ALTER TABLE `` DROP INDEX ``; -ALTER TABLE `` DROP PRIMARY KEY; -ALTER TABLE `` DROP ``; -ALTER TABLE `` DROP ``; -ALTER TABLE `` DROP ``; -SELECT * FROM ``; - - - - -DESC ``; -Field Type Null Key Default Extra - char(6) -SHOW CREATE TABLE ``; -Table Create Table - CREATE TABLE `` ( - `` char(6) NOT NULL default '' -) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis -ALTER TABLE `ݏݏ` ADD `` char(1) FIRST; -ALTER TABLE `ݏݏ` ADD `` char(1) AFTER ``; -ALTER TABLE `ݏݏ` ADD `` char(1); -ALTER TABLE `ݏݏ` ADD INDEX (``); -ALTER TABLE `ݏݏ` ADD PRIMARY KEY (``); -ALTER TABLE `ݏݏ` CHANGE `` `` char(1); -ALTER TABLE `ݏݏ` MODIFY `` char(6); -SELECT * FROM `ݏݏ`; - -NULL NULL NULL -NULL NULL NULL -NULL NULL NULL -DESC `ݏݏ`; -Field Type Null Key Default Extra - char(1) YES MUL NULL - char(6) PRI - char(1) YES NULL - char(1) YES NULL -SHOW CREATE TABLE `ݏݏ`; -Table Create Table -ݏݏ CREATE TABLE `ݏݏ` ( - `` char(1) default NULL, - `` char(6) NOT NULL default '', - `` char(1) default NULL, - `` char(1) default NULL, - PRIMARY KEY (``), - KEY `` (``) -) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis -ALTER TABLE `ݏݏ` DROP INDEX ``; -ALTER TABLE `ݏݏ` DROP PRIMARY KEY; -ALTER TABLE `ݏݏ` DROP ``; -ALTER TABLE `ݏݏ` DROP ``; -ALTER TABLE `ݏݏ` DROP ``; -SELECT * FROM `ݏݏ`; - - - - -DESC `ݏݏ`; -Field Type Null Key Default Extra - char(6) -SHOW CREATE TABLE `ݏݏ`; -Table Create Table -ݏݏ CREATE TABLE `ݏݏ` ( - `` char(6) NOT NULL default '' -) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis + `` char(6) NOT NULL DEFAULT '' +) ENGINE=MEMORY DEFAULT CHARSET=ujis DROP TABLE ``; DROP TABLE ``; DROP TABLE ``; diff --git a/mysql-test/suite/jp/r/jp_alter_utf8.result b/mysql-test/suite/jp/r/jp_alter_utf8.result index 19475e06a87..b641e9de78d 100644 --- a/mysql-test/suite/jp/r/jp_alter_utf8.result +++ b/mysql-test/suite/jp/r/jp_alter_utf8.result @@ -31,17 +31,17 @@ NULL ｳｳｳｳｳ NULL NULL DESC `ｱｱｱ`; Field Type Null Key Default Extra ｶｶ char(1) YES MUL NULL -ｷｷｷ char(6) PRI -ｸｸｸ char(1) YES MUL NULL +ｷｷｷ char(6) NO PRI +ｸｸｸ char(1) YES UNI NULL ｹｹｹ char(1) YES NULL SHOW CREATE TABLE `ｱｱｱ`; Table Create Table ｱｱｱ CREATE TABLE `ｱｱｱ` ( - `ｶｶ` char(1) default NULL, - `ｷｷｷ` char(6) NOT NULL default '', - `ｸｸｸ` char(1) default NULL, - `ｹｹｹ` char(1) default NULL, - PRIMARY KEY (`ｷｷｷ`), + `ｶｶ` char(1) DEFAULT NULL, + `ｷｷｷ` char(6) NOT NULL DEFAULT '', + `ｸｸｸ` char(1) DEFAULT NULL, + `ｹｹｹ` char(1) DEFAULT NULL, + PRIMARY KEY (`ｷｷｷ`), UNIQUE KEY `ｸｸｸ` (`ｸｸｸ`), KEY `ｶｶｶ` (`ｶｶ`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 @@ -58,11 +58,11 @@ SELECT * FROM `ｱｱｱ`; ｳｳｳｳｳ DESC `ｱｱｱ`; Field Type Null Key Default Extra -ｷｷｷ char(6) +ｷｷｷ char(6) NO SHOW CREATE TABLE `ｱｱｱ`; Table Create Table ｱｱｱ CREATE TABLE `ｱｱｱ` ( - `ｷｷｷ` char(6) NOT NULL default '' + `ｷｷｷ` char(6) NOT NULL DEFAULT '' ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ALTER TABLE `あああ` ADD `かかか` char(1) FIRST; ALTER TABLE `あああ` ADD `くくく` char(1) AFTER `ききき`; @@ -80,17 +80,17 @@ NULL ううううう NULL NULL DESC `あああ`; Field Type Null Key Default Extra かか char(1) YES MUL NULL -ききき char(6) PRI -くくく char(1) YES MUL NULL +ききき char(6) NO PRI +くくく char(1) YES UNI NULL けけけ char(1) YES NULL SHOW CREATE TABLE `あああ`; Table Create Table あああ CREATE TABLE `あああ` ( - `かか` char(1) default NULL, - `ききき` char(6) NOT NULL default '', - `くくく` char(1) default NULL, - `けけけ` char(1) default NULL, - PRIMARY KEY (`ききき`), + `かか` char(1) DEFAULT NULL, + `ききき` char(6) NOT NULL DEFAULT '', + `くくく` char(1) DEFAULT NULL, + `けけけ` char(1) DEFAULT NULL, + PRIMARY KEY (`ききき`), UNIQUE KEY `くくく` (`くくく`), KEY `かかか` (`かか`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 @@ -107,11 +107,11 @@ SELECT * FROM `あああ`; ううううう DESC `あああ`; Field Type Null Key Default Extra -ききき char(6) +ききき char(6) NO SHOW CREATE TABLE `あああ`; Table Create Table あああ CREATE TABLE `あああ` ( - `ききき` char(6) NOT NULL default '' + `ききき` char(6) NOT NULL DEFAULT '' ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ALTER TABLE `龖龖龖` ADD `丄丄丄` char(1) FIRST; ALTER TABLE `龖龖龖` ADD `丅丅丅` char(1) AFTER `丂丂丂`; @@ -129,17 +129,17 @@ NULL 丅丅丅丅丅 NULL NULL DESC `龖龖龖`; Field Type Null Key Default Extra 丄丄 char(1) YES MUL NULL -丂丂丂 char(6) PRI -丅丅丅 char(1) YES MUL NULL +丂丂丂 char(6) NO PRI +丅丅丅 char(1) YES UNI NULL 乚乚乚 char(1) YES NULL SHOW CREATE TABLE `龖龖龖`; Table Create Table 龖龖龖 CREATE TABLE `龖龖龖` ( - `丄丄` char(1) default NULL, - `丂丂丂` char(6) NOT NULL default '', - `丅丅丅` char(1) default NULL, - `乚乚乚` char(1) default NULL, - PRIMARY KEY (`丂丂丂`), + `丄丄` char(1) DEFAULT NULL, + `丂丂丂` char(6) NOT NULL DEFAULT '', + `丅丅丅` char(1) DEFAULT NULL, + `乚乚乚` char(1) DEFAULT NULL, + PRIMARY KEY (`丂丂丂`), UNIQUE KEY `丅丅丅` (`丅丅丅`), KEY `丄丄丄` (`丄丄`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 @@ -156,11 +156,11 @@ SELECT * FROM `龖龖龖`; 丅丅丅丅丅 DESC `龖龖龖`; Field Type Null Key Default Extra -丂丂丂 char(6) +丂丂丂 char(6) NO SHOW CREATE TABLE `龖龖龖`; Table Create Table 龖龖龖 CREATE TABLE `龖龖龖` ( - `丂丂丂` char(6) NOT NULL default '' + `丂丂丂` char(6) NOT NULL DEFAULT '' ) ENGINE=InnoDB DEFAULT CHARSET=utf8 DROP TABLE `ｱｱｱ`; DROP TABLE `ｲｲｲ`; @@ -193,17 +193,17 @@ NULL ｳｳｳｳｳ NULL NULL DESC `ｱｱｱ`; Field Type Null Key Default Extra ｶｶ char(1) YES MUL NULL -ｷｷｷ char(6) PRI -ｸｸｸ char(1) YES MUL NULL +ｷｷｷ char(6) NO PRI +ｸｸｸ char(1) YES UNI NULL ｹｹｹ char(1) YES NULL SHOW CREATE TABLE `ｱｱｱ`; Table Create Table ｱｱｱ CREATE TABLE `ｱｱｱ` ( - `ｶｶ` char(1) default NULL, - `ｷｷｷ` char(6) NOT NULL default '', - `ｸｸｸ` char(1) default NULL, - `ｹｹｹ` char(1) default NULL, - PRIMARY KEY (`ｷｷｷ`), + `ｶｶ` char(1) DEFAULT NULL, + `ｷｷｷ` char(6) NOT NULL DEFAULT '', + `ｸｸｸ` char(1) DEFAULT NULL, + `ｹｹｹ` char(1) DEFAULT NULL, + PRIMARY KEY (`ｷｷｷ`), UNIQUE KEY `ｸｸｸ` (`ｸｸｸ`), KEY `ｶｶｶ` (`ｶｶ`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 @@ -220,11 +220,11 @@ SELECT * FROM `ｱｱｱ`; ｳｳｳｳｳ DESC `ｱｱｱ`; Field Type Null Key Default Extra -ｷｷｷ char(6) +ｷｷｷ char(6) NO SHOW CREATE TABLE `ｱｱｱ`; Table Create Table ｱｱｱ CREATE TABLE `ｱｱｱ` ( - `ｷｷｷ` char(6) NOT NULL default '' + `ｷｷｷ` char(6) NOT NULL DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ALTER TABLE `あああ` ADD `かかか` char(1) FIRST; ALTER TABLE `あああ` ADD `くくく` char(1) AFTER `ききき`; @@ -242,17 +242,17 @@ NULL ううううう NULL NULL DESC `あああ`; Field Type Null Key Default Extra かか char(1) YES MUL NULL -ききき char(6) PRI -くくく char(1) YES MUL NULL +ききき char(6) NO PRI +くくく char(1) YES UNI NULL けけけ char(1) YES NULL SHOW CREATE TABLE `あああ`; Table Create Table あああ CREATE TABLE `あああ` ( - `かか` char(1) default NULL, - `ききき` char(6) NOT NULL default '', - `くくく` char(1) default NULL, - `けけけ` char(1) default NULL, - PRIMARY KEY (`ききき`), + `かか` char(1) DEFAULT NULL, + `ききき` char(6) NOT NULL DEFAULT '', + `くくく` char(1) DEFAULT NULL, + `けけけ` char(1) DEFAULT NULL, + PRIMARY KEY (`ききき`), UNIQUE KEY `くくく` (`くくく`), KEY `かかか` (`かか`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 @@ -269,11 +269,11 @@ SELECT * FROM `あああ`; ううううう DESC `あああ`; Field Type Null Key Default Extra -ききき char(6) +ききき char(6) NO SHOW CREATE TABLE `あああ`; Table Create Table あああ CREATE TABLE `あああ` ( - `ききき` char(6) NOT NULL default '' + `ききき` char(6) NOT NULL DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ALTER TABLE `龖龖龖` ADD `丄丄丄` char(1) FIRST; ALTER TABLE `龖龖龖` ADD `丅丅丅` char(1) AFTER `丂丂丂`; @@ -291,17 +291,17 @@ NULL 丅丅丅丅丅 NULL NULL DESC `龖龖龖`; Field Type Null Key Default Extra 丄丄 char(1) YES MUL NULL -丂丂丂 char(6) PRI -丅丅丅 char(1) YES MUL NULL +丂丂丂 char(6) NO PRI +丅丅丅 char(1) YES UNI NULL 乚乚乚 char(1) YES NULL SHOW CREATE TABLE `龖龖龖`; Table Create Table 龖龖龖 CREATE TABLE `龖龖龖` ( - `丄丄` char(1) default NULL, - `丂丂丂` char(6) NOT NULL default '', - `丅丅丅` char(1) default NULL, - `乚乚乚` char(1) default NULL, - PRIMARY KEY (`丂丂丂`), + `丄丄` char(1) DEFAULT NULL, + `丂丂丂` char(6) NOT NULL DEFAULT '', + `丅丅丅` char(1) DEFAULT NULL, + `乚乚乚` char(1) DEFAULT NULL, + PRIMARY KEY (`丂丂丂`), UNIQUE KEY `丅丅丅` (`丅丅丅`), KEY `丄丄丄` (`丄丄`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 @@ -318,11 +318,11 @@ SELECT * FROM `龖龖龖`; 丅丅丅丅丅 DESC `龖龖龖`; Field Type Null Key Default Extra -丂丂丂 char(6) +丂丂丂 char(6) NO SHOW CREATE TABLE `龖龖龖`; Table Create Table 龖龖龖 CREATE TABLE `龖龖龖` ( - `丂丂丂` char(6) NOT NULL default '' + `丂丂丂` char(6) NOT NULL DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=utf8 DROP TABLE `ｱｱｱ`; DROP TABLE `ｲｲｲ`; @@ -330,12 +330,12 @@ DROP TABLE `あああ`; DROP TABLE `いいい`; DROP TABLE `龖龖龖`; DROP TABLE `龗龗龗`; -CREATE TABLE `ｱｱｱ`(`ｷｷｷ` char(5)) DEFAULT CHARSET = utf8 engine=HEAP; -CREATE TABLE `ｲｲｲ`(`ｹｹｹ` char(5)) DEFAULT CHARSET = utf8 engine=HEAP; -CREATE TABLE `あああ`(`ききき` char(5)) DEFAULT CHARSET = utf8 engine=HEAP; -CREATE TABLE `いいい`(`けけけ` char(5)) DEFAULT CHARSET = utf8 engine=HEAP; -CREATE TABLE `龖龖龖`(`丂丂丂` char(5)) DEFAULT CHARSET = utf8 engine=HEAP; -CREATE TABLE `龗龗龗`(`乚乚乚` char(5)) DEFAULT CHARSET = utf8 engine=HEAP; +CREATE TABLE `ｱｱｱ`(`ｷｷｷ` char(5)) DEFAULT CHARSET = utf8 engine=MEMORY; +CREATE TABLE `ｲｲｲ`(`ｹｹｹ` char(5)) DEFAULT CHARSET = utf8 engine=MEMORY; +CREATE TABLE `あああ`(`ききき` char(5)) DEFAULT CHARSET = utf8 engine=MEMORY; +CREATE TABLE `いいい`(`けけけ` char(5)) DEFAULT CHARSET = utf8 engine=MEMORY; +CREATE TABLE `龖龖龖`(`丂丂丂` char(5)) DEFAULT CHARSET = utf8 engine=MEMORY; +CREATE TABLE `龗龗龗`(`乚乚乚` char(5)) DEFAULT CHARSET = utf8 engine=MEMORY; INSERT INTO `ｱｱｱ` VALUES ('ｱｱｱｱｱ'),('ｲｲｲｲｲ'),('ｳｳｳｳｳ'); INSERT INTO `あああ` VALUES ('あああああ'),('いいいいい'),('ううううう'); INSERT INTO `龖龖龖` VALUES ('丂丂丂丂丂'),('丄丄丄丄丄'),('丅丅丅丅丅'); @@ -355,20 +355,20 @@ NULL ｳｳｳｳｳ NULL NULL DESC `ｱｱｱ`; Field Type Null Key Default Extra ｶｶ char(1) YES MUL NULL -ｷｷｷ char(6) PRI -ｸｸｸ char(1) YES MUL NULL +ｷｷｷ char(6) NO PRI +ｸｸｸ char(1) YES UNI NULL ｹｹｹ char(1) YES NULL SHOW CREATE TABLE `ｱｱｱ`; Table Create Table ｱｱｱ CREATE TABLE `ｱｱｱ` ( - `ｶｶ` char(1) default NULL, - `ｷｷｷ` char(6) NOT NULL default '', - `ｸｸｸ` char(1) default NULL, - `ｹｹｹ` char(1) default NULL, - PRIMARY KEY (`ｷｷｷ`), + `ｶｶ` char(1) DEFAULT NULL, + `ｷｷｷ` char(6) NOT NULL DEFAULT '', + `ｸｸｸ` char(1) DEFAULT NULL, + `ｹｹｹ` char(1) DEFAULT NULL, + PRIMARY KEY (`ｷｷｷ`), UNIQUE KEY `ｸｸｸ` (`ｸｸｸ`), KEY `ｶｶｶ` (`ｶｶ`) -) ENGINE=HEAP DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 ALTER TABLE `ｱｱｱ` DROP INDEX `ｶｶｶ`; ALTER TABLE `ｱｱｱ` DROP PRIMARY KEY; ALTER TABLE `ｱｱｱ` DROP INDEX `ｸｸｸ`; @@ -382,12 +382,12 @@ SELECT * FROM `ｱｱｱ`; ｳｳｳｳｳ DESC `ｱｱｱ`; Field Type Null Key Default Extra -ｷｷｷ char(6) +ｷｷｷ char(6) NO SHOW CREATE TABLE `ｱｱｱ`; Table Create Table ｱｱｱ CREATE TABLE `ｱｱｱ` ( - `ｷｷｷ` char(6) NOT NULL default '' -) ENGINE=HEAP DEFAULT CHARSET=utf8 + `ｷｷｷ` char(6) NOT NULL DEFAULT '' +) ENGINE=MEMORY DEFAULT CHARSET=utf8 ALTER TABLE `あああ` ADD `かかか` char(1) FIRST; ALTER TABLE `あああ` ADD `くくく` char(1) AFTER `ききき`; ALTER TABLE `あああ` ADD `けけけ` char(1); @@ -404,20 +404,20 @@ NULL ううううう NULL NULL DESC `あああ`; Field Type Null Key Default Extra かか char(1) YES MUL NULL -ききき char(6) PRI -くくく char(1) YES MUL NULL +ききき char(6) NO PRI +くくく char(1) YES UNI NULL けけけ char(1) YES NULL SHOW CREATE TABLE `あああ`; Table Create Table あああ CREATE TABLE `あああ` ( - `かか` char(1) default NULL, - `ききき` char(6) NOT NULL default '', - `くくく` char(1) default NULL, - `けけけ` char(1) default NULL, - PRIMARY KEY (`ききき`), + `かか` char(1) DEFAULT NULL, + `ききき` char(6) NOT NULL DEFAULT '', + `くくく` char(1) DEFAULT NULL, + `けけけ` char(1) DEFAULT NULL, + PRIMARY KEY (`ききき`), UNIQUE KEY `くくく` (`くくく`), KEY `かかか` (`かか`) -) ENGINE=HEAP DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 ALTER TABLE `あああ` DROP INDEX `かかか`; ALTER TABLE `あああ` DROP PRIMARY KEY; ALTER TABLE `あああ` DROP INDEX `くくく`; @@ -431,12 +431,12 @@ SELECT * FROM `あああ`; ううううう DESC `あああ`; Field Type Null Key Default Extra -ききき char(6) +ききき char(6) NO SHOW CREATE TABLE `あああ`; Table Create Table あああ CREATE TABLE `あああ` ( - `ききき` char(6) NOT NULL default '' -) ENGINE=HEAP DEFAULT CHARSET=utf8 + `ききき` char(6) NOT NULL DEFAULT '' +) ENGINE=MEMORY DEFAULT CHARSET=utf8 ALTER TABLE `龖龖龖` ADD `丄丄丄` char(1) FIRST; ALTER TABLE `龖龖龖` ADD `丅丅丅` char(1) AFTER `丂丂丂`; ALTER TABLE `龖龖龖` ADD `乚乚乚` char(1); @@ -453,20 +453,20 @@ NULL 丅丅丅丅丅 NULL NULL DESC `龖龖龖`; Field Type Null Key Default Extra 丄丄 char(1) YES MUL NULL -丂丂丂 char(6) PRI -丅丅丅 char(1) YES MUL NULL +丂丂丂 char(6) NO PRI +丅丅丅 char(1) YES UNI NULL 乚乚乚 char(1) YES NULL SHOW CREATE TABLE `龖龖龖`; Table Create Table 龖龖龖 CREATE TABLE `龖龖龖` ( - `丄丄` char(1) default NULL, - `丂丂丂` char(6) NOT NULL default '', - `丅丅丅` char(1) default NULL, - `乚乚乚` char(1) default NULL, - PRIMARY KEY (`丂丂丂`), + `丄丄` char(1) DEFAULT NULL, + `丂丂丂` char(6) NOT NULL DEFAULT '', + `丅丅丅` char(1) DEFAULT NULL, + `乚乚乚` char(1) DEFAULT NULL, + PRIMARY KEY (`丂丂丂`), UNIQUE KEY `丅丅丅` (`丅丅丅`), KEY `丄丄丄` (`丄丄`) -) ENGINE=HEAP DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 ALTER TABLE `龖龖龖` DROP INDEX `丄丄丄`; ALTER TABLE `龖龖龖` DROP PRIMARY KEY; ALTER TABLE `龖龖龖` DROP INDEX `丅丅丅`; @@ -480,165 +480,12 @@ SELECT * FROM `龖龖龖`; 丅丅丅丅丅 DESC `龖龖龖`; Field Type Null Key Default Extra -丂丂丂 char(6) +丂丂丂 char(6) NO SHOW CREATE TABLE `龖龖龖`; Table Create Table 龖龖龖 CREATE TABLE `龖龖龖` ( - `丂丂丂` char(6) NOT NULL default '' -) ENGINE=HEAP DEFAULT CHARSET=utf8 -DROP TABLE `ｱｱｱ`; -DROP TABLE `ｲｲｲ`; -DROP TABLE `あああ`; -DROP TABLE `いいい`; -DROP TABLE `龖龖龖`; -DROP TABLE `龗龗龗`; -CREATE TABLE `ｱｱｱ`(`ｷｷｷ` char(5)) DEFAULT CHARSET = utf8 engine=BDB; -CREATE TABLE `ｲｲｲ`(`ｹｹｹ` char(5)) DEFAULT CHARSET = utf8 engine=BDB; -CREATE TABLE `あああ`(`ききき` char(5)) DEFAULT CHARSET = utf8 engine=BDB; -CREATE TABLE `いいい`(`けけけ` char(5)) DEFAULT CHARSET = utf8 engine=BDB; -CREATE TABLE `龖龖龖`(`丂丂丂` char(5)) DEFAULT CHARSET = utf8 engine=BDB; -CREATE TABLE `龗龗龗`(`乚乚乚` char(5)) DEFAULT CHARSET = utf8 engine=BDB; -INSERT INTO `ｱｱｱ` VALUES ('ｱｱｱｱｱ'),('ｲｲｲｲｲ'),('ｳｳｳｳｳ'); -INSERT INTO `あああ` VALUES ('あああああ'),('いいいいい'),('ううううう'); -INSERT INTO `龖龖龖` VALUES ('丂丂丂丂丂'),('丄丄丄丄丄'),('丅丅丅丅丅'); -ALTER TABLE `ｱｱｱ` ADD `ｶｶｶ` char(1) FIRST; -ALTER TABLE `ｱｱｱ` ADD `ｸｸｸ` char(1) AFTER `ｷｷｷ`; -ALTER TABLE `ｱｱｱ` ADD `ｹｹｹ` char(1); -ALTER TABLE `ｱｱｱ` ADD INDEX (`ｶｶｶ`); -ALTER TABLE `ｱｱｱ` ADD PRIMARY KEY (`ｷｷｷ`); -ALTER TABLE `ｱｱｱ` CHANGE `ｶｶｶ` `ｶｶ` char(1); -ALTER TABLE `ｱｱｱ` MODIFY `ｷｷｷ` char(6); -SELECT * FROM `ｱｱｱ`; -ｶｶ ｷｷｷ ｸｸｸ ｹｹｹ -NULL ｱｱｱｱｱ NULL NULL -NULL ｲｲｲｲｲ NULL NULL -NULL ｳｳｳｳｳ NULL NULL -DESC `ｱｱｱ`; -Field Type Null Key Default Extra -ｶｶ char(1) YES MUL NULL -ｷｷｷ char(6) PRI -ｸｸｸ char(1) YES NULL -ｹｹｹ char(1) YES NULL -SHOW CREATE TABLE `ｱｱｱ`; -Table Create Table -ｱｱｱ CREATE TABLE `ｱｱｱ` ( - `ｶｶ` char(1) default NULL, - `ｷｷｷ` char(6) NOT NULL default '', - `ｸｸｸ` char(1) default NULL, - `ｹｹｹ` char(1) default NULL, - PRIMARY KEY (`ｷｷｷ`), - KEY `ｶｶｶ` (`ｶｶ`) -) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8 -ALTER TABLE `ｱｱｱ` DROP INDEX `ｶｶｶ`; -ALTER TABLE `ｱｱｱ` DROP PRIMARY KEY; -ALTER TABLE `ｱｱｱ` DROP `ｶｶ`; -ALTER TABLE `ｱｱｱ` DROP `ｸｸｸ`; -ALTER TABLE `ｱｱｱ` DROP `ｹｹｹ`; -SELECT * FROM `ｱｱｱ`; -ｷｷｷ -ｱｱｱｱｱ -ｲｲｲｲｲ -ｳｳｳｳｳ -DESC `ｱｱｱ`; -Field Type Null Key Default Extra -ｷｷｷ char(6) -SHOW CREATE TABLE `ｱｱｱ`; -Table Create Table -ｱｱｱ CREATE TABLE `ｱｱｱ` ( - `ｷｷｷ` char(6) NOT NULL default '' -) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8 -ALTER TABLE `あああ` ADD `かかか` char(1) FIRST; -ALTER TABLE `あああ` ADD `くくく` char(1) AFTER `ききき`; -ALTER TABLE `あああ` ADD `けけけ` char(1); -ALTER TABLE `あああ` ADD INDEX (`かかか`); -ALTER TABLE `あああ` ADD PRIMARY KEY (`ききき`); -ALTER TABLE `あああ` CHANGE `かかか` `かか` char(1); -ALTER TABLE `あああ` MODIFY `ききき` char(6); -SELECT * FROM `あああ`; -かか ききき くくく けけけ -NULL あああああ NULL NULL -NULL いいいいい NULL NULL -NULL ううううう NULL NULL -DESC `あああ`; -Field Type Null Key Default Extra -かか char(1) YES MUL NULL -ききき char(6) PRI -くくく char(1) YES NULL -けけけ char(1) YES NULL -SHOW CREATE TABLE `あああ`; -Table Create Table -あああ CREATE TABLE `あああ` ( - `かか` char(1) default NULL, - `ききき` char(6) NOT NULL default '', - `くくく` char(1) default NULL, - `けけけ` char(1) default NULL, - PRIMARY KEY (`ききき`), - KEY `かかか` (`かか`) -) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8 -ALTER TABLE `あああ` DROP INDEX `かかか`; -ALTER TABLE `あああ` DROP PRIMARY KEY; -ALTER TABLE `あああ` DROP `かか`; -ALTER TABLE `あああ` DROP `くくく`; -ALTER TABLE `あああ` DROP `けけけ`; -SELECT * FROM `あああ`; -ききき -あああああ -いいいいい -ううううう -DESC `あああ`; -Field Type Null Key Default Extra -ききき char(6) -SHOW CREATE TABLE `あああ`; -Table Create Table -あああ CREATE TABLE `あああ` ( - `ききき` char(6) NOT NULL default '' -) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8 -ALTER TABLE `龖龖龖` ADD `丄丄丄` char(1) FIRST; -ALTER TABLE `龖龖龖` ADD `丅丅丅` char(1) AFTER `丂丂丂`; -ALTER TABLE `龖龖龖` ADD `乚乚乚` char(1); -ALTER TABLE `龖龖龖` ADD INDEX (`丄丄丄`); -ALTER TABLE `龖龖龖` ADD PRIMARY KEY (`丂丂丂`); -ALTER TABLE `龖龖龖` CHANGE `丄丄丄` `丄丄` char(1); -ALTER TABLE `龖龖龖` MODIFY `丂丂丂` char(6); -SELECT * FROM `龖龖龖`; -丄丄 丂丂丂 丅丅丅 乚乚乚 -NULL 丂丂丂丂丂 NULL NULL -NULL 丄丄丄丄丄 NULL NULL -NULL 丅丅丅丅丅 NULL NULL -DESC `龖龖龖`; -Field Type Null Key Default Extra -丄丄 char(1) YES MUL NULL -丂丂丂 char(6) PRI -丅丅丅 char(1) YES NULL -乚乚乚 char(1) YES NULL -SHOW CREATE TABLE `龖龖龖`; -Table Create Table -龖龖龖 CREATE TABLE `龖龖龖` ( - `丄丄` char(1) default NULL, - `丂丂丂` char(6) NOT NULL default '', - `丅丅丅` char(1) default NULL, - `乚乚乚` char(1) default NULL, - PRIMARY KEY (`丂丂丂`), - KEY `丄丄丄` (`丄丄`) -) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8 -ALTER TABLE `龖龖龖` DROP INDEX `丄丄丄`; -ALTER TABLE `龖龖龖` DROP PRIMARY KEY; -ALTER TABLE `龖龖龖` DROP `丄丄`; -ALTER TABLE `龖龖龖` DROP `丅丅丅`; -ALTER TABLE `龖龖龖` DROP `乚乚乚`; -SELECT * FROM `龖龖龖`; -丂丂丂 -丂丂丂丂丂 -丄丄丄丄丄 -丅丅丅丅丅 -DESC `龖龖龖`; -Field Type Null Key Default Extra -丂丂丂 char(6) -SHOW CREATE TABLE `龖龖龖`; -Table Create Table -龖龖龖 CREATE TABLE `龖龖龖` ( - `丂丂丂` char(6) NOT NULL default '' -) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8 + `丂丂丂` char(6) NOT NULL DEFAULT '' +) ENGINE=MEMORY DEFAULT CHARSET=utf8 DROP TABLE `ｱｱｱ`; DROP TABLE `ｲｲｲ`; DROP TABLE `あああ`; diff --git a/mysql-test/suite/jp/r/jp_charlength_sjis.result b/mysql-test/suite/jp/r/jp_charlength_sjis.result index 57d538ef8d0..5c734b4b8cf 100644 --- a/mysql-test/suite/jp/r/jp_charlength_sjis.result +++ b/mysql-test/suite/jp/r/jp_charlength_sjis.result @@ -7,9 +7,6 @@ drop table if exists `sU`; 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(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = innodb; @@ -18,12 +15,9 @@ CREATE TABLE `sR` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engin CREATE TABLE `sS` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sT` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sU` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; -CREATE TABLE `sV` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sW` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sX` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPO` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPP` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPQ` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; +CREATE TABLE `sV` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sW` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sX` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; INSERT INTO `sP` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `sQ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `sR` VALUES ('\\\\\'),('\\\\'),('\\\'),('\\'),('\'),(''); @@ -33,9 +27,6 @@ INSERT INTO `sU` VALUES ('\\\\\'),('\\\\'),('\\\'),('\\'),('\') INSERT INTO `sV` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `sW` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `sX` VALUES ('\\\\\'),('\\\\'),('\\\'),('\\'),('\'),(''); -INSERT INTO `sPO` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `sPP` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `sPQ` VALUES ('\\\\\'),('\\\\'),('\\\'),('\\'),('\'),(''); SELECT `bP`, CHAR_LENGTH(`bP`) FROM `sP`; bP CHAR_LENGTH(`bP`) 0 @@ -108,30 +99,6 @@ SELECT `bP`, CHAR_LENGTH(`bP`) FROM `sX`; \\ 2 \ 1 0 -SELECT `bP`, CHAR_LENGTH(`bP`) FROM `sPO`; -bP CHAR_LENGTH(`bP`) - 5 - 4 - 3 - 2 - 1 - 0 -SELECT `bP`, CHAR_LENGTH(`bP`) FROM `sPP`; -bP CHAR_LENGTH(`bP`) - 5 - 4 - 3 - 2 - 1 - 0 -SELECT `bP`, CHAR_LENGTH(`bP`) FROM `sPQ`; -bP CHAR_LENGTH(`bP`) -\\\\\ 5 -\\\\ 4 -\\\ 3 -\\ 2 -\ 1 - 0 DROP TABLE `sP`; DROP TABLE `sQ`; DROP TABLE `sR`; @@ -141,6 +108,3 @@ DROP TABLE `sU`; DROP TABLE `sV`; DROP TABLE `sW`; DROP TABLE `sX`; -DROP TABLE `sPO`; -DROP TABLE `sPP`; -DROP TABLE `sPQ`; diff --git a/mysql-test/suite/jp/r/jp_charlength_ucs2.result b/mysql-test/suite/jp/r/jp_charlength_ucs2.result index 3695ee5159a..b211c87c420 100644 --- a/mysql-test/suite/jp/r/jp_charlength_ucs2.result +++ b/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 `ԣ` (`ã` char(5), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engin 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 `ԣ` 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 @@ -109,30 +100,6 @@ SELECT `ã`, CHAR_LENGTH(`ã`) FROM `ԣ`; 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 `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -142,6 +109,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/r/jp_charlength_ujis.result b/mysql-test/suite/jp/r/jp_charlength_ujis.result index ccfbf4fa3a1..910952b482f 100644 --- a/mysql-test/suite/jp/r/jp_charlength_ujis.result +++ b/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 `ԣ` (`ã` char(5), INDEX(`ã`)) DEFAULT CHARSET = ujis engin 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 `ԣ` 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 @@ -108,30 +99,6 @@ SELECT `ã`, CHAR_LENGTH(`ã`) FROM `ԣ`; 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 `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -141,6 +108,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/r/jp_charlength_utf8.result b/mysql-test/suite/jp/r/jp_charlength_utf8.result index d4d7f68f933..473eb9870c6 100644 --- a/mysql-test/suite/jp/r/jp_charlength_utf8.result +++ b/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 @@ -108,30 +99,6 @@ SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ９`; 龔龖 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 `Ｔ１`; DROP TABLE `Ｔ２`; DROP TABLE `Ｔ３`; @@ -141,6 +108,3 @@ DROP TABLE `Ｔ６`; DROP TABLE `Ｔ７`; DROP TABLE `Ｔ８`; DROP TABLE `Ｔ９`; -DROP TABLE `Ｔ１０`; -DROP TABLE `Ｔ１１`; -DROP TABLE `Ｔ１２`; diff --git a/mysql-test/suite/jp/r/jp_charset_sjis.result b/mysql-test/suite/jp/r/jp_charset_sjis.result index 80ef24a7334..049f872cfa1 100644 --- a/mysql-test/suite/jp/r/jp_charset_sjis.result +++ b/mysql-test/suite/jp/r/jp_charset_sjis.result @@ -7,9 +7,6 @@ drop table if exists `sU`; 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 `sR` (`bP` char(20)) DEFAULT CHARSET = sjis engine = innodb; 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 `sU`; 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 `sU`; drop table `sV`; drop table `sW`; drop table `sX`; -drop table `sPO`; -drop table `sPP`; -drop table `sPQ`; diff --git a/mysql-test/suite/jp/r/jp_charset_ucs2.result b/mysql-test/suite/jp/r/jp_charset_ucs2.result index d121e98fc00..c5aee82c3c5 100644 --- a/mysql-test/suite/jp/r/jp_charset_ucs2.result +++ b/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 `ԣ` (`ã` char(20)) DEFAULT CHARSET = ucs2 engine = innodb; 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 `ԣ` VALUES ,('') ,('ÏďŏƏ') ,('ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ'); -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 `ԣ`; diff --git a/mysql-test/suite/jp/r/jp_charset_ujis.result b/mysql-test/suite/jp/r/jp_charset_ujis.result index 964477896bd..746b53ee5e1 100644 --- a/mysql-test/suite/jp/r/jp_charset_ujis.result +++ b/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 `ԣ` (`ã` char(20)) DEFAULT CHARSET = ujis engine = innodb; 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 `ԣ`; diff --git a/mysql-test/suite/jp/r/jp_charset_utf8.result b/mysql-test/suite/jp/r/jp_charset_utf8.result index 2fdd3fb1a6b..9f22bda74f0 100644 --- a/mysql-test/suite/jp/r/jp_charset_utf8.result +++ b/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 `Ｔ１２`; diff --git a/mysql-test/suite/jp/r/jp_convert_sjis.result b/mysql-test/suite/jp/r/jp_convert_sjis.result index 8c9df3606c8..abb0c28f4f6 100644 --- a/mysql-test/suite/jp/r/jp_convert_sjis.result +++ b/mysql-test/suite/jp/r/jp_convert_sjis.result @@ -9,21 +9,15 @@ drop table if exists `sU`; 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`; CREATE TABLE `sP` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = innodb; CREATE TABLE `sQ` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = innodb; CREATE TABLE `sR` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = innodb; CREATE TABLE `sS` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sT` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sU` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; -CREATE TABLE `sV` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sW` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sX` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPO` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPP` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPQ` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; +CREATE TABLE `sV` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sW` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sX` (`bP` char(20), INDEX(`bP`)) 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 `sU`; 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 `bP`, CONVERT(`bP` using utf8) FROM `sP`; bP CONVERT(`bP` using utf8) !"#$%&'()*+,-./ !"#$%&'()*+,-./ @@ -783,255 +774,6 @@ SELECT `bP`, CONVERT(`bP` using ucs2) FROM `sX`; SELECT `bP`, CONVERT(`bP` using ujis) FROM `sX`; bP CONVERT(`bP` using ujis) \\\\\\\\\\\\\\\\\\\\ \\\\\\\\\\\\\\\\\\\\ -SELECT `bP`, CONVERT(`bP` using utf8) FROM `sPO`; -bP CONVERT(`bP` using utf8) - !"#$%&'()*+,-./ !"#$%&'()*+,-./ -0123456789:;<=>? 0123456789:;<=>? -@ABCDEFGHIJKLMNO @ABCDEFGHIJKLMNO -PQRSTUVWXYZ[\]^_ PQRSTUVWXYZ[_]^_ -abcdefghijklmno abcdefghijklmno -pqrstuvwxyz{|}~ pqrstuvwxyz{|}~ - - - - -SELECT `bP`, CONVERT(`bP` using ucs2) FROM `sPO`; -bP CONVERT(`bP` using ucs2) - !"#$%&'()*+,-./ !"#$%&'()*+,-./ -0123456789:;<=>? 0123456789:;<=>? -@ABCDEFGHIJKLMNO @ABCDEFGHIJKLMNO -PQRSTUVWXYZ[\]^_ PQRSTUVWXYZ[_]^_ -abcdefghijklmno abcdefghijklmno -pqrstuvwxyz{|}~ pqrstuvwxyz{|}~ - - - - -SELECT `bP`, CONVERT(`bP` using ujis) FROM `sPO`; -bP CONVERT(`bP` using ujis) - !"#$%&'()*+,-./ !"#$%&'()*+,-./ -0123456789:;<=>? 0123456789:;<=>? -@ABCDEFGHIJKLMNO @ABCDEFGHIJKLMNO -PQRSTUVWXYZ[\]^_ PQRSTUVWXYZ[_]^_ -abcdefghijklmno abcdefghijklmno -pqrstuvwxyz{|}~ pqrstuvwxyz{|}~ - - - - -SELECT `bP`, CONVERT(`bP` using utf8) FROM `sPP`; -bP CONVERT(`bP` using utf8) -@@ABCDEFGHIJKLMNOPQR @@ABCDEFGHIJKLMNOPQR -STUVWXYZ[\]^_`abcdef STUVWXYZ[\]^_`abcdef -ghijklmnopqrstuvwxyz ghijklmnopqrstuvwxyz -{]}~ {]}~ -EEEEE EEEEE -EEEEEE EEEEEE -EEEEEEEEEEEE EEEEEEEEEEEE -EEȁɁʁˁ́́EEEEEEEEEEE EEȁɁʁˁ́́EEEEEEEEEEE -ځہ܁݁ށ߁EEEEE ځہ܁݁ށ߁EEEEE -EEEEEEEEEE@ EEEEEEEEEE@ -EEEEEEEEEEEEEEEEOPQR EEEEEEEEEEEEEEEEOPQR -STUVWXEEEEEEE`abcdef STUVWXEEEEEEE`abcdef -ghijklmnopqrstuvwxyE ghijklmnopqrstuvwxyE -EEEEE EEEEE -EEEEEEEEE EEEEEEEEE -E E -ÂĂ ÂĂ -ƂǂȂɂʂ˂̂͂ςЂт҂ӂԂՂւׂ ƂǂȂɂʂ˂̂͂ςЂт҂ӂԂՂւׂ -ڂۂ܂݂ނ߂ ڂۂ܂݂ނ߂ -EEEEEEEEEEEEEEEE EEEEEEEEEEEEEEEE -E@ABCDEFGHIJKLMNOPQR E@ABCDEFGHIJKLMNOPQR -STUVWXYZ[\]^_`abcdef STUVWXYZ[\]^_`abcdef -ghijklmnopqrstuvwxyz ghijklmnopqrstuvwxyz -{|}~ {|}~ -EEEEEEEEEEEEE EEEEEEEEEEEEE -E E -EEEEEEEEÃă EEEEEEEEÃă -ƃǃȃɃʃ˃̃̓σЃу҃ӃԃՃցEEE ƃǃȃɃʃ˃̃̓σЃу҃ӃԃՃցEEE -EEEEEEEEEEEEEEEEEEEE EEEEEEEEEEEEEEEEEEEE -EEEEEEEEEEEEEEEEEEEE EEEEEEEEEEEEEEEEEEEE -EEEEEEEEEEEEEEEEEEEE EEEEEEEEEEEEEEEEEEEE -E@ABCDEFGHIJKLMNOPQR E@ABCDEFGHIJKLMNOPQR -STUVWXYZ[\]^_`EEEEEE STUVWXYZ[\]^_`EEEEEE -EEEEEEEEEpqrstuvwxyz EEEEEEEEEpqrstuvwxyz -{|}~ {|}~ -EEEEEEEEEEEEEEEEEE EEEEEEEEEEEEEEEEEE -E E -EEEEEEE EEEEEEE -EEEEEEEEEEEEEEEEEEEE EEEEEEEEEEEEEEEEEEEE -EEEEEEEEEEEEEEEEEEEE EEEEEEEEEEEEEEEEEEEE -EEEEEEEEEEEEEEEEEEEE EEEEEEEEEEEEEEEEEEEE -E E -ÈĈ ÈĈ -ƈLjȈɈʈˈ͈̈ΈψЈш҈ӈԈՈֈ؈ ƈLjȈɈʈˈ͈̈ΈψЈш҈ӈԈՈֈ؈ -ڈۈ܈݈ވ߈ ڈۈ܈݈ވ߈ -EEEEE EEEEE -E@ABCDEFGHIJKLMNOPQR E@ABCDEFGHIJKLMNOPQR -STUVWXYZ[\]^_`abcdef STUVWXYZ[\]^_`abcdef -ghijklmnopqrEEEEEEEE ghijklmnopqrEEEEEEEE -EEEEEEEEEEEEEEEEEEEE EEEEEEEEEEEEEEEEEEEE -EEEEEEEEEEEEEEEEEEEE EEEEEEEEEEEEEEEEEEEE -E E -ØĘ ØĘ -ƘǘȘɘʘ˘̘͘ΘϘИјҘӘԘ֘טؘ ƘǘȘɘʘ˘̘͘ΘϘИјҘӘԘ֘טؘ -ژۘܘݘޘߘ ژۘܘݘޘߘ -EEEEE EEEEE -E@ABCDEFGHIJKLMNOPQR E@ABCDEFGHIJKLMNOPQR -STUVWXYZ[\]^_`abcdef STUVWXYZ[\]^_`abcdef -ghijklmnopqrstuvwxyz ghijklmnopqrstuvwxyz -{|}~ {|}~ -ꞁEEEEE ꞁEEEEE -E꤁EEEEEEEEEEEEE E꤁EEEEEEEEEEEEE -EEEEEEEEEEEEEEEEEEEE EEEEEEEEEEEEEEEEEEEE -EEEEEEEEEEEEEEEEEEEE EEEEEEEEEEEEEEEEEEEE -EEEEEEEEEEEEEEEEEEEE EEEEEEEEEEEEEEEEEEEE -EEEEEEEEEEEEEEEEEEEE EEEEEEEEEEEEEEEEEEEE -SELECT `bP`, CONVERT(`bP` using ucs2) FROM `sPP`; -bP CONVERT(`bP` using ucs2) -@@ABCDEFGHIJKLMNOPQR @@ABCDEFGHIJKLMNOPQR -STUVWXYZ[\]^_`abcdef STUVWXYZ[\]^_`abcdef -ghijklmnopqrstuvwxyz ghijklmnopqrstuvwxyz -{]}~ {]}~ -EEEEE EEEEE -EEEEEE EEEEEE -EEEEEEEEEEEE EEEEEEEEEEEE -EEȁɁʁˁ́́EEEEEEEEEEE EEȁɁʁˁ́́EEEEEEEEEEE -ځہ܁݁ށ߁EEEEE ځہ܁݁ށ߁EEEEE -EEEEEEEEEE@ EEEEEEEEEE@ -EEEEEEEEEEEEEEEEOPQR EEEEEEEEEEEEEEEEOPQR -STUVWXEEEEEEE`abcdef STUVWXEEEEEEE`abcdef -ghijklmnopqrstuvwxyE ghijklmnopqrstuvwxyE -EEEEE EEEEE -EEEEEEEEE EEEEEEEEE -E E -ÂĂ ÂĂ -ƂǂȂɂʂ˂̂͂ςЂт҂ӂԂՂւׂ ƂǂȂɂʂ˂̂͂ςЂт҂ӂԂՂւׂ -ڂۂ܂݂ނ߂ ڂۂ܂݂ނ߂ -EEEEEEEEEEEEEEEE EEEEEEEEEEEEEEEE -E@ABCDEFGHIJKLMNOPQR E@ABCDEFGHIJKLMNOPQR -STUVWXYZ[\]^_`abcdef STUVWXYZ[\]^_`abcdef -ghijklmnopqrstuvwxyz ghijklmnopqrstuvwxyz -{|}~ {|}~ -EEEEEEEEEEEEE EEEEEEEEEEEEE -E E -EEEEEEEEÃă EEEEEEEEÃă -ƃǃȃɃʃ˃̃̓σЃу҃ӃԃՃցEEE ƃǃȃɃʃ˃̃̓σЃу҃ӃԃՃցEEE -EEEEEEEEEEEEEEEEEEEE EEEEEEEEEEEEEEEEEEEE -EEEEEEEEEEEEEEEEEEEE EEEEEEEEEEEEEEEEEEEE -EEEEEEEEEEEEEEEEEEEE EEEEEEEEEEEEEEEEEEEE -E@ABCDEFGHIJKLMNOPQR E@ABCDEFGHIJKLMNOPQR -STUVWXYZ[\]^_`EEEEEE STUVWXYZ[\]^_`EEEEEE -EEEEEEEEEpqrstuvwxyz EEEEEEEEEpqrstuvwxyz -{|}~ {|}~ -EEEEEEEEEEEEEEEEEE EEEEEEEEEEEEEEEEEE -E E -EEEEEEE EEEEEEE -EEEEEEEEEEEEEEEEEEEE EEEEEEEEEEEEEEEEEEEE -EEEEEEEEEEEEEEEEEEEE EEEEEEEEEEEEEEEEEEEE -EEEEEEEEEEEEEEEEEEEE EEEEEEEEEEEEEEEEEEEE -E E -ÈĈ ÈĈ -ƈLjȈɈʈˈ͈̈ΈψЈш҈ӈԈՈֈ؈ ƈLjȈɈʈˈ͈̈ΈψЈш҈ӈԈՈֈ؈ -ڈۈ܈݈ވ߈ ڈۈ܈݈ވ߈ -EEEEE EEEEE -E@ABCDEFGHIJKLMNOPQR E@ABCDEFGHIJKLMNOPQR -STUVWXYZ[\]^_`abcdef STUVWXYZ[\]^_`abcdef -ghijklmnopqrEEEEEEEE ghijklmnopqrEEEEEEEE -EEEEEEEEEEEEEEEEEEEE EEEEEEEEEEEEEEEEEEEE -EEEEEEEEEEEEEEEEEEEE EEEEEEEEEEEEEEEEEEEE -E E -ØĘ ØĘ -ƘǘȘɘʘ˘̘͘ΘϘИјҘӘԘ֘טؘ ƘǘȘɘʘ˘̘͘ΘϘИјҘӘԘ֘טؘ -ژۘܘݘޘߘ ژۘܘݘޘߘ -EEEEE EEEEE -E@ABCDEFGHIJKLMNOPQR E@ABCDEFGHIJKLMNOPQR -STUVWXYZ[\]^_`abcdef STUVWXYZ[\]^_`abcdef -ghijklmnopqrstuvwxyz ghijklmnopqrstuvwxyz -{|}~ {|}~ -ꞁEEEEE ꞁEEEEE -E꤁EEEEEEEEEEEEE E꤁EEEEEEEEEEEEE -EEEEEEEEEEEEEEEEEEEE EEEEEEEEEEEEEEEEEEEE -EEEEEEEEEEEEEEEEEEEE EEEEEEEEEEEEEEEEEEEE -EEEEEEEEEEEEEEEEEEEE EEEEEEEEEEEEEEEEEEEE -EEEEEEEEEEEEEEEEEEEE EEEEEEEEEEEEEEEEEEEE -SELECT `bP`, CONVERT(`bP` using ujis) FROM `sPP`; -bP CONVERT(`bP` using ujis) -@@ABCDEFGHIJKLMNOPQR @@ABCDEFGHIJKLMNOPQR -STUVWXYZ[\]^_`abcdef STUVWXYZ[\]^_`abcdef -ghijklmnopqrstuvwxyz ghijklmnopqrstuvwxyz -{]}~ {]}~ -EEEEE EEEEE -EEEEEE EEEEEE -EEEEEEEEEEEE EEEEEEEEEEEE -EEȁɁʁˁ́́EEEEEEEEEEE EEȁɁʁˁ́́EEEEEEEEEEE -ځہ܁݁ށ߁EEEEE ځہ܁݁ށ߁EEEEE -EEEEEEEEEE@ EEEEEEEEEE@ -EEEEEEEEEEEEEEEEOPQR EEEEEEEEEEEEEEEEOPQR -STUVWXEEEEEEE`abcdef STUVWXEEEEEEE`abcdef -ghijklmnopqrstuvwxyE ghijklmnopqrstuvwxyE -EEEEE EEEEE -EEEEEEEEE EEEEEEEEE -E E -ÂĂ ÂĂ -ƂǂȂɂʂ˂̂͂ςЂт҂ӂԂՂւׂ ƂǂȂɂʂ˂̂͂ςЂт҂ӂԂՂւׂ -ڂۂ܂݂ނ߂ ڂۂ܂݂ނ߂ -EEEEEEEEEEEEEEEE EEEEEEEEEEEEEEEE -E@ABCDEFGHIJKLMNOPQR E@ABCDEFGHIJKLMNOPQR -STUVWXYZ[\]^_`abcdef STUVWXYZ[\]^_`abcdef -ghijklmnopqrstuvwxyz ghijklmnopqrstuvwxyz -{|}~ {|}~ -EEEEEEEEEEEEE EEEEEEEEEEEEE -E E -EEEEEEEEÃă EEEEEEEEÃă -ƃǃȃɃʃ˃̃̓σЃу҃ӃԃՃցEEE ƃǃȃɃʃ˃̃̓σЃу҃ӃԃՃցEEE -EEEEEEEEEEEEEEEEEEEE EEEEEEEEEEEEEEEEEEEE -EEEEEEEEEEEEEEEEEEEE EEEEEEEEEEEEEEEEEEEE -EEEEEEEEEEEEEEEEEEEE EEEEEEEEEEEEEEEEEEEE -E@ABCDEFGHIJKLMNOPQR E@ABCDEFGHIJKLMNOPQR -STUVWXYZ[\]^_`EEEEEE STUVWXYZ[\]^_`EEEEEE -EEEEEEEEEpqrstuvwxyz EEEEEEEEEpqrstuvwxyz -{|}~ {|}~ -EEEEEEEEEEEEEEEEEE EEEEEEEEEEEEEEEEEE -E E -EEEEEEE EEEEEEE -EEEEEEEEEEEEEEEEEEEE EEEEEEEEEEEEEEEEEEEE -EEEEEEEEEEEEEEEEEEEE EEEEEEEEEEEEEEEEEEEE -EEEEEEEEEEEEEEEEEEEE EEEEEEEEEEEEEEEEEEEE -E E -ÈĈ ÈĈ -ƈLjȈɈʈˈ͈̈ΈψЈш҈ӈԈՈֈ؈ ƈLjȈɈʈˈ͈̈ΈψЈш҈ӈԈՈֈ؈ -ڈۈ܈݈ވ߈ ڈۈ܈݈ވ߈ -EEEEE EEEEE -E@ABCDEFGHIJKLMNOPQR E@ABCDEFGHIJKLMNOPQR -STUVWXYZ[\]^_`abcdef STUVWXYZ[\]^_`abcdef -ghijklmnopqrEEEEEEEE ghijklmnopqrEEEEEEEE -EEEEEEEEEEEEEEEEEEEE EEEEEEEEEEEEEEEEEEEE -EEEEEEEEEEEEEEEEEEEE EEEEEEEEEEEEEEEEEEEE -E E -ØĘ ØĘ -ƘǘȘɘʘ˘̘͘ΘϘИјҘӘԘ֘טؘ ƘǘȘɘʘ˘̘͘ΘϘИјҘӘԘ֘טؘ -ژۘܘݘޘߘ ژۘܘݘޘߘ -EEEEE EEEEE -E@ABCDEFGHIJKLMNOPQR E@ABCDEFGHIJKLMNOPQR -STUVWXYZ[\]^_`abcdef STUVWXYZ[\]^_`abcdef -ghijklmnopqrstuvwxyz ghijklmnopqrstuvwxyz -{|}~ {|}~ -ꞁEEEEE ꞁEEEEE -E꤁EEEEEEEEEEEEE E꤁EEEEEEEEEEEEE -EEEEEEEEEEEEEEEEEEEE EEEEEEEEEEEEEEEEEEEE -EEEEEEEEEEEEEEEEEEEE EEEEEEEEEEEEEEEEEEEE -EEEEEEEEEEEEEEEEEEEE EEEEEEEEEEEEEEEEEEEE -EEEEEEEEEEEEEEEEEEEE EEEEEEEEEEEEEEEEEEEE -SELECT `bP`, CONVERT(`bP` using utf8) FROM `sPQ`; -bP CONVERT(`bP` using utf8) -\\\\\\\\\\\\\\\\\\\\ \\\\\\\\\\\\\\\\\\\\ -SELECT `bP`, CONVERT(`bP` using ucs2) FROM `sPQ`; -bP CONVERT(`bP` using ucs2) -\\\\\\\\\\\\\\\\\\\\ \\\\\\\\\\\\\\\\\\\\ -SELECT `bP`, CONVERT(`bP` using ujis) FROM `sPQ`; -bP CONVERT(`bP` using ujis) -\\\\\\\\\\\\\\\\\\\\ \\\\\\\\\\\\\\\\\\\\ drop table `sP`; drop table `sQ`; drop table `sR`; @@ -1041,6 +783,3 @@ drop table `sU`; drop table `sV`; drop table `sW`; drop table `sX`; -drop table `sPO`; -drop table `sPP`; -drop table `sPQ`; diff --git a/mysql-test/suite/jp/r/jp_convert_ucs2.result b/mysql-test/suite/jp/r/jp_convert_ucs2.result index 92c2032993e..5d5b0761ad8 100644 --- a/mysql-test/suite/jp/r/jp_convert_ucs2.result +++ b/mysql-test/suite/jp/r/jp_convert_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 `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engi CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = myisam; CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = myisam; CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = myisam; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = bdb; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = bdb; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = bdb; +CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = MEMORY; INSERT INTO `ԣ` VALUES ('PQRSTUVWXYZ[\\]^_') ,(' ') @@ -91,28 +85,6 @@ INSERT INTO `ԣ` VALUES ,('') ,('ÏďŏƏ') ,('ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ'); -INSERT INTO `ԣ` VALUES -('PQRSTUVWXYZ[\\]^_') -,(' ') -,('') -,('ÎĎŎƎǎȎɎʎˎ͎̎Ύ') -,('ЎюҎӎԎՎ֎؎َڎێݎގ'); -INSERT INTO `ԣ` VALUES -('¡áġšơ') -,('ȡɡʡˡ̡͡ΡϡСѡҡӡԡա֡סء١ڡ') -,('') -,('') -,('') -,('СТУФХЦЧШЩЪЫЬЭЮЯабвг') -,(''); -INSERT INTO `ԣ` VALUES -('Ïġ') -,('ÏďŏƏ') -,('ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ') -,('ݏޏߏᏰ⏰㏰䏰台揰珰菰鏰ꏰ돰쏰폰') -,('') -,('ÏďŏƏ') -,('ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ'); SELECT `ã`, CONVERT(`ã` using utf8) FROM `ԣ`; ã CONVERT(`ã` using utf8) @@ -338,81 +310,6 @@ SELECT `ã`, CONVERT(`ã` using sjis) FROM `ԣ`; ??????????????????? ÏďŏƏ ???????????????????? ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ ???????????????????? -SELECT `ã`, CONVERT(`ã` using utf8) FROM `ԣ`; -ã CONVERT(`ã` using utf8) -PQRSTUVWXYZ[\]^_ PQRSTUVWXYZ[\]^_ - - -ÎĎŎƎǎȎɎʎˎ͎̎Ύ ÎĎŎƎǎȎɎʎˎ͎̎Ύ -ЎюҎӎԎՎ֎؎َڎێݎގ ЎюҎӎԎՎ֎؎َڎێݎގ -SELECT `ã`, CONVERT(`ã` using ucs2) FROM `ԣ`; -ã CONVERT(`ã` using ucs2) -PQRSTUVWXYZ[\]^_ PQRSTUVWXYZ[\]^_ - - -ÎĎŎƎǎȎɎʎˎ͎̎Ύ ÎĎŎƎǎȎɎʎˎ͎̎Ύ -ЎюҎӎԎՎ֎؎َڎێݎގ ЎюҎӎԎՎ֎؎َڎێݎގ -SELECT `ã`, CONVERT(`ã` using sjis) FROM `ԣ`; -ã CONVERT(`ã` using sjis) -PQRSTUVWXYZ[\]^_ PQRSTUVWXYZ[\]^_ - - -ÎĎŎƎǎȎɎʎˎ͎̎Ύ ÎĎŎƎǎȎɎʎˎ͎̎Ύ -ЎюҎӎԎՎ֎؎َڎێݎގ ЎюҎӎԎՎ֎؎َڎێݎގ -SELECT `ã`, CONVERT(`ã` using utf8) FROM `ԣ`; -ã CONVERT(`ã` using utf8) -\¡áġšơ \¡áġšơ -ȡɡʡˡ̡͡ΡϡСѡҡӡԡա֡סء١ڡ ȡɡʡˡ̡͡ΡϡСѡҡӡԡա֡סء١ڡ - - - -СТУФХЦЧШЩЪЫЬЭЮЯабвг СТУФХЦЧШЩЪЫЬЭЮЯабвг - -SELECT `ã`, CONVERT(`ã` using ucs2) FROM `ԣ`; -ã CONVERT(`ã` using ucs2) -\¡áġšơ \¡áġšơ -ȡɡʡˡ̡͡ΡϡСѡҡӡԡա֡סء١ڡ ȡɡʡˡ̡͡ΡϡСѡҡӡԡա֡סء١ڡ - - - -СТУФХЦЧШЩЪЫЬЭЮЯабвг СТУФХЦЧШЩЪЫЬЭЮЯабвг - -SELECT `ã`, CONVERT(`ã` using sjis) FROM `ԣ`; -ã CONVERT(`ã` using sjis) -\¡áġšơ \¡áġšơ -ȡɡʡˡ̡͡ΡϡСѡҡӡԡա֡סء١ڡ ȡɡʡˡ̡͡ΡϡСѡҡӡԡա֡סء١ڡ - - - -СТУФХЦЧШЩЪЫЬЭЮЯабвг СТУФХЦЧШЩЪЫЬЭЮЯабвг - -SELECT `ã`, CONVERT(`ã` using utf8) FROM `ԣ`; -ã CONVERT(`ã` using utf8) -~Ïġ ~Ïġ -ÏďŏƏ ÏďŏƏ -ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ -ݏޏߏᏰ⏰㏰䏰台揰珰菰鏰ꏰ돰쏰폰 ݏޏߏᏰ⏰㏰䏰台揰珰菰鏰ꏰ돰쏰폰 - -ÏďŏƏ ÏďŏƏ -ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ -SELECT `ã`, CONVERT(`ã` using ucs2) FROM `ԣ`; -ã CONVERT(`ã` using ucs2) -~Ïġ ~Ïġ -ÏďŏƏ ÏďŏƏ -ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ -ݏޏߏᏰ⏰㏰䏰台揰珰菰鏰ꏰ돰쏰폰 ݏޏߏᏰ⏰㏰䏰台揰珰菰鏰ꏰ돰쏰폰 - -ÏďŏƏ ÏďŏƏ -ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ -SELECT `ã`, CONVERT(`ã` using sjis) FROM `ԣ`; -ã CONVERT(`ã` using sjis) -~Ïġ ??~????? -ÏďŏƏ ???????????????????? -ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ ???????????????????? -ݏޏߏᏰ⏰㏰䏰台揰珰菰鏰ꏰ돰쏰폰 ???????????????????? - ??????????????????? -ÏďŏƏ ???????????????????? -ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ ???????????????????? drop table `ԣ`; drop table `ԣ`; drop table `ԣ`; @@ -422,6 +319,3 @@ drop table `ԣ`; drop table `ԣ`; drop table `ԣ`; drop table `ԣ`; -drop table `ԣ`; -drop table `ԣ`; -drop table `ԣ`; diff --git a/mysql-test/suite/jp/r/jp_convert_ujis.result b/mysql-test/suite/jp/r/jp_convert_ujis.result index 55f2ab0aea3..314a9e95086 100644 --- a/mysql-test/suite/jp/r/jp_convert_ujis.result +++ b/mysql-test/suite/jp/r/jp_convert_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), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = innodb; @@ -18,12 +15,9 @@ CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engi CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = myisam; CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = myisam; CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = myisam; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = bdb; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = bdb; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = bdb; +CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) 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 `ã`, CONVERT(`ã` using utf8) FROM `ԣ`; ã CONVERT(`ã` using utf8) !"#$%&'()*+,-./ !"#$%&'()*+,-./ @@ -1134,372 +1125,6 @@ SELECT `ã`, CONVERT(`ã` using sjis) FROM `ԣ`; ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ ???????????????????? ݏޏߏ㡦 ???????? -SELECT `ã`, CONVERT(`ã` using utf8) FROM `ԣ`; -ã CONVERT(`ã` using utf8) - !"#$%&'()*+,-./ !"#$%&'()*+,-./ -0123456789:;<=>? 0123456789:;<=>? -@ABCDEFGHIJKLMNO @ABCDEFGHIJKLMNO -PQRSTUVWXYZ[\]^_ PQRSTUVWXYZ[\]^_ -abcdefghijklmno abcdefghijklmno -pqrstuvwxyz{|}~ pqrstuvwxyz{|}~ - - -ÎĎŎƎǎȎɎʎˎ͎̎Ύ ÎĎŎƎǎȎɎʎˎ͎̎Ύ -ЎюҎӎԎՎ֎؎َڎێݎގ ЎюҎӎԎՎ֎؎َڎێݎގ -SELECT `ã`, CONVERT(`ã` using ucs2) FROM `ԣ`; -ã CONVERT(`ã` using ucs2) - !"#$%&'()*+,-./ !"#$%&'()*+,-./ -0123456789:;<=>? 0123456789:;<=>? -@ABCDEFGHIJKLMNO @ABCDEFGHIJKLMNO -PQRSTUVWXYZ[\]^_ PQRSTUVWXYZ[\]^_ -abcdefghijklmno abcdefghijklmno -pqrstuvwxyz{|}~ pqrstuvwxyz{|}~ - - -ÎĎŎƎǎȎɎʎˎ͎̎Ύ ÎĎŎƎǎȎɎʎˎ͎̎Ύ -ЎюҎӎԎՎ֎؎َڎێݎގ ЎюҎӎԎՎ֎؎َڎێݎގ -SELECT `ã`, CONVERT(`ã` using sjis) FROM `ԣ`; -ã CONVERT(`ã` using sjis) - !"#$%&'()*+,-./ !"#$%&'()*+,-./ -0123456789:;<=>? 0123456789:;<=>? -@ABCDEFGHIJKLMNO @ABCDEFGHIJKLMNO -PQRSTUVWXYZ[\]^_ PQRSTUVWXYZ[\]^_ -abcdefghijklmno abcdefghijklmno -pqrstuvwxyz{|}~ pqrstuvwxyz{|}~ - - -ÎĎŎƎǎȎɎʎˎ͎̎Ύ ÎĎŎƎǎȎɎʎˎ͎̎Ύ -ЎюҎӎԎՎ֎؎َڎێݎގ ЎюҎӎԎՎ֎؎َڎێݎގ -SELECT `ã`, CONVERT(`ã` using utf8) FROM `ԣ`; -ã CONVERT(`ã` using utf8) - -¡áġšơ \¡áġšơ -ȡɡʡˡ̡͡ΡϡСѡҡӡԡա֡סء١ڡ ȡɡʡˡ̡͡ΡϡСѡҡӡԡա֡סء١ڡ -ܡޡߡ ܡޡߡ - - - -ʢˢ̢͢ϢС ʢˢ̢͢ϢС -ܢݢޢߢꡦ ܢݢޢߢꡦ - - -£ãģţƣ £ãģţƣ -ȣɣʣˣ̣ͣΣϣУѣңӣԣգ֣ףأ٣ڡ ȣɣʣˣ̣ͣΣϣУѣңӣԣգ֣ףأ٣ڡ - - - -¤äĤŤƤ ¤äĤŤƤ -Ȥɤʤˤ̤ͤΤϤФѤҤӤԤդ֤פؤ٤ڤ Ȥɤʤˤ̤ͤΤϤФѤҤӤԤդ֤פؤ٤ڤ -ܤݤޤߤ ܤݤޤߤ - - -¥åĥťƥ ¥åĥťƥ -ȥɥʥ˥̥ͥΥϥХѥҥӥԥե֥ץإ٥ڥ ȥɥʥ˥̥ͥΥϥХѥҥӥԥե֥ץإ٥ڥ -ܥݥޥߥ ܥݥޥߥ - - -¦æĦŦƦ ¦æĦŦƦ -Ȧɦʦ˦̦ͦΦϦЦѦҦӦԦզ֦צء Ȧɦʦ˦̦ͦΦϦЦѦҦӦԦզ֦צء - - - - - -ѧҧӧԧէ֧קا٧ڧ ѧҧӧԧէ֧קا٧ڧ -ܧݧާߧ ܧݧާߧ - - - - - - - -°ðİŰư °ðİŰư -Ȱɰʰ˰̰ͰΰϰаѰҰӰհְװذٰڰ Ȱɰʰ˰̰ͰΰϰаѰҰӰհְװذٰڰ -ܰݰް߰ ܰݰް߰ - -ϡϢϣϤϥϦϧϨϩϪϫϬϭϮϯϰϱϲϳ ϡϢϣϤϥϦϧϨϩϪϫϬϭϮϯϰϱϲϳ -ϴϵ϶ϷϸϹϺϻϼϽϾϿ ϴϵ϶ϷϸϹϺϻϼϽϾϿ -ӡ ӡ - - -СТУФХЦЧШЩЪЫЬЭЮЯабвг СТУФХЦЧШЩЪЫЬЭЮЯабвг -дежзийклмноп дежзийклмноп - - - - - - - - - - - - - -SELECT `ã`, CONVERT(`ã` using ucs2) FROM `ԣ`; -ã CONVERT(`ã` using ucs2) - -¡áġšơ \¡áġšơ -ȡɡʡˡ̡͡ΡϡСѡҡӡԡա֡סء١ڡ ȡɡʡˡ̡͡ΡϡСѡҡӡԡա֡סء١ڡ -ܡޡߡ ܡޡߡ - - - -ʢˢ̢͢ϢС ʢˢ̢͢ϢС -ܢݢޢߢꡦ ܢݢޢߢꡦ - - -£ãģţƣ £ãģţƣ -ȣɣʣˣ̣ͣΣϣУѣңӣԣգ֣ףأ٣ڡ ȣɣʣˣ̣ͣΣϣУѣңӣԣգ֣ףأ٣ڡ - - - -¤äĤŤƤ ¤äĤŤƤ -Ȥɤʤˤ̤ͤΤϤФѤҤӤԤդ֤פؤ٤ڤ Ȥɤʤˤ̤ͤΤϤФѤҤӤԤդ֤פؤ٤ڤ -ܤݤޤߤ ܤݤޤߤ - - -¥åĥťƥ ¥åĥťƥ -ȥɥʥ˥̥ͥΥϥХѥҥӥԥե֥ץإ٥ڥ ȥɥʥ˥̥ͥΥϥХѥҥӥԥե֥ץإ٥ڥ -ܥݥޥߥ ܥݥޥߥ - - -¦æĦŦƦ ¦æĦŦƦ -Ȧɦʦ˦̦ͦΦϦЦѦҦӦԦզ֦צء Ȧɦʦ˦̦ͦΦϦЦѦҦӦԦզ֦צء - - - - - -ѧҧӧԧէ֧קا٧ڧ ѧҧӧԧէ֧קا٧ڧ -ܧݧާߧ ܧݧާߧ - - - - - - - -°ðİŰư °ðİŰư -Ȱɰʰ˰̰ͰΰϰаѰҰӰհְװذٰڰ Ȱɰʰ˰̰ͰΰϰаѰҰӰհְװذٰڰ -ܰݰް߰ ܰݰް߰ - -ϡϢϣϤϥϦϧϨϩϪϫϬϭϮϯϰϱϲϳ ϡϢϣϤϥϦϧϨϩϪϫϬϭϮϯϰϱϲϳ -ϴϵ϶ϷϸϹϺϻϼϽϾϿ ϴϵ϶ϷϸϹϺϻϼϽϾϿ -ӡ ӡ - - -СТУФХЦЧШЩЪЫЬЭЮЯабвг СТУФХЦЧШЩЪЫЬЭЮЯабвг -дежзийклмноп дежзийклмноп - - - - - - - - - - - - - -SELECT `ã`, CONVERT(`ã` using sjis) FROM `ԣ`; -ã CONVERT(`ã` using sjis) - -¡áġšơ \¡áġšơ -ȡɡʡˡ̡͡ΡϡСѡҡӡԡա֡סء١ڡ ȡɡʡˡ̡͡ΡϡСѡҡӡԡա֡סء١ڡ -ܡޡߡ ܡޡߡ - - - -ʢˢ̢͢ϢС ʢˢ̢͢ϢС -ܢݢޢߢꡦ ܢݢޢߢꡦ - - -£ãģţƣ £ãģţƣ -ȣɣʣˣ̣ͣΣϣУѣңӣԣգ֣ףأ٣ڡ ȣɣʣˣ̣ͣΣϣУѣңӣԣգ֣ףأ٣ڡ - - - -¤äĤŤƤ ¤äĤŤƤ -Ȥɤʤˤ̤ͤΤϤФѤҤӤԤդ֤פؤ٤ڤ Ȥɤʤˤ̤ͤΤϤФѤҤӤԤդ֤פؤ٤ڤ -ܤݤޤߤ ܤݤޤߤ - - -¥åĥťƥ ¥åĥťƥ -ȥɥʥ˥̥ͥΥϥХѥҥӥԥե֥ץإ٥ڥ ȥɥʥ˥̥ͥΥϥХѥҥӥԥե֥ץإ٥ڥ -ܥݥޥߥ ܥݥޥߥ - - -¦æĦŦƦ ¦æĦŦƦ -Ȧɦʦ˦̦ͦΦϦЦѦҦӦԦզ֦צء Ȧɦʦ˦̦ͦΦϦЦѦҦӦԦզ֦צء - - - - - -ѧҧӧԧէ֧קا٧ڧ ѧҧӧԧէ֧קا٧ڧ -ܧݧާߧ ܧݧާߧ - - - - - - - -°ðİŰư °ðİŰư -Ȱɰʰ˰̰ͰΰϰаѰҰӰհְװذٰڰ Ȱɰʰ˰̰ͰΰϰаѰҰӰհְװذٰڰ -ܰݰް߰ ܰݰް߰ - -ϡϢϣϤϥϦϧϨϩϪϫϬϭϮϯϰϱϲϳ ϡϢϣϤϥϦϧϨϩϪϫϬϭϮϯϰϱϲϳ -ϴϵ϶ϷϸϹϺϻϼϽϾϿ ϴϵ϶ϷϸϹϺϻϼϽϾϿ -ӡ ӡ - - -СТУФХЦЧШЩЪЫЬЭЮЯабвг СТУФХЦЧШЩЪЫЬЭЮЯабвг -дежзийклмноп дежзийклмноп - - - - - - - - - - - - - -SELECT `ã`, CONVERT(`ã` using utf8) FROM `ԣ`; -ã CONVERT(`ã` using utf8) - -Ïġ ~Ïġ - -돢쏢폢 돢쏢폢 - - - - -Ꮶ⏦㏦䏦塦硦鏦ꡦ졦 Ꮶ⏦㏦䏦塦硦鏦ꡦ졦 - - -ÏďŏƏ ÏďŏƏ -ȏɏʏˏ̏͏Ρ ȏɏʏˏ̏͏Ρ - - - -ÏďŏƏ ÏďŏƏ -ȏɏʏˏ̏͏ΏϏС ȏɏʏˏ̏͏ΏϏС - - - -ÏďŏƏ ÏďŏƏ -ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ -ݏޏߏᏪ⏪㏪䏪只揪珪菪鏪ꏪ돪쏪폪 ݏޏߏᏪ⏪㏪䏪只揪珪菪鏪ꏪ돪쏪폪 - - -áŏƏ áŏƏ -ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ -ݏޏߏᏫ⏫㏫䏫叫揫珫菫鏫ꏫ돫쏫폫 ݏޏߏᏫ⏫㏫䏫叫揫珫菫鏫ꏫ돫쏫폫 - - -ÏďŏƏ ÏďŏƏ -ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ -ݏޏߏᏰ⏰㏰䏰台揰珰菰鏰ꏰ돰쏰폰 ݏޏߏᏰ⏰㏰䏰台揰珰菰鏰ꏰ돰쏰폰 - - -ÏďŏƏ ÏďŏƏ -ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ -ݏޏߏ㡦 ݏޏߏ㡦 - -SELECT `ã`, CONVERT(`ã` using ucs2) FROM `ԣ`; -ã CONVERT(`ã` using ucs2) - -Ïġ ~Ïġ - -돢쏢폢 돢쏢폢 - - - - -Ꮶ⏦㏦䏦塦硦鏦ꡦ졦 Ꮶ⏦㏦䏦塦硦鏦ꡦ졦 - - -ÏďŏƏ ÏďŏƏ -ȏɏʏˏ̏͏Ρ ȏɏʏˏ̏͏Ρ - - - -ÏďŏƏ ÏďŏƏ -ȏɏʏˏ̏͏ΏϏС ȏɏʏˏ̏͏ΏϏС - - - -ÏďŏƏ ÏďŏƏ -ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ -ݏޏߏᏪ⏪㏪䏪只揪珪菪鏪ꏪ돪쏪폪 ݏޏߏᏪ⏪㏪䏪只揪珪菪鏪ꏪ돪쏪폪 - - -áŏƏ áŏƏ -ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ -ݏޏߏᏫ⏫㏫䏫叫揫珫菫鏫ꏫ돫쏫폫 ݏޏߏᏫ⏫㏫䏫叫揫珫菫鏫ꏫ돫쏫폫 - - -ÏďŏƏ ÏďŏƏ -ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ -ݏޏߏᏰ⏰㏰䏰台揰珰菰鏰ꏰ돰쏰폰 ݏޏߏᏰ⏰㏰䏰台揰珰菰鏰ꏰ돰쏰폰 - - -ÏďŏƏ ÏďŏƏ -ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ -ݏޏߏ㡦 ݏޏߏ㡦 - -SELECT `ã`, CONVERT(`ã` using sjis) FROM `ԣ`; -ã CONVERT(`ã` using sjis) - ????? -Ïġ ??~????? - -돢쏢폢 ????? - ?? - - - -Ꮶ⏦㏦䏦塦硦鏦ꡦ졦 ????????? - ???????????? - -ÏďŏƏ ?????? -ȏɏʏˏ̏͏Ρ ??????? - - ????????????? - ??????????? -ÏďŏƏ ??????? -ȏɏʏˏ̏͏ΏϏС ????????? - - - ??????????????????? -ÏďŏƏ ??????????????????? -ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ ???????????????????? -ݏޏߏᏪ⏪㏪䏪只揪珪菪鏪ꏪ돪쏪폪 ???????????????????? - ???????? - ??????????????????? -áŏƏ ?????????????????? -ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ ???????????????????? -ݏޏߏᏫ⏫㏫䏫叫揫珫菫鏫ꏫ돫쏫폫 ???????????????????? - ???????? - ??????????????????? -ÏďŏƏ ???????????????????? -ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ ???????????????????? -ݏޏߏᏰ⏰㏰䏰台揰珰菰鏰ꏰ돰쏰폰 ???????????????????? - ??????????????? - ??????????????????? -ÏďŏƏ ???????????????????? -ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ ???????????????????? -ݏޏߏ㡦 ???????? - drop table `ԣ`; drop table `ԣ`; drop table `ԣ`; @@ -1509,6 +1134,3 @@ drop table `ԣ`; drop table `ԣ`; drop table `ԣ`; drop table `ԣ`; -drop table `ԣ`; -drop table `ԣ`; -drop table `ԣ`; diff --git a/mysql-test/suite/jp/r/jp_convert_utf8.result b/mysql-test/suite/jp/r/jp_convert_utf8.result index 505d6c1cebf..5a47d5d687a 100644 --- a/mysql-test/suite/jp/r/jp_convert_utf8.result +++ b/mysql-test/suite/jp/r/jp_convert_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), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = innodb; @@ -18,12 +15,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf CREATE TABLE `Ｔ４` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam; CREATE TABLE `Ｔ５` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam; CREATE TABLE `Ｔ６` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam; -CREATE TABLE `Ｔ７` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ８` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ９` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ１０` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb; -CREATE TABLE `Ｔ１１` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb; -CREATE TABLE `Ｔ１２` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb; +CREATE TABLE `Ｔ７` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ８` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ９` (`Ｃ１` char(20), INDEX(`Ｃ１`)) 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 `Ｃ１`, CONVERT(`Ｃ１` using ujis) FROM `Ｔ１`; Ｃ１ CONVERT(`Ｃ１` using ujis) !"#$%&'()*+,-./ !"#$%&'()*+,-./ @@ -1134,372 +1125,6 @@ SELECT `Ｃ１`, CONVERT(`Ｃ１` using sjis) FROM `Ｔ９`; 齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒 ???????????????????? 龔龖龗龞龡龢龣龥・・・・・・・・・・・・ ????????・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -SELECT `Ｃ１`, CONVERT(`Ｃ１` using ujis) FROM `Ｔ１０`; -Ｃ１ CONVERT(`Ｃ１` using ujis) - !"#$%&'()*+,-./ !"#$%&'()*+,-./ -0123456789:;<=>? 0123456789:;<=>? -@ABCDEFGHIJKLMNO @ABCDEFGHIJKLMNO -PQRSTUVWXYZ[\]^_ PQRSTUVWXYZ[\]^_ -abcdefghijklmno abcdefghijklmno -pqrstuvwxyz{|}~ pqrstuvwxyz{|}~ - ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ -ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ -ﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏ ﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏ -ﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ ﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ -SELECT `Ｃ１`, CONVERT(`Ｃ１` using ucs2) FROM `Ｔ１０`; -Ｃ１ CONVERT(`Ｃ１` using ucs2) - !"#$%&'()*+,-./ !"#$%&'()*+,-./ -0123456789:;<=>? 0123456789:;<=>? -@ABCDEFGHIJKLMNO @ABCDEFGHIJKLMNO -PQRSTUVWXYZ[\]^_ PQRSTUVWXYZ[\]^_ -abcdefghijklmno abcdefghijklmno -pqrstuvwxyz{|}~ pqrstuvwxyz{|}~ - ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ -ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ -ﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏ ﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏ -ﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ ﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ -SELECT `Ｃ１`, CONVERT(`Ｃ１` using sjis) FROM `Ｔ１０`; -Ｃ１ CONVERT(`Ｃ１` using sjis) - !"#$%&'()*+,-./ !"#$%&'()*+,-./ -0123456789:;<=>? 0123456789:;<=>? -@ABCDEFGHIJKLMNO @ABCDEFGHIJKLMNO -PQRSTUVWXYZ[\]^_ PQRSTUVWXYZ[\]^_ -abcdefghijklmno abcdefghijklmno -pqrstuvwxyz{|}~ pqrstuvwxyz{|}~ - ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ -ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ -ﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏ ﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏ -ﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ ﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ -SELECT `Ｃ１`, CONVERT(`Ｃ１` using ujis) FROM `Ｔ１１`; -Ｃ１ CONVERT(`Ｃ１` using ujis) - 、。，．・：；？！゛゜´｀¨＾￣＿ヽ 、。，．・：；？！゛゜´｀¨＾￣＿ヽ -ヾゝゞ〃仝々〆〇ー―‐／＼〜‖｜…‥‘’ ヾゝゞ〃仝々〆〇ー―‐／?〜‖｜…‥‘’ -“”（）〔〕［］｛｝〈〉《》「」『』【】 “”（）〔〕［］｛｝〈〉《》「」『』【】 -＋‐±×÷＝≠＜＞≦≧∞∴♂♀°′″℃￥ ＋‐±×÷＝≠＜＞≦≧∞∴♂♀°′″℃￥ -＄¢£％＃＆＊＠§☆★○●◎◇・・・・・ ＄¢£％＃＆＊＠§☆★○●◎◇・・・・・ -・◆□■△▲▽▼※〒→←↑↓〓・・・・・ ・◆□■△▲▽▼※〒→←↑↓〓・・・・・ -・・・・・・∈∋⊆⊇⊂⊃∪∩・・・・・・ ・・・・・・∈∋⊆⊇⊂⊃∪∩・・・・・・ -・・∧∨¬⇒⇔∀∃・・・・・・・・・・・ ・・∧∨¬⇒⇔∀∃・・・・・・・・・・・ -∠⊥⌒∂∇≡≒≪≫√∽∝∵∫∬・・・・・ ∠⊥⌒∂∇≡≒≪≫√∽∝∵∫∬・・・・・ -・・ʼn♯♭♪†‡¶・・・・◯・・・・ ・・ʼn♯♭♪†‡¶・・・・◯・・・・ -・・・・・・・・・・・・・・・・０１２３ ・・・・・・・・・・・・・・・・０１２３ -４５６７８９・・・・・・・ＡＢＣＤＥＦＧ ４５６７８９・・・・・・・ＡＢＣＤＥＦＧ -ＨＩＪＫＬＭＮＯＰＱＲＳＴＵＶＷＸＹＺ・ ＨＩＪＫＬＭＮＯＰＱＲＳＴＵＶＷＸＹＺ・ -・・・・・ａｂｃｄｅｆｇｈｉｊｋｌｍｎｏ ・・・・・ａｂｃｄｅｆｇｈｉｊｋｌｍｎｏ -ｐｑｒｓｔｕｖｗｘｙｚ・・・・・・・・・ ｐｑｒｓｔｕｖｗｘｙｚ・・・・・・・・・ -・ぁあぃいぅうぇえぉおかがきぎくぐけげこ ・ぁあぃいぅうぇえぉおかがきぎくぐけげこ -ごさざしじすずせぜそぞただちぢっつづてで ごさざしじすずせぜそぞただちぢっつづてで -とどなにぬねのはばぱひびぴふぶぷへべぺほ とどなにぬねのはばぱひびぴふぶぷへべぺほ -ぼぽまみむめもゃやゅゆょよらりるれろゎわ ぼぽまみむめもゃやゅゆょよらりるれろゎわ -ゐゑをん・・・・・・・・・・・・・・・・ ゐゑをん・・・・・・・・・・・・・・・・ -・ァアィイゥウェエォオカガキギクグケゲコ ・ァアィイゥウェエォオカガキギクグケゲコ -ゴサザシジスズセゼソゾタダチヂッツヅテデ ゴサザシジスズセゼソゾタダチヂッツヅテデ -トドナニヌネノハバパヒビピフブプヘベペホ トドナニヌネノハバパヒビピフブプヘベペホ -ボポマミムメモャヤュユョヨラリルレロヮワ ボポマミムメモャヤュユョヨラリルレロヮワ -ヰヱヲンヴヵヶ・・・・・・・・・・・・・ ヰヱヲンヴヵヶ・・・・・・・・・・・・・ -・ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤ ・ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤ -ΥΦΧΨΩ・・・・・・・・αβγδεζη ΥΦΧΨΩ・・・・・・・・αβγδεζη -θικλμνξοπρστυφχψω・・・ θικλμνξοπρστυφχψω・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・АБВГДЕЁЖЗИЙКЛМНОПРС ・АБВГДЕЁЖЗИЙКЛМНОПРС -ТУФХЦЧШЩЪЫЬЭЮЯ・・・・・・ ТУФХЦЧШЩЪЫЬЭЮЯ・・・・・・ -・・・・・・・・・абвгдеёжзий ・・・・・・・・・абвгдеёжзий -клмнопрстуфхцчшщъыьэ клмнопрстуфхцчшщъыьэ -юя・・・・・・・・・・・・・・・・・・ юя・・・・・・・・・・・・・・・・・・ -・─│┌┐┘└├┬┤┴┼━┃┏┓┛┗┣┳ ・─│┌┐┘└├┬┤┴┼━┃┏┓┛┗┣┳ -┫┻╋┠┯┨┷┿┝┰┥┸╂・・・・・・・ ┫┻╋┠┯┨┷┿┝┰┥┸╂・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵 ・亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵 -梓圧斡扱宛姐虻飴絢綾鮎或粟袷安庵按暗案闇 梓圧斡扱宛姐虻飴絢綾鮎或粟袷安庵按暗案闇 -鞍杏以伊位依偉囲夷委威尉惟意慰易椅為畏異 鞍杏以伊位依偉囲夷委威尉惟意慰易椅為畏異 -移維緯胃萎衣謂違遺医井亥域育郁磯一壱溢逸 移維緯胃萎衣謂違遺医井亥域育郁磯一壱溢逸 -稲茨芋鰯允印咽員因姻引飲淫胤蔭・・・・・ 稲茨芋鰯允印咽員因姻引飲淫胤蔭・・・・・ -・蓮連錬呂魯櫓炉賂路露労婁廊弄朗楼榔浪漏 ・蓮連錬呂魯櫓炉賂路露労婁廊弄朗楼榔浪漏 -牢狼篭老聾蝋郎六麓禄肋録論倭和話歪賄脇惑 牢狼篭老聾蝋郎六麓禄肋録論倭和話歪賄脇惑 -枠鷲亙亘鰐詫藁蕨椀湾碗腕・・・・・・・・ 枠鷲亙亘鰐詫藁蕨椀湾碗腕・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞 ・弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞 -亟亠亢亰亳亶从仍仄仆仂仗仞仭仟价伉佚估佛 亟亠亢亰亳亶从仍仄仆仂仗仞仭仟价伉佚估佛 -佝佗佇佶侈侏侘佻佩佰侑佯來侖儘俔俟俎俘俛 佝佗佇佶侈侏侘佻佩佰侑佯來侖儘俔俟俎俘俛 -俑俚俐俤俥倚倨倔倪倥倅伜俶倡倩倬俾俯們倆 俑俚俐俤俥倚倨倔倪倥倅伜俶倡倩倬俾俯們倆 -偃假會偕偐偈做偖偬偸傀傚傅傴傲・・・・・ 偃假會偕偐偈做偖偬偸傀傚傅傴傲・・・・・ -・鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻 ・鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻 -鶸鶺鷆鷏鷂鷙鷓鷸鷦鷭鷯鷽鸚鸛鸞鹵鹹鹽麁麈 鶸鶺鷆鷏鷂鷙鷓鷸鷦鷭鷯鷽鸚鸛鸞鹵鹹鹽麁麈 -麋麌麒麕麑麝麥麩麸麪麭靡黌黎黏黐黔黜點黝 麋麌麒麕麑麝麥麩麸麪麭靡黌黎黏黐黔黜點黝 -黠黥黨黯黴黶黷黹黻黼黽鼇鼈皷鼕鼡鼬鼾齊齒 黠黥黨黯黴黶黷黹黻黼黽鼇鼈皷鼕鼡鼬鼾齊齒 -齔齣齟齠齡齦齧齬齪齷齲齶龕龜龠・・・・・ 齔齣齟齠齡齦齧齬齪齷齲齶龕龜龠・・・・・ -・堯槇遙瑤凜熙・・・・・・・・・・・・・ ・堯槇遙瑤凜熙・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -SELECT `Ｃ１`, CONVERT(`Ｃ１` using ucs2) FROM `Ｔ１１`; -Ｃ１ CONVERT(`Ｃ１` using ucs2) - 、。，．・：；？！゛゜´｀¨＾￣＿ヽ 、。，．・：；？！゛゜´｀¨＾￣＿ヽ -ヾゝゞ〃仝々〆〇ー―‐／＼〜‖｜…‥‘’ ヾゝゞ〃仝々〆〇ー―‐／＼〜‖｜…‥‘’ -“”（）〔〕［］｛｝〈〉《》「」『』【】 “”（）〔〕［］｛｝〈〉《》「」『』【】 -＋‐±×÷＝≠＜＞≦≧∞∴♂♀°′″℃￥ ＋‐±×÷＝≠＜＞≦≧∞∴♂♀°′″℃￥ -＄¢£％＃＆＊＠§☆★○●◎◇・・・・・ ＄¢£％＃＆＊＠§☆★○●◎◇・・・・・ -・◆□■△▲▽▼※〒→←↑↓〓・・・・・ ・◆□■△▲▽▼※〒→←↑↓〓・・・・・ -・・・・・・∈∋⊆⊇⊂⊃∪∩・・・・・・ ・・・・・・∈∋⊆⊇⊂⊃∪∩・・・・・・ -・・∧∨¬⇒⇔∀∃・・・・・・・・・・・ ・・∧∨¬⇒⇔∀∃・・・・・・・・・・・ -∠⊥⌒∂∇≡≒≪≫√∽∝∵∫∬・・・・・ ∠⊥⌒∂∇≡≒≪≫√∽∝∵∫∬・・・・・ -・・ʼn♯♭♪†‡¶・・・・◯・・・・ ・・ʼn♯♭♪†‡¶・・・・◯・・・・ -・・・・・・・・・・・・・・・・０１２３ ・・・・・・・・・・・・・・・・０１２３ -４５６７８９・・・・・・・ＡＢＣＤＥＦＧ ４５６７８９・・・・・・・ＡＢＣＤＥＦＧ -ＨＩＪＫＬＭＮＯＰＱＲＳＴＵＶＷＸＹＺ・ ＨＩＪＫＬＭＮＯＰＱＲＳＴＵＶＷＸＹＺ・ -・・・・・ａｂｃｄｅｆｇｈｉｊｋｌｍｎｏ ・・・・・ａｂｃｄｅｆｇｈｉｊｋｌｍｎｏ -ｐｑｒｓｔｕｖｗｘｙｚ・・・・・・・・・ ｐｑｒｓｔｕｖｗｘｙｚ・・・・・・・・・ -・ぁあぃいぅうぇえぉおかがきぎくぐけげこ ・ぁあぃいぅうぇえぉおかがきぎくぐけげこ -ごさざしじすずせぜそぞただちぢっつづてで ごさざしじすずせぜそぞただちぢっつづてで -とどなにぬねのはばぱひびぴふぶぷへべぺほ とどなにぬねのはばぱひびぴふぶぷへべぺほ -ぼぽまみむめもゃやゅゆょよらりるれろゎわ ぼぽまみむめもゃやゅゆょよらりるれろゎわ -ゐゑをん・・・・・・・・・・・・・・・・ ゐゑをん・・・・・・・・・・・・・・・・ -・ァアィイゥウェエォオカガキギクグケゲコ ・ァアィイゥウェエォオカガキギクグケゲコ -ゴサザシジスズセゼソゾタダチヂッツヅテデ ゴサザシジスズセゼソゾタダチヂッツヅテデ -トドナニヌネノハバパヒビピフブプヘベペホ トドナニヌネノハバパヒビピフブプヘベペホ -ボポマミムメモャヤュユョヨラリルレロヮワ ボポマミムメモャヤュユョヨラリルレロヮワ -ヰヱヲンヴヵヶ・・・・・・・・・・・・・ ヰヱヲンヴヵヶ・・・・・・・・・・・・・ -・ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤ ・ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤ -ΥΦΧΨΩ・・・・・・・・αβγδεζη ΥΦΧΨΩ・・・・・・・・αβγδεζη -θικλμνξοπρστυφχψω・・・ θικλμνξοπρστυφχψω・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・АБВГДЕЁЖЗИЙКЛМНОПРС ・АБВГДЕЁЖЗИЙКЛМНОПРС -ТУФХЦЧШЩЪЫЬЭЮЯ・・・・・・ ТУФХЦЧШЩЪЫЬЭЮЯ・・・・・・ -・・・・・・・・・абвгдеёжзий ・・・・・・・・・абвгдеёжзий -клмнопрстуфхцчшщъыьэ клмнопрстуфхцчшщъыьэ -юя・・・・・・・・・・・・・・・・・・ юя・・・・・・・・・・・・・・・・・・ -・─│┌┐┘└├┬┤┴┼━┃┏┓┛┗┣┳ ・─│┌┐┘└├┬┤┴┼━┃┏┓┛┗┣┳ -┫┻╋┠┯┨┷┿┝┰┥┸╂・・・・・・・ ┫┻╋┠┯┨┷┿┝┰┥┸╂・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵 ・亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵 -梓圧斡扱宛姐虻飴絢綾鮎或粟袷安庵按暗案闇 梓圧斡扱宛姐虻飴絢綾鮎或粟袷安庵按暗案闇 -鞍杏以伊位依偉囲夷委威尉惟意慰易椅為畏異 鞍杏以伊位依偉囲夷委威尉惟意慰易椅為畏異 -移維緯胃萎衣謂違遺医井亥域育郁磯一壱溢逸 移維緯胃萎衣謂違遺医井亥域育郁磯一壱溢逸 -稲茨芋鰯允印咽員因姻引飲淫胤蔭・・・・・ 稲茨芋鰯允印咽員因姻引飲淫胤蔭・・・・・ -・蓮連錬呂魯櫓炉賂路露労婁廊弄朗楼榔浪漏 ・蓮連錬呂魯櫓炉賂路露労婁廊弄朗楼榔浪漏 -牢狼篭老聾蝋郎六麓禄肋録論倭和話歪賄脇惑 牢狼篭老聾蝋郎六麓禄肋録論倭和話歪賄脇惑 -枠鷲亙亘鰐詫藁蕨椀湾碗腕・・・・・・・・ 枠鷲亙亘鰐詫藁蕨椀湾碗腕・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞 ・弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞 -亟亠亢亰亳亶从仍仄仆仂仗仞仭仟价伉佚估佛 亟亠亢亰亳亶从仍仄仆仂仗仞仭仟价伉佚估佛 -佝佗佇佶侈侏侘佻佩佰侑佯來侖儘俔俟俎俘俛 佝佗佇佶侈侏侘佻佩佰侑佯來侖儘俔俟俎俘俛 -俑俚俐俤俥倚倨倔倪倥倅伜俶倡倩倬俾俯們倆 俑俚俐俤俥倚倨倔倪倥倅伜俶倡倩倬俾俯們倆 -偃假會偕偐偈做偖偬偸傀傚傅傴傲・・・・・ 偃假會偕偐偈做偖偬偸傀傚傅傴傲・・・・・ -・鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻 ・鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻 -鶸鶺鷆鷏鷂鷙鷓鷸鷦鷭鷯鷽鸚鸛鸞鹵鹹鹽麁麈 鶸鶺鷆鷏鷂鷙鷓鷸鷦鷭鷯鷽鸚鸛鸞鹵鹹鹽麁麈 -麋麌麒麕麑麝麥麩麸麪麭靡黌黎黏黐黔黜點黝 麋麌麒麕麑麝麥麩麸麪麭靡黌黎黏黐黔黜點黝 -黠黥黨黯黴黶黷黹黻黼黽鼇鼈皷鼕鼡鼬鼾齊齒 黠黥黨黯黴黶黷黹黻黼黽鼇鼈皷鼕鼡鼬鼾齊齒 -齔齣齟齠齡齦齧齬齪齷齲齶龕龜龠・・・・・ 齔齣齟齠齡齦齧齬齪齷齲齶龕龜龠・・・・・ -・堯槇遙瑤凜熙・・・・・・・・・・・・・ ・堯槇遙瑤凜熙・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -SELECT `Ｃ１`, CONVERT(`Ｃ１` using sjis) FROM `Ｔ１１`; -Ｃ１ CONVERT(`Ｃ１` using sjis) - 、。，．・：；？！゛゜´｀¨＾￣＿ヽ 、。，．・：；？！゛゜´｀¨＾￣＿ヽ -ヾゝゞ〃仝々〆〇ー―‐／＼〜‖｜…‥‘’ ヾゝゞ〃仝々〆〇ー―‐／?〜‖｜…‥‘’ -“”（）〔〕［］｛｝〈〉《》「」『』【】 “”（）〔〕［］｛｝〈〉《》「」『』【】 -＋‐±×÷＝≠＜＞≦≧∞∴♂♀°′″℃￥ ＋‐±×÷＝≠＜＞≦≧∞∴♂♀°′″℃￥ -＄¢£％＃＆＊＠§☆★○●◎◇・・・・・ ＄¢£％＃＆＊＠§☆★○●◎◇・・・・・ -・◆□■△▲▽▼※〒→←↑↓〓・・・・・ ・◆□■△▲▽▼※〒→←↑↓〓・・・・・ -・・・・・・∈∋⊆⊇⊂⊃∪∩・・・・・・ ・・・・・・∈∋⊆⊇⊂⊃∪∩・・・・・・ -・・∧∨¬⇒⇔∀∃・・・・・・・・・・・ ・・∧∨¬⇒⇔∀∃・・・・・・・・・・・ -∠⊥⌒∂∇≡≒≪≫√∽∝∵∫∬・・・・・ ∠⊥⌒∂∇≡≒≪≫√∽∝∵∫∬・・・・・ -・・ʼn♯♭♪†‡¶・・・・◯・・・・ ・・ʼn♯♭♪†‡¶・・・・◯・・・・ -・・・・・・・・・・・・・・・・０１２３ ・・・・・・・・・・・・・・・・０１２３ -４５６７８９・・・・・・・ＡＢＣＤＥＦＧ ４５６７８９・・・・・・・ＡＢＣＤＥＦＧ -ＨＩＪＫＬＭＮＯＰＱＲＳＴＵＶＷＸＹＺ・ ＨＩＪＫＬＭＮＯＰＱＲＳＴＵＶＷＸＹＺ・ -・・・・・ａｂｃｄｅｆｇｈｉｊｋｌｍｎｏ ・・・・・ａｂｃｄｅｆｇｈｉｊｋｌｍｎｏ -ｐｑｒｓｔｕｖｗｘｙｚ・・・・・・・・・ ｐｑｒｓｔｕｖｗｘｙｚ・・・・・・・・・ -・ぁあぃいぅうぇえぉおかがきぎくぐけげこ ・ぁあぃいぅうぇえぉおかがきぎくぐけげこ -ごさざしじすずせぜそぞただちぢっつづてで ごさざしじすずせぜそぞただちぢっつづてで -とどなにぬねのはばぱひびぴふぶぷへべぺほ とどなにぬねのはばぱひびぴふぶぷへべぺほ -ぼぽまみむめもゃやゅゆょよらりるれろゎわ ぼぽまみむめもゃやゅゆょよらりるれろゎわ -ゐゑをん・・・・・・・・・・・・・・・・ ゐゑをん・・・・・・・・・・・・・・・・ -・ァアィイゥウェエォオカガキギクグケゲコ ・ァアィイゥウェエォオカガキギクグケゲコ -ゴサザシジスズセゼソゾタダチヂッツヅテデ ゴサザシジスズセゼソゾタダチヂッツヅテデ -トドナニヌネノハバパヒビピフブプヘベペホ トドナニヌネノハバパヒビピフブプヘベペホ -ボポマミムメモャヤュユョヨラリルレロヮワ ボポマミムメモャヤュユョヨラリルレロヮワ -ヰヱヲンヴヵヶ・・・・・・・・・・・・・ ヰヱヲンヴヵヶ・・・・・・・・・・・・・ -・ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤ ・ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤ -ΥΦΧΨΩ・・・・・・・・αβγδεζη ΥΦΧΨΩ・・・・・・・・αβγδεζη -θικλμνξοπρστυφχψω・・・ θικλμνξοπρστυφχψω・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・АБВГДЕЁЖЗИЙКЛМНОПРС ・АБВГДЕЁЖЗИЙКЛМНОПРС -ТУФХЦЧШЩЪЫЬЭЮЯ・・・・・・ ТУФХЦЧШЩЪЫЬЭЮЯ・・・・・・ -・・・・・・・・・абвгдеёжзий ・・・・・・・・・абвгдеёжзий -клмнопрстуфхцчшщъыьэ клмнопрстуфхцчшщъыьэ -юя・・・・・・・・・・・・・・・・・・ юя・・・・・・・・・・・・・・・・・・ -・─│┌┐┘└├┬┤┴┼━┃┏┓┛┗┣┳ ・─│┌┐┘└├┬┤┴┼━┃┏┓┛┗┣┳ -┫┻╋┠┯┨┷┿┝┰┥┸╂・・・・・・・ ┫┻╋┠┯┨┷┿┝┰┥┸╂・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵 ・亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵 -梓圧斡扱宛姐虻飴絢綾鮎或粟袷安庵按暗案闇 梓圧斡扱宛姐虻飴絢綾鮎或粟袷安庵按暗案闇 -鞍杏以伊位依偉囲夷委威尉惟意慰易椅為畏異 鞍杏以伊位依偉囲夷委威尉惟意慰易椅為畏異 -移維緯胃萎衣謂違遺医井亥域育郁磯一壱溢逸 移維緯胃萎衣謂違遺医井亥域育郁磯一壱溢逸 -稲茨芋鰯允印咽員因姻引飲淫胤蔭・・・・・ 稲茨芋鰯允印咽員因姻引飲淫胤蔭・・・・・ -・蓮連錬呂魯櫓炉賂路露労婁廊弄朗楼榔浪漏 ・蓮連錬呂魯櫓炉賂路露労婁廊弄朗楼榔浪漏 -牢狼篭老聾蝋郎六麓禄肋録論倭和話歪賄脇惑 牢狼篭老聾蝋郎六麓禄肋録論倭和話歪賄脇惑 -枠鷲亙亘鰐詫藁蕨椀湾碗腕・・・・・・・・ 枠鷲亙亘鰐詫藁蕨椀湾碗腕・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞 ・弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞 -亟亠亢亰亳亶从仍仄仆仂仗仞仭仟价伉佚估佛 亟亠亢亰亳亶从仍仄仆仂仗仞仭仟价伉佚估佛 -佝佗佇佶侈侏侘佻佩佰侑佯來侖儘俔俟俎俘俛 佝佗佇佶侈侏侘佻佩佰侑佯來侖儘俔俟俎俘俛 -俑俚俐俤俥倚倨倔倪倥倅伜俶倡倩倬俾俯們倆 俑俚俐俤俥倚倨倔倪倥倅伜俶倡倩倬俾俯們倆 -偃假會偕偐偈做偖偬偸傀傚傅傴傲・・・・・ 偃假會偕偐偈做偖偬偸傀傚傅傴傲・・・・・ -・鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻 ・鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻 -鶸鶺鷆鷏鷂鷙鷓鷸鷦鷭鷯鷽鸚鸛鸞鹵鹹鹽麁麈 鶸鶺鷆鷏鷂鷙鷓鷸鷦鷭鷯鷽鸚鸛鸞鹵鹹鹽麁麈 -麋麌麒麕麑麝麥麩麸麪麭靡黌黎黏黐黔黜點黝 麋麌麒麕麑麝麥麩麸麪麭靡黌黎黏黐黔黜點黝 -黠黥黨黯黴黶黷黹黻黼黽鼇鼈皷鼕鼡鼬鼾齊齒 黠黥黨黯黴黶黷黹黻黼黽鼇鼈皷鼕鼡鼬鼾齊齒 -齔齣齟齠齡齦齧齬齪齷齲齶龕龜龠・・・・・ 齔齣齟齠齡齦齧齬齪齷齲齶龕龜龠・・・・・ -・堯槇遙瑤凜熙・・・・・・・・・・・・・ ・堯槇遙瑤凜熙・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -SELECT `Ｃ１`, CONVERT(`Ｃ１` using ujis) FROM `Ｔ１２`; -Ｃ１ CONVERT(`Ｃ１` using ujis) -・・・・・・・・・・・・・・・˘ˇ¸˙˝ ・・・・・・・・・・・・・・・˘ˇ¸˙˝ -・˛˚～΄΅・・・・・・・・¡¦¿・・・ ・˛˚?΄΅・・・・・・・・¡¦¿・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・ºª©®™ ・・・・・・・・・・・・・・・ºª©®™ -¤№・・・・・・・・・・・・・・・・・・ ¤№・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・・・・・ΆΈΉΊΪ・Ό・ΎΫ・Ώ・・・ ・・・・・ΆΈΉΊΪ・Ό・ΎΫ・Ώ・・・ -・άέήίϊΐόςύϋΰώ・・・・・・・ ・άέήίϊΐόςύϋΰώ・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・ЂЃЄЅІЇ ・・・・・・・・・・・・・・ЂЃЄЅІЇ -ЈЉЊЋЌЎЏ・・・・・・・・・・・・・ ЈЉЊЋЌЎЏ・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・・ђѓєѕіїјљњћќўџ・・・・・ ・・ђѓєѕіїјљњћќўџ・・・・・ -・ÆĐ・Ħ・IJ・ŁĿ・ŊØŒ・ŦÞ・・・ ・ÆĐ・Ħ・IJ・ŁĿ・ŊØŒ・ŦÞ・・・ -・・・・・・・・・・・・・æđðħıijĸ ・・・・・・・・・・・・・æđðħıijĸ -łŀʼnŋøœßŧþ・・・・・・・・・・・ łŀʼnŋøœßŧþ・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・ÁÀÄÂĂǍĀĄÅÃĆĈČÇĊĎÉÈË ・ÁÀÄÂĂǍĀĄÅÃĆĈČÇĊĎÉÈË -ÊĚĖĒĘ・ĜĞĢĠĤÍÌÏÎǏİĪĮĨ ÊĚĖĒĘ・ĜĞĢĠĤÍÌÏÎǏİĪĮĨ -ĴĶĹĽĻŃŇŅÑÓÒÖÔǑŐŌÕŔŘŖ ĴĶĹĽĻŃŇŅÑÓÒÖÔǑŐŌÕŔŘŖ -ŚŜŠŞŤŢÚÙÜÛŬǓŰŪŲŮŨǗǛǙ ŚŜŠŞŤŢÚÙÜÛŬǓŰŪŲŮŨǗǛǙ -ǕŴÝŸŶŹŽŻ・・・・・・・・・・・・ ǕŴÝŸŶŹŽŻ・・・・・・・・・・・・ -・áàäâăǎāąåãćĉčçċďéèë ・áàäâăǎāąåãćĉčçċďéèë -êěėēęǵĝğ・ġĥíìïîǐ・īįĩ êěėēęǵĝğ・ġĥíìïîǐ・īįĩ -ĵķĺľļńňņñóòöôǒőōõŕřŗ ĵķĺľļńňņñóòöôǒőōõŕřŗ -śŝšşťţúùüûŭǔűūųůũǘǜǚ śŝšşťţúùüûŭǔűūųůũǘǜǚ -ǖŵýÿŷźžż・・・・・・・・・・・・ ǖŵýÿŷźžż・・・・・・・・・・・・ -・丂丄丅丌丒丟丣两丨丫丮丯丰丵乀乁乄乇乑 ・丂丄丅丌丒丟丣两丨丫丮丯丰丵乀乁乄乇乑 -乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠 乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠 -仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众 仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众 -伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘 伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘 -佟佣佪佬佮佱佷佸佹佺佽佾侁侂侄・・・・・ 佟佣佪佬佮佱佷佸佹佺佽佾侁侂侄・・・・・ -・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪 ・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪 -鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖 鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖 -齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒 齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒 -龔龖龗龞龡龢龣龥・・・・・・・・・・・・ 龔龖龗龞龡龢龣龥・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -SELECT `Ｃ１`, CONVERT(`Ｃ１` using ucs2) FROM `Ｔ１２`; -Ｃ１ CONVERT(`Ｃ１` using ucs2) -・・・・・・・・・・・・・・・˘ˇ¸˙˝ ・・・・・・・・・・・・・・・˘ˇ¸˙˝ -・˛˚～΄΅・・・・・・・・¡¦¿・・・ ・˛˚～΄΅・・・・・・・・¡¦¿・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・ºª©®™ ・・・・・・・・・・・・・・・ºª©®™ -¤№・・・・・・・・・・・・・・・・・・ ¤№・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・・・・・ΆΈΉΊΪ・Ό・ΎΫ・Ώ・・・ ・・・・・ΆΈΉΊΪ・Ό・ΎΫ・Ώ・・・ -・άέήίϊΐόςύϋΰώ・・・・・・・ ・άέήίϊΐόςύϋΰώ・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・ЂЃЄЅІЇ ・・・・・・・・・・・・・・ЂЃЄЅІЇ -ЈЉЊЋЌЎЏ・・・・・・・・・・・・・ ЈЉЊЋЌЎЏ・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・・ђѓєѕіїјљњћќўџ・・・・・ ・・ђѓєѕіїјљњћќўџ・・・・・ -・ÆĐ・Ħ・IJ・ŁĿ・ŊØŒ・ŦÞ・・・ ・ÆĐ・Ħ・IJ・ŁĿ・ŊØŒ・ŦÞ・・・ -・・・・・・・・・・・・・æđðħıijĸ ・・・・・・・・・・・・・æđðħıijĸ -łŀʼnŋøœßŧþ・・・・・・・・・・・ łŀʼnŋøœßŧþ・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・ÁÀÄÂĂǍĀĄÅÃĆĈČÇĊĎÉÈË ・ÁÀÄÂĂǍĀĄÅÃĆĈČÇĊĎÉÈË -ÊĚĖĒĘ・ĜĞĢĠĤÍÌÏÎǏİĪĮĨ ÊĚĖĒĘ・ĜĞĢĠĤÍÌÏÎǏİĪĮĨ -ĴĶĹĽĻŃŇŅÑÓÒÖÔǑŐŌÕŔŘŖ ĴĶĹĽĻŃŇŅÑÓÒÖÔǑŐŌÕŔŘŖ -ŚŜŠŞŤŢÚÙÜÛŬǓŰŪŲŮŨǗǛǙ ŚŜŠŞŤŢÚÙÜÛŬǓŰŪŲŮŨǗǛǙ -ǕŴÝŸŶŹŽŻ・・・・・・・・・・・・ ǕŴÝŸŶŹŽŻ・・・・・・・・・・・・ -・áàäâăǎāąåãćĉčçċďéèë ・áàäâăǎāąåãćĉčçċďéèë -êěėēęǵĝğ・ġĥíìïîǐ・īįĩ êěėēęǵĝğ・ġĥíìïîǐ・īįĩ -ĵķĺľļńňņñóòöôǒőōõŕřŗ ĵķĺľļńňņñóòöôǒőōõŕřŗ -śŝšşťţúùüûŭǔűūųůũǘǜǚ śŝšşťţúùüûŭǔűūųůũǘǜǚ -ǖŵýÿŷźžż・・・・・・・・・・・・ ǖŵýÿŷźžż・・・・・・・・・・・・ -・丂丄丅丌丒丟丣两丨丫丮丯丰丵乀乁乄乇乑 ・丂丄丅丌丒丟丣两丨丫丮丯丰丵乀乁乄乇乑 -乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠 乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠 -仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众 仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众 -伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘 伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘 -佟佣佪佬佮佱佷佸佹佺佽佾侁侂侄・・・・・ 佟佣佪佬佮佱佷佸佹佺佽佾侁侂侄・・・・・ -・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪 ・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪 -鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖 鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖 -齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒 齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒 -龔龖龗龞龡龢龣龥・・・・・・・・・・・・ 龔龖龗龞龡龢龣龥・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -SELECT `Ｃ１`, CONVERT(`Ｃ１` using sjis) FROM `Ｔ１２`; -Ｃ１ CONVERT(`Ｃ１` using sjis) -・・・・・・・・・・・・・・・˘ˇ¸˙˝ ・・・・・・・・・・・・・・・????? -・˛˚～΄΅・・・・・・・・¡¦¿・・・ ・?????・・・・・・・・???・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・ºª©®™ ・・・・・・・・・・・・・・・????? -¤№・・・・・・・・・・・・・・・・・・ ??・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・・・・・ΆΈΉΊΪ・Ό・ΎΫ・Ώ・・・ ・・・・・?????・?・??・?・・・ -・άέήίϊΐόςύϋΰώ・・・・・・・ ・????????????・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・ЂЃЄЅІЇ ・・・・・・・・・・・・・・?????? -ЈЉЊЋЌЎЏ・・・・・・・・・・・・・ ???????・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・・ђѓєѕіїјљњћќўџ・・・・・ ・・?????????????・・・・・ -・ÆĐ・Ħ・IJ・ŁĿ・ŊØŒ・ŦÞ・・・ ・??・?・?・??・???・??・・・ -・・・・・・・・・・・・・æđðħıijĸ ・・・・・・・・・・・・・??????? -łŀʼnŋøœßŧþ・・・・・・・・・・・ ?????????・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -・ÁÀÄÂĂǍĀĄÅÃĆĈČÇĊĎÉÈË ・??????????????????? -ÊĚĖĒĘ・ĜĞĢĠĤÍÌÏÎǏİĪĮĨ ?????・?????????????? -ĴĶĹĽĻŃŇŅÑÓÒÖÔǑŐŌÕŔŘŖ ???????????????????? -ŚŜŠŞŤŢÚÙÜÛŬǓŰŪŲŮŨǗǛǙ ???????????????????? -ǕŴÝŸŶŹŽŻ・・・・・・・・・・・・ ????????・・・・・・・・・・・・ -・áàäâăǎāąåãćĉčçċďéèë ・??????????????????? -êěėēęǵĝğ・ġĥíìïîǐ・īįĩ ????????・???????・??? -ĵķĺľļńňņñóòöôǒőōõŕřŗ ???????????????????? -śŝšşťţúùüûŭǔűūųůũǘǜǚ ???????????????????? -ǖŵýÿŷźžż・・・・・・・・・・・・ ????????・・・・・・・・・・・・ -・丂丄丅丌丒丟丣两丨丫丮丯丰丵乀乁乄乇乑 ・??????????????????? -乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠 ???????????????????? -仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众 ???????????????????? -伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘 ???????????????????? -佟佣佪佬佮佱佷佸佹佺佽佾侁侂侄・・・・・ ???????????????・・・・・ -・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪 ・??????????????????? -鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖 ???????????????????? -齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒 ???????????????????? -龔龖龗龞龡龢龣龥・・・・・・・・・・・・ ????????・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ drop table `Ｔ１`; drop table `Ｔ２`; drop table `Ｔ３`; @@ -1509,6 +1134,3 @@ drop table `Ｔ６`; drop table `Ｔ７`; drop table `Ｔ８`; drop table `Ｔ９`; -drop table `Ｔ１０`; -drop table `Ｔ１１`; -drop table `Ｔ１２`; diff --git a/mysql-test/suite/jp/r/jp_create_db_sjis.result b/mysql-test/suite/jp/r/jp_create_db_sjis.result index 1ce0b7228d5..2534e958931 100644 --- a/mysql-test/suite/jp/r/jp_create_db_sjis.result +++ b/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 `\\\`; diff --git a/mysql-test/suite/jp/r/jp_create_db_ucs2.result b/mysql-test/suite/jp/r/jp_create_db_ucs2.result index 8fd921ea8e6..4ba1b7b47b9 100644 --- a/mysql-test/suite/jp/r/jp_create_db_ucs2.result +++ b/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 `ݏ`; diff --git a/mysql-test/suite/jp/r/jp_create_db_ujis.result b/mysql-test/suite/jp/r/jp_create_db_ujis.result index 45fdb34717b..b3beebbd917 100644 --- a/mysql-test/suite/jp/r/jp_create_db_ujis.result +++ b/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 `ݏ`; diff --git a/mysql-test/suite/jp/r/jp_create_db_utf8.result b/mysql-test/suite/jp/r/jp_create_db_utf8.result index c0e996040de..0e1725a9c86 100644 --- a/mysql-test/suite/jp/r/jp_create_db_utf8.result +++ b/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 `龔龖龗`; diff --git a/mysql-test/suite/jp/r/jp_create_tbl_sjis.result b/mysql-test/suite/jp/r/jp_create_tbl_sjis.result index ecc72f9d91b..b3a5a52f0d1 100644 --- a/mysql-test/suite/jp/r/jp_create_tbl_sjis.result +++ b/mysql-test/suite/jp/r/jp_create_tbl_sjis.result @@ -22,11 +22,23 @@ CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = sjis engine=INNODB; CREATE TABLE `\\\`(`\\\` char(1)) DEFAULT CHARSET = sjis engine=INNODB; CREATE TABLE `\\\`(`\\\` char(1)) DEFAULT CHARSET = sjis engine=INNODB; CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = sjis engine=INNODB; +Warnings: +Note 1050 Table '' already exists CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = sjis engine=INNODB; +Warnings: +Note 1050 Table '' already exists CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = sjis engine=INNODB; +Warnings: +Note 1050 Table '' already exists CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = sjis engine=INNODB; +Warnings: +Note 1050 Table '' already exists CREATE TABLE IF NOT EXISTS `\\\`(`\\\` char(1)) DEFAULT CHARSET = sjis engine=INNODB; +Warnings: +Note 1050 Table '\\\' already exists CREATE TABLE IF NOT EXISTS `\\\`(`\\\` char(1)) DEFAULT CHARSET = sjis engine=INNODB; +Warnings: +Note 1050 Table '\\\' already exists CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = sjis engine=INNODB; CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = sjis engine=INNODB; CREATE TABLE IF NOT EXISTS `\\\`(`\\\`char(1)) DEFAULT CHARSET = sjis engine=INNODB; @@ -84,77 +96,77 @@ Field Type Null Key Default Extra SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=ujis SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=ujis SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=sjis SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=sjis SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=sjis SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=sjis SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=sjis SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=sjis SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=sjis SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=sjis SHOW CREATE TABLE `\\\`; Table Create Table \\\ CREATE TABLE `\\\` ( - `\\\` char(1) default NULL + `\\\` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=sjis SHOW CREATE TABLE `\\\`; Table Create Table \\\ CREATE TABLE `\\\` ( - `\\\` char(1) default NULL + `\\\` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=sjis SHOW CREATE TABLE `\\\`; Table Create Table \\\ CREATE TABLE `\\\` ( - `\\\` char(1) default NULL + `\\\` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=sjis SHOW CREATE TABLE `\\\`; Table Create Table \\\ CREATE TEMPORARY TABLE `\\\` ( - `\\\` char(1) default NULL + `\\\` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=sjis SHOW CREATE TABLE `\\\`; Table Create Table \\\ CREATE TEMPORARY TABLE `\\\` ( - `\\\` char(1) default NULL + `\\\` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=sjis DROP TABLE ``; DROP TABLE ``; @@ -178,11 +190,23 @@ CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = sjis engine=MyISAM; CREATE TABLE `\\\`(`\\\` char(1)) DEFAULT CHARSET = sjis engine=MyISAM; CREATE TABLE `\\\`(`\\\` char(1)) DEFAULT CHARSET = sjis engine=MyISAM; CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = sjis engine=MyISAM; +Warnings: +Note 1050 Table '' already exists CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = sjis engine=MyISAM; +Warnings: +Note 1050 Table '' already exists CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = sjis engine=MyISAM; +Warnings: +Note 1050 Table '' already exists CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = sjis engine=MyISAM; +Warnings: +Note 1050 Table '' already exists CREATE TABLE IF NOT EXISTS `\\\`(`\\\` char(1)) DEFAULT CHARSET = sjis engine=MyISAM; +Warnings: +Note 1050 Table '\\\' already exists CREATE TABLE IF NOT EXISTS `\\\`(`\\\` char(1)) DEFAULT CHARSET = sjis engine=MyISAM; +Warnings: +Note 1050 Table '\\\' already exists CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = sjis engine=MyISAM; CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = sjis engine=MyISAM; CREATE TABLE IF NOT EXISTS `\\\`(`\\\`char(1)) DEFAULT CHARSET = sjis engine=MyISAM; @@ -240,77 +264,77 @@ Field Type Null Key Default Extra SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=sjis SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=sjis SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=sjis SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=sjis SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=sjis SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=sjis SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=sjis SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=sjis SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=sjis SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=sjis SHOW CREATE TABLE `\\\`; Table Create Table \\\ CREATE TABLE `\\\` ( - `\\\` char(1) default NULL + `\\\` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=sjis SHOW CREATE TABLE `\\\`; Table Create Table \\\ CREATE TABLE `\\\` ( - `\\\` char(1) default NULL + `\\\` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=sjis SHOW CREATE TABLE `\\\`; Table Create Table \\\ CREATE TABLE `\\\` ( - `\\\` char(1) default NULL + `\\\` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=sjis SHOW CREATE TABLE `\\\`; Table Create Table \\\ CREATE TEMPORARY TABLE `\\\` ( - `\\\` char(1) default NULL + `\\\` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=sjis SHOW CREATE TABLE `\\\`; Table Create Table \\\ CREATE TEMPORARY TABLE `\\\` ( - `\\\` char(1) default NULL + `\\\` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=sjis DROP TABLE ``; DROP TABLE ``; @@ -327,27 +351,39 @@ DROP TABLE `\\\`; DROP TABLE `\\\`; DROP TABLE `\\\`; DROP TABLE `\\\`; -CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = sjis engine=HEAP; -CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = sjis engine=HEAP; -CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = sjis engine=HEAP; -CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = sjis engine=HEAP; -CREATE TABLE `\\\`(`\\\` char(1)) DEFAULT CHARSET = sjis engine=HEAP; -CREATE TABLE `\\\`(`\\\` char(1)) DEFAULT CHARSET = sjis engine=HEAP; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = sjis engine=HEAP; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = sjis engine=HEAP; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = sjis engine=HEAP; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = sjis engine=HEAP; -CREATE TABLE IF NOT EXISTS `\\\`(`\\\` char(1)) DEFAULT CHARSET = sjis engine=HEAP; -CREATE TABLE IF NOT EXISTS `\\\`(`\\\` char(1)) DEFAULT CHARSET = sjis engine=HEAP; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = sjis engine=HEAP; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = sjis engine=HEAP; -CREATE TABLE IF NOT EXISTS `\\\`(`\\\`char(1)) DEFAULT CHARSET = sjis engine=HEAP; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = sjis engine=HEAP; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = sjis engine=HEAP; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = sjis engine=HEAP; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = sjis engine=HEAP; -CREATE TEMPORARY TABLE `\\\`(`\\\` char(1)) DEFAULT CHARSET = sjis engine=HEAP; -CREATE TEMPORARY TABLE `\\\`(`\\\` char(1)) DEFAULT CHARSET = sjis engine=HEAP; +CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = sjis engine=MEMORY; +CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = sjis engine=MEMORY; +CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = sjis engine=MEMORY; +CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = sjis engine=MEMORY; +CREATE TABLE `\\\`(`\\\` char(1)) DEFAULT CHARSET = sjis engine=MEMORY; +CREATE TABLE `\\\`(`\\\` char(1)) DEFAULT CHARSET = sjis engine=MEMORY; +CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = sjis engine=MEMORY; +Warnings: +Note 1050 Table '' already exists +CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = sjis engine=MEMORY; +Warnings: +Note 1050 Table '' already exists +CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = sjis engine=MEMORY; +Warnings: +Note 1050 Table '' already exists +CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = sjis engine=MEMORY; +Warnings: +Note 1050 Table '' already exists +CREATE TABLE IF NOT EXISTS `\\\`(`\\\` char(1)) DEFAULT CHARSET = sjis engine=MEMORY; +Warnings: +Note 1050 Table '\\\' already exists +CREATE TABLE IF NOT EXISTS `\\\`(`\\\` char(1)) DEFAULT CHARSET = sjis engine=MEMORY; +Warnings: +Note 1050 Table '\\\' already exists +CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = sjis engine=MEMORY; +CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = sjis engine=MEMORY; +CREATE TABLE IF NOT EXISTS `\\\`(`\\\`char(1)) DEFAULT CHARSET = sjis engine=MEMORY; +CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = sjis engine=MEMORY; +CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = sjis engine=MEMORY; +CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = sjis engine=MEMORY; +CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = sjis engine=MEMORY; +CREATE TEMPORARY TABLE `\\\`(`\\\` char(1)) DEFAULT CHARSET = sjis engine=MEMORY; +CREATE TEMPORARY TABLE `\\\`(`\\\` char(1)) DEFAULT CHARSET = sjis engine=MEMORY; DESC ``; Field Type Null Key Default Extra char(1) YES NULL @@ -396,234 +432,78 @@ Field Type Null Key Default Extra SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=sjis + `` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=sjis SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=sjis + `` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=sjis SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=sjis + `` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=sjis SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=sjis + `` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=sjis SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=sjis + `` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=sjis SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=sjis + `` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=sjis SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=sjis + `` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=sjis SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=sjis + `` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=sjis SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=sjis + `` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=sjis SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=sjis + `` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=sjis SHOW CREATE TABLE `\\\`; Table Create Table \\\ CREATE TABLE `\\\` ( - `\\\` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=sjis + `\\\` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=sjis SHOW CREATE TABLE `\\\`; Table Create Table \\\ CREATE TABLE `\\\` ( - `\\\` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=sjis + `\\\` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=sjis SHOW CREATE TABLE `\\\`; Table Create Table \\\ CREATE TABLE `\\\` ( - `\\\` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=sjis + `\\\` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=sjis SHOW CREATE TABLE `\\\`; Table Create Table \\\ CREATE TEMPORARY TABLE `\\\` ( - `\\\` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=sjis + `\\\` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=sjis SHOW CREATE TABLE `\\\`; Table Create Table \\\ CREATE TEMPORARY TABLE `\\\` ( - `\\\` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=sjis -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE `\\\`; -DROP TABLE `\\\`; -DROP TABLE `\\\`; -DROP TABLE `\\\`; -DROP TABLE `\\\`; -CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = sjis engine=BDB; -CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = sjis engine=BDB; -CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = sjis engine=BDB; -CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = sjis engine=BDB; -CREATE TABLE `\\\`(`\\\` char(1)) DEFAULT CHARSET = sjis engine=BDB; -CREATE TABLE `\\\`(`\\\` char(1)) DEFAULT CHARSET = sjis engine=BDB; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = sjis engine=BDB; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = sjis engine=BDB; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = sjis engine=BDB; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = sjis engine=BDB; -CREATE TABLE IF NOT EXISTS `\\\`(`\\\` char(1)) DEFAULT CHARSET = sjis engine=BDB; -CREATE TABLE IF NOT EXISTS `\\\`(`\\\` char(1)) DEFAULT CHARSET = sjis engine=BDB; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = sjis engine=BDB; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = sjis engine=BDB; -CREATE TABLE IF NOT EXISTS `\\\`(`\\\`char(1)) DEFAULT CHARSET = sjis engine=BDB; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = sjis engine=BDB; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = sjis engine=BDB; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = sjis engine=BDB; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = sjis engine=BDB; -CREATE TEMPORARY TABLE `\\\`(`\\\` char(1)) DEFAULT CHARSET = sjis engine=BDB; -CREATE TEMPORARY TABLE `\\\`(`\\\` char(1)) DEFAULT CHARSET = sjis engine=BDB; -DESC ``; -Field Type Null Key Default Extra - char(1) YES NULL -DESC ``; -Field Type Null Key Default Extra - char(1) YES NULL -DESC ``; -Field Type Null Key Default Extra - char(1) YES NULL -DESC ``; -Field Type Null Key Default Extra - char(1) YES NULL -DESC ``; -Field Type Null Key Default Extra - char(1) YES NULL -DESC ``; -Field Type Null Key Default Extra - char(1) YES NULL -DESC ``; -Field Type Null Key Default Extra - char(1) YES NULL -DESC ``; -Field Type Null Key Default Extra - char(1) YES NULL -DESC ``; -Field Type Null Key Default Extra - char(1) YES NULL -DESC ``; -Field Type Null Key Default Extra - char(1) YES NULL -DESC `\\\`; -Field Type Null Key Default Extra -\\\ char(1) YES NULL -DESC `\\\`; -Field Type Null Key Default Extra -\\\ char(1) YES NULL -DESC `\\\`; -Field Type Null Key Default Extra -\\\ char(1) YES NULL -DESC `\\\`; -Field Type Null Key Default Extra -\\\ char(1) YES NULL -DESC `\\\`; -Field Type Null Key Default Extra -\\\ char(1) YES NULL -SHOW CREATE TABLE ``; -Table Create Table - CREATE TABLE `` ( - `` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis -SHOW CREATE TABLE ``; -Table Create Table - CREATE TABLE `` ( - `` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis -SHOW CREATE TABLE ``; -Table Create Table - CREATE TABLE `` ( - `` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis -SHOW CREATE TABLE ``; -Table Create Table - CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis -SHOW CREATE TABLE ``; -Table Create Table - CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis -SHOW CREATE TABLE ``; -Table Create Table - CREATE TABLE `` ( - `` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis -SHOW CREATE TABLE ``; -Table Create Table - CREATE TABLE `` ( - `` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis -SHOW CREATE TABLE ``; -Table Create Table - CREATE TABLE `` ( - `` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis -SHOW CREATE TABLE ``; -Table Create Table - CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis -SHOW CREATE TABLE ``; -Table Create Table - CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis -SHOW CREATE TABLE `\\\`; -Table Create Table -\\\ CREATE TABLE `\\\` ( - `\\\` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis -SHOW CREATE TABLE `\\\`; -Table Create Table -\\\ CREATE TABLE `\\\` ( - `\\\` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis -SHOW CREATE TABLE `\\\`; -Table Create Table -\\\ CREATE TABLE `\\\` ( - `\\\` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis -SHOW CREATE TABLE `\\\`; -Table Create Table -\\\ CREATE TEMPORARY TABLE `\\\` ( - `\\\` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis -SHOW CREATE TABLE `\\\`; -Table Create Table -\\\ CREATE TEMPORARY TABLE `\\\` ( - `\\\` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis + `\\\` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=sjis DROP TABLE ``; DROP TABLE ``; DROP TABLE ``; diff --git a/mysql-test/suite/jp/r/jp_create_tbl_ucs2.result b/mysql-test/suite/jp/r/jp_create_tbl_ucs2.result index 0bf5a6891b0..5ca3d84465e 100644 --- a/mysql-test/suite/jp/r/jp_create_tbl_ucs2.result +++ b/mysql-test/suite/jp/r/jp_create_tbl_ucs2.result @@ -22,11 +22,23 @@ CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB; CREATE TABLE `ݏݏ`(`` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB; CREATE TABLE `ޏޏ`(`` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB; CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB; +Warnings: +Note 1050 Table '' already exists CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB; +Warnings: +Note 1050 Table '' already exists CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB; +Warnings: +Note 1050 Table '' already exists CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB; +Warnings: +Note 1050 Table '' already exists CREATE TABLE IF NOT EXISTS `ݏݏ`(`` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB; +Warnings: +Note 1050 Table 'ݏݏ' already exists CREATE TABLE IF NOT EXISTS `ޏޏ`(`` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB; +Warnings: +Note 1050 Table 'ޏޏ' already exists CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB; CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB; CREATE TABLE IF NOT EXISTS `ߏߏ`(``char(1)) DEFAULT CHARSET = ucs2 engine=INNODB; @@ -84,77 +96,77 @@ Field Type Null Key Default Extra SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=ucs2 SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=ucs2 SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=ucs2 SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=ucs2 SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=ucs2 SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=ucs2 SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=ucs2 SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=ucs2 SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=ucs2 SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=ucs2 SHOW CREATE TABLE `ݏݏ`; Table Create Table ݏݏ CREATE TABLE `ݏݏ` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=ucs2 SHOW CREATE TABLE `ޏޏ`; Table Create Table ޏޏ CREATE TABLE `ޏޏ` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=ucs2 SHOW CREATE TABLE `ߏߏ`; Table Create Table ߏߏ CREATE TABLE `ߏߏ` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=ucs2 SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=ucs2 SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=ucs2 DROP TABLE ``; DROP TABLE ``; @@ -178,11 +190,23 @@ CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM; CREATE TABLE `ݏݏ`(`` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM; CREATE TABLE `ޏޏ`(`` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM; CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM; +Warnings: +Note 1050 Table '' already exists CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM; +Warnings: +Note 1050 Table '' already exists CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM; +Warnings: +Note 1050 Table '' already exists CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM; +Warnings: +Note 1050 Table '' already exists CREATE TABLE IF NOT EXISTS `ݏݏ`(`` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM; +Warnings: +Note 1050 Table 'ݏݏ' already exists CREATE TABLE IF NOT EXISTS `ޏޏ`(`` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM; +Warnings: +Note 1050 Table 'ޏޏ' already exists CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM; CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM; CREATE TABLE IF NOT EXISTS `ߏߏ`(``char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM; @@ -240,77 +264,77 @@ Field Type Null Key Default Extra SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=ucs2 SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=ucs2 SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=ucs2 SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=ucs2 SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=ucs2 SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=ucs2 SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=ucs2 SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=ucs2 SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=ucs2 SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=ucs2 SHOW CREATE TABLE `ݏݏ`; Table Create Table ݏݏ CREATE TABLE `ݏݏ` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=ucs2 SHOW CREATE TABLE `ޏޏ`; Table Create Table ޏޏ CREATE TABLE `ޏޏ` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=ucs2 SHOW CREATE TABLE `ߏߏ`; Table Create Table ߏߏ CREATE TABLE `ߏߏ` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=ucs2 SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=ucs2 SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=ucs2 DROP TABLE ``; DROP TABLE ``; @@ -327,27 +351,39 @@ DROP TABLE `ޏޏ`; DROP TABLE `ߏߏ`; DROP TABLE ``; DROP TABLE ``; -CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; -CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; -CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; -CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; -CREATE TABLE `ݏݏ`(`` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; -CREATE TABLE `ޏޏ`(`` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; -CREATE TABLE IF NOT EXISTS `ݏݏ`(`` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; -CREATE TABLE IF NOT EXISTS `ޏޏ`(`` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; -CREATE TABLE IF NOT EXISTS `ߏߏ`(``char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; +CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY; +CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY; +CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY; +CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY; +CREATE TABLE `ݏݏ`(`` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY; +CREATE TABLE `ޏޏ`(`` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY; +CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY; +Warnings: +Note 1050 Table '' already exists +CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY; +Warnings: +Note 1050 Table '' already exists +CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY; +Warnings: +Note 1050 Table '' already exists +CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY; +Warnings: +Note 1050 Table '' already exists +CREATE TABLE IF NOT EXISTS `ݏݏ`(`` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY; +Warnings: +Note 1050 Table 'ݏݏ' already exists +CREATE TABLE IF NOT EXISTS `ޏޏ`(`` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY; +Warnings: +Note 1050 Table 'ޏޏ' already exists +CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY; +CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY; +CREATE TABLE IF NOT EXISTS `ߏߏ`(``char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY; +CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY; +CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY; +CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY; +CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY; +CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY; +CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY; DESC ``; Field Type Null Key Default Extra char(1) YES NULL @@ -396,234 +432,78 @@ Field Type Null Key Default Extra SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ucs2 + `` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ucs2 + `` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ucs2 + `` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ucs2 + `` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ucs2 + `` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ucs2 + `` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ucs2 + `` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ucs2 + `` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ucs2 + `` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ucs2 + `` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 SHOW CREATE TABLE `ݏݏ`; Table Create Table ݏݏ CREATE TABLE `ݏݏ` ( - `` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ucs2 + `` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 SHOW CREATE TABLE `ޏޏ`; Table Create Table ޏޏ CREATE TABLE `ޏޏ` ( - `` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ucs2 + `` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 SHOW CREATE TABLE `ߏߏ`; Table Create Table ߏߏ CREATE TABLE `ߏߏ` ( - `` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ucs2 + `` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ucs2 + `` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ucs2 -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE `ݏݏ`; -DROP TABLE `ޏޏ`; -DROP TABLE `ߏߏ`; -DROP TABLE ``; -DROP TABLE ``; -CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=BDB; -CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=BDB; -CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=BDB; -CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=BDB; -CREATE TABLE `ݏݏ`(`` char(1)) DEFAULT CHARSET = ucs2 engine=BDB; -CREATE TABLE `ޏޏ`(`` char(1)) DEFAULT CHARSET = ucs2 engine=BDB; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=BDB; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=BDB; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=BDB; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=BDB; -CREATE TABLE IF NOT EXISTS `ݏݏ`(`` char(1)) DEFAULT CHARSET = ucs2 engine=BDB; -CREATE TABLE IF NOT EXISTS `ޏޏ`(`` char(1)) DEFAULT CHARSET = ucs2 engine=BDB; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=BDB; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=BDB; -CREATE TABLE IF NOT EXISTS `ߏߏ`(``char(1)) DEFAULT CHARSET = ucs2 engine=BDB; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=BDB; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=BDB; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=BDB; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=BDB; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=BDB; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=BDB; -DESC ``; -Field Type Null Key Default Extra - char(1) YES NULL -DESC ``; -Field Type Null Key Default Extra - char(1) YES NULL -DESC ``; -Field Type Null Key Default Extra - char(1) YES NULL -DESC ``; -Field Type Null Key Default Extra - char(1) YES NULL -DESC ``; -Field Type Null Key Default Extra - char(1) YES NULL -DESC ``; -Field Type Null Key Default Extra - char(1) YES NULL -DESC ``; -Field Type Null Key Default Extra - char(1) YES NULL -DESC ``; -Field Type Null Key Default Extra - char(1) YES NULL -DESC ``; -Field Type Null Key Default Extra - char(1) YES NULL -DESC ``; -Field Type Null Key Default Extra - char(1) YES NULL -DESC `ݏݏ`; -Field Type Null Key Default Extra - char(1) YES NULL -DESC `ޏޏ`; -Field Type Null Key Default Extra - char(1) YES NULL -DESC `ߏߏ`; -Field Type Null Key Default Extra - char(1) YES NULL -DESC ``; -Field Type Null Key Default Extra - char(1) YES NULL -DESC ``; -Field Type Null Key Default Extra - char(1) YES NULL -SHOW CREATE TABLE ``; -Table Create Table - CREATE TABLE `` ( - `` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2 -SHOW CREATE TABLE ``; -Table Create Table - CREATE TABLE `` ( - `` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2 -SHOW CREATE TABLE ``; -Table Create Table - CREATE TABLE `` ( - `` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2 -SHOW CREATE TABLE ``; -Table Create Table - CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2 -SHOW CREATE TABLE ``; -Table Create Table - CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2 -SHOW CREATE TABLE ``; -Table Create Table - CREATE TABLE `` ( - `` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2 -SHOW CREATE TABLE ``; -Table Create Table - CREATE TABLE `` ( - `` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2 -SHOW CREATE TABLE ``; -Table Create Table - CREATE TABLE `` ( - `` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2 -SHOW CREATE TABLE ``; -Table Create Table - CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2 -SHOW CREATE TABLE ``; -Table Create Table - CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2 -SHOW CREATE TABLE `ݏݏ`; -Table Create Table -ݏݏ CREATE TABLE `ݏݏ` ( - `` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2 -SHOW CREATE TABLE `ޏޏ`; -Table Create Table -ޏޏ CREATE TABLE `ޏޏ` ( - `` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2 -SHOW CREATE TABLE `ߏߏ`; -Table Create Table -ߏߏ CREATE TABLE `ߏߏ` ( - `` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2 -SHOW CREATE TABLE ``; -Table Create Table - CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2 -SHOW CREATE TABLE ``; -Table Create Table - CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2 + `` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 DROP TABLE ``; DROP TABLE ``; DROP TABLE ``; diff --git a/mysql-test/suite/jp/r/jp_create_tbl_ujis.result b/mysql-test/suite/jp/r/jp_create_tbl_ujis.result index ae555e5af15..f79e131ec5f 100644 --- a/mysql-test/suite/jp/r/jp_create_tbl_ujis.result +++ b/mysql-test/suite/jp/r/jp_create_tbl_ujis.result @@ -22,11 +22,23 @@ CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=INNODB; CREATE TABLE `ݏݏ`(`` char(1)) DEFAULT CHARSET = ujis engine=INNODB; CREATE TABLE `ޏޏ`(`` char(1)) DEFAULT CHARSET = ujis engine=INNODB; CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ujis engine=INNODB; +Warnings: +Note 1050 Table '' already exists CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ujis engine=INNODB; +Warnings: +Note 1050 Table '' already exists CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ujis engine=INNODB; +Warnings: +Note 1050 Table '' already exists CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ujis engine=INNODB; +Warnings: +Note 1050 Table '' already exists CREATE TABLE IF NOT EXISTS `ݏݏ`(`` char(1)) DEFAULT CHARSET = ujis engine=INNODB; +Warnings: +Note 1050 Table 'ݏݏ' already exists CREATE TABLE IF NOT EXISTS `ޏޏ`(`` char(1)) DEFAULT CHARSET = ujis engine=INNODB; +Warnings: +Note 1050 Table 'ޏޏ' already exists CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ujis engine=INNODB; CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ujis engine=INNODB; CREATE TABLE IF NOT EXISTS `ߏߏ`(``char(1)) DEFAULT CHARSET = ujis engine=INNODB; @@ -84,77 +96,77 @@ Field Type Null Key Default Extra SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=ujis SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=ujis SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=ujis SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=ujis SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=ujis SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=ujis SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=ujis SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=ujis SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=ujis SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=ujis SHOW CREATE TABLE `ݏݏ`; Table Create Table ݏݏ CREATE TABLE `ݏݏ` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=ujis SHOW CREATE TABLE `ޏޏ`; Table Create Table ޏޏ CREATE TABLE `ޏޏ` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=ujis SHOW CREATE TABLE `ߏߏ`; Table Create Table ߏߏ CREATE TABLE `ߏߏ` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=ujis SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=ujis SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=ujis DROP TABLE ``; DROP TABLE ``; @@ -178,11 +190,23 @@ CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=MyISAM; CREATE TABLE `ݏݏ`(`` char(1)) DEFAULT CHARSET = ujis engine=MyISAM; CREATE TABLE `ޏޏ`(`` char(1)) DEFAULT CHARSET = ujis engine=MyISAM; CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ujis engine=MyISAM; +Warnings: +Note 1050 Table '' already exists CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ujis engine=MyISAM; +Warnings: +Note 1050 Table '' already exists CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ujis engine=MyISAM; +Warnings: +Note 1050 Table '' already exists CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ujis engine=MyISAM; +Warnings: +Note 1050 Table '' already exists CREATE TABLE IF NOT EXISTS `ݏݏ`(`` char(1)) DEFAULT CHARSET = ujis engine=MyISAM; +Warnings: +Note 1050 Table 'ݏݏ' already exists CREATE TABLE IF NOT EXISTS `ޏޏ`(`` char(1)) DEFAULT CHARSET = ujis engine=MyISAM; +Warnings: +Note 1050 Table 'ޏޏ' already exists CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ujis engine=MyISAM; CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ujis engine=MyISAM; CREATE TABLE IF NOT EXISTS `ߏߏ`(``char(1)) DEFAULT CHARSET = ujis engine=MyISAM; @@ -240,77 +264,77 @@ Field Type Null Key Default Extra SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=ujis SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=ujis SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=ujis SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=ujis SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=ujis SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=ujis SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=ujis SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=ujis SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=ujis SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=ujis SHOW CREATE TABLE `ݏݏ`; Table Create Table ݏݏ CREATE TABLE `ݏݏ` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=ujis SHOW CREATE TABLE `ޏޏ`; Table Create Table ޏޏ CREATE TABLE `ޏޏ` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=ujis SHOW CREATE TABLE `ߏߏ`; Table Create Table ߏߏ CREATE TABLE `ߏߏ` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=ujis SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=ujis SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL + `` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=ujis DROP TABLE ``; DROP TABLE ``; @@ -327,27 +351,39 @@ DROP TABLE `ޏޏ`; DROP TABLE `ߏߏ`; DROP TABLE ``; DROP TABLE ``; -CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=HEAP; -CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=HEAP; -CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=HEAP; -CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=HEAP; -CREATE TABLE `ݏݏ`(`` char(1)) DEFAULT CHARSET = ujis engine=HEAP; -CREATE TABLE `ޏޏ`(`` char(1)) DEFAULT CHARSET = ujis engine=HEAP; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ujis engine=HEAP; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ujis engine=HEAP; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ujis engine=HEAP; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ujis engine=HEAP; -CREATE TABLE IF NOT EXISTS `ݏݏ`(`` char(1)) DEFAULT CHARSET = ujis engine=HEAP; -CREATE TABLE IF NOT EXISTS `ޏޏ`(`` char(1)) DEFAULT CHARSET = ujis engine=HEAP; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ujis engine=HEAP; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ujis engine=HEAP; -CREATE TABLE IF NOT EXISTS `ߏߏ`(``char(1)) DEFAULT CHARSET = ujis engine=HEAP; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=HEAP; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=HEAP; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=HEAP; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=HEAP; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=HEAP; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=HEAP; +CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=MEMORY; +CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=MEMORY; +CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=MEMORY; +CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=MEMORY; +CREATE TABLE `ݏݏ`(`` char(1)) DEFAULT CHARSET = ujis engine=MEMORY; +CREATE TABLE `ޏޏ`(`` char(1)) DEFAULT CHARSET = ujis engine=MEMORY; +CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ujis engine=MEMORY; +Warnings: +Note 1050 Table '' already exists +CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ujis engine=MEMORY; +Warnings: +Note 1050 Table '' already exists +CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ujis engine=MEMORY; +Warnings: +Note 1050 Table '' already exists +CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ujis engine=MEMORY; +Warnings: +Note 1050 Table '' already exists +CREATE TABLE IF NOT EXISTS `ݏݏ`(`` char(1)) DEFAULT CHARSET = ujis engine=MEMORY; +Warnings: +Note 1050 Table 'ݏݏ' already exists +CREATE TABLE IF NOT EXISTS `ޏޏ`(`` char(1)) DEFAULT CHARSET = ujis engine=MEMORY; +Warnings: +Note 1050 Table 'ޏޏ' already exists +CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ujis engine=MEMORY; +CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ujis engine=MEMORY; +CREATE TABLE IF NOT EXISTS `ߏߏ`(``char(1)) DEFAULT CHARSET = ujis engine=MEMORY; +CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=MEMORY; +CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=MEMORY; +CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=MEMORY; +CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=MEMORY; +CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=MEMORY; +CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=MEMORY; DESC ``; Field Type Null Key Default Extra char(1) YES NULL @@ -396,234 +432,78 @@ Field Type Null Key Default Extra SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ujis + `` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=ujis SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ujis + `` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=ujis SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ujis + `` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=ujis SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ujis + `` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=ujis SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ujis + `` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=ujis SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ujis + `` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=ujis SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ujis + `` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=ujis SHOW CREATE TABLE ``; Table Create Table CREATE TABLE `` ( - `` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ujis + `` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=ujis SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ujis + `` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=ujis SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ujis + `` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=ujis SHOW CREATE TABLE `ݏݏ`; Table Create Table ݏݏ CREATE TABLE `ݏݏ` ( - `` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ujis + `` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=ujis SHOW CREATE TABLE `ޏޏ`; Table Create Table ޏޏ CREATE TABLE `ޏޏ` ( - `` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ujis + `` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=ujis SHOW CREATE TABLE `ߏߏ`; Table Create Table ߏߏ CREATE TABLE `ߏߏ` ( - `` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ujis + `` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=ujis SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ujis + `` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=ujis SHOW CREATE TABLE ``; Table Create Table CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ujis -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE `ݏݏ`; -DROP TABLE `ޏޏ`; -DROP TABLE `ߏߏ`; -DROP TABLE ``; -DROP TABLE ``; -CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=BDB; -CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=BDB; -CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=BDB; -CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=BDB; -CREATE TABLE `ݏݏ`(`` char(1)) DEFAULT CHARSET = ujis engine=BDB; -CREATE TABLE `ޏޏ`(`` char(1)) DEFAULT CHARSET = ujis engine=BDB; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ujis engine=BDB; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ujis engine=BDB; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ujis engine=BDB; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ujis engine=BDB; -CREATE TABLE IF NOT EXISTS `ݏݏ`(`` char(1)) DEFAULT CHARSET = ujis engine=BDB; -CREATE TABLE IF NOT EXISTS `ޏޏ`(`` char(1)) DEFAULT CHARSET = ujis engine=BDB; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ujis engine=BDB; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ujis engine=BDB; -CREATE TABLE IF NOT EXISTS `ߏߏ`(``char(1)) DEFAULT CHARSET = ujis engine=BDB; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=BDB; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=BDB; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=BDB; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=BDB; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=BDB; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=BDB; -DESC ``; -Field Type Null Key Default Extra - char(1) YES NULL -DESC ``; -Field Type Null Key Default Extra - char(1) YES NULL -DESC ``; -Field Type Null Key Default Extra - char(1) YES NULL -DESC ``; -Field Type Null Key Default Extra - char(1) YES NULL -DESC ``; -Field Type Null Key Default Extra - char(1) YES NULL -DESC ``; -Field Type Null Key Default Extra - char(1) YES NULL -DESC ``; -Field Type Null Key Default Extra - char(1) YES NULL -DESC ``; -Field Type Null Key Default Extra - char(1) YES NULL -DESC ``; -Field Type Null Key Default Extra - char(1) YES NULL -DESC ``; -Field Type Null Key Default Extra - char(1) YES NULL -DESC `ݏݏ`; -Field Type Null Key Default Extra - char(1) YES NULL -DESC `ޏޏ`; -Field Type Null Key Default Extra - char(1) YES NULL -DESC `ߏߏ`; -Field Type Null Key Default Extra - char(1) YES NULL -DESC ``; -Field Type Null Key Default Extra - char(1) YES NULL -DESC ``; -Field Type Null Key Default Extra - char(1) YES NULL -SHOW CREATE TABLE ``; -Table Create Table - CREATE TABLE `` ( - `` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis -SHOW CREATE TABLE ``; -Table Create Table - CREATE TABLE `` ( - `` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis -SHOW CREATE TABLE ``; -Table Create Table - CREATE TABLE `` ( - `` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis -SHOW CREATE TABLE ``; -Table Create Table - CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis -SHOW CREATE TABLE ``; -Table Create Table - CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis -SHOW CREATE TABLE ``; -Table Create Table - CREATE TABLE `` ( - `` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis -SHOW CREATE TABLE ``; -Table Create Table - CREATE TABLE `` ( - `` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis -SHOW CREATE TABLE ``; -Table Create Table - CREATE TABLE `` ( - `` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis -SHOW CREATE TABLE ``; -Table Create Table - CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis -SHOW CREATE TABLE ``; -Table Create Table - CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis -SHOW CREATE TABLE `ݏݏ`; -Table Create Table -ݏݏ CREATE TABLE `ݏݏ` ( - `` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis -SHOW CREATE TABLE `ޏޏ`; -Table Create Table -ޏޏ CREATE TABLE `ޏޏ` ( - `` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis -SHOW CREATE TABLE `ߏߏ`; -Table Create Table -ߏߏ CREATE TABLE `ߏߏ` ( - `` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis -SHOW CREATE TABLE ``; -Table Create Table - CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis -SHOW CREATE TABLE ``; -Table Create Table - CREATE TEMPORARY TABLE `` ( - `` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis + `` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=ujis DROP TABLE ``; DROP TABLE ``; DROP TABLE ``; diff --git a/mysql-test/suite/jp/r/jp_create_tbl_utf8.result b/mysql-test/suite/jp/r/jp_create_tbl_utf8.result index d4873406c46..5dc64d2df5c 100644 --- a/mysql-test/suite/jp/r/jp_create_tbl_utf8.result +++ b/mysql-test/suite/jp/r/jp_create_tbl_utf8.result @@ -22,11 +22,23 @@ CREATE TABLE `いいい`(`ききき` char(1)) DEFAULT CHARSET = utf8 engine=INNO CREATE TABLE `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = utf8 engine=INNODB; CREATE TABLE `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = utf8 engine=INNODB; CREATE TABLE IF NOT EXISTS `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = utf8 engine=INNODB; +Warnings: +Note 1050 Table 'ｱｱｱ' already exists CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = utf8 engine=INNODB; +Warnings: +Note 1050 Table 'ｲｲｲ' already exists CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = utf8 engine=INNODB; +Warnings: +Note 1050 Table 'あああ' already exists CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = utf8 engine=INNODB; +Warnings: +Note 1050 Table 'いいい' already exists CREATE TABLE IF NOT EXISTS `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = utf8 engine=INNODB; +Warnings: +Note 1050 Table '龖龖龖' already exists CREATE TABLE IF NOT EXISTS `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = utf8 engine=INNODB; +Warnings: +Note 1050 Table '龗龗龗' already exists CREATE TABLE IF NOT EXISTS `ｳｳｳ`(`ｸｸｸ` char(1)) DEFAULT CHARSET = utf8 engine=INNODB; CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = utf8 engine=INNODB; CREATE TABLE IF NOT EXISTS `龞龞龞`(`丅丅丅`char(1)) DEFAULT CHARSET = utf8 engine=INNODB; @@ -84,77 +96,77 @@ Field Type Null Key Default Extra SHOW CREATE TABLE `ｱｱｱ`; Table Create Table ｱｱｱ CREATE TABLE `ｱｱｱ` ( - `ｶｶｶ` char(1) default NULL + `ｶｶｶ` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8 SHOW CREATE TABLE `ｲｲｲ`; Table Create Table ｲｲｲ CREATE TABLE `ｲｲｲ` ( - `ｷｷｷ` char(1) default NULL + `ｷｷｷ` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8 SHOW CREATE TABLE `ｳｳｳ`; Table Create Table ｳｳｳ CREATE TABLE `ｳｳｳ` ( - `ｸｸｸ` char(1) default NULL + `ｸｸｸ` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8 SHOW CREATE TABLE `ｴｴｴ`; Table Create Table ｴｴｴ CREATE TEMPORARY TABLE `ｴｴｴ` ( - `ｹｹｹ` char(1) default NULL + `ｹｹｹ` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8 SHOW CREATE TABLE `ｵｵｵ`; Table Create Table ｵｵｵ CREATE TEMPORARY TABLE `ｵｵｵ` ( - `ｺｺｺ` char(1) default NULL + `ｺｺｺ` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8 SHOW CREATE TABLE `あああ`; Table Create Table あああ CREATE TABLE `あああ` ( - `かかか` char(1) default NULL + `かかか` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8 SHOW CREATE TABLE `いいい`; Table Create Table いいい CREATE TABLE `いいい` ( - `ききき` char(1) default NULL + `ききき` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8 SHOW CREATE TABLE `ううう`; Table Create Table ううう CREATE TABLE `ううう` ( - `くくく` char(1) default NULL + `くくく` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8 SHOW CREATE TABLE `えええ`; Table Create Table えええ CREATE TEMPORARY TABLE `えええ` ( - `けけけ` char(1) default NULL + `けけけ` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8 SHOW CREATE TABLE `おおお`; Table Create Table おおお CREATE TEMPORARY TABLE `おおお` ( - `こここ` char(1) default NULL + `こここ` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8 SHOW CREATE TABLE `龖龖龖`; Table Create Table 龖龖龖 CREATE TABLE `龖龖龖` ( - `丂丂丂` char(1) default NULL + `丂丂丂` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8 SHOW CREATE TABLE `龗龗龗`; Table Create Table 龗龗龗 CREATE TABLE `龗龗龗` ( - `丄丄丄` char(1) default NULL + `丄丄丄` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8 SHOW CREATE TABLE `龞龞龞`; Table Create Table 龞龞龞 CREATE TABLE `龞龞龞` ( - `丅丅丅` char(1) default NULL + `丅丅丅` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8 SHOW CREATE TABLE `龡龡龡`; Table Create Table 龡龡龡 CREATE TEMPORARY TABLE `龡龡龡` ( - `丌丌丌` char(1) default NULL + `丌丌丌` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8 SHOW CREATE TABLE `龢龢龢`; Table Create Table 龢龢龢 CREATE TEMPORARY TABLE `龢龢龢` ( - `丒丒丒` char(1) default NULL + `丒丒丒` char(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8 DROP TABLE `ｱｱｱ`; DROP TABLE `ｲｲｲ`; @@ -178,11 +190,23 @@ CREATE TABLE `いいい`(`ききき` char(1)) DEFAULT CHARSET = utf8 engine=MyIS CREATE TABLE `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = utf8 engine=MyISAM; CREATE TABLE `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = utf8 engine=MyISAM; CREATE TABLE IF NOT EXISTS `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = utf8 engine=MyISAM; +Warnings: +Note 1050 Table 'ｱｱｱ' already exists CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = utf8 engine=MyISAM; +Warnings: +Note 1050 Table 'ｲｲｲ' already exists CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = utf8 engine=MyISAM; +Warnings: +Note 1050 Table 'あああ' already exists CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = utf8 engine=MyISAM; +Warnings: +Note 1050 Table 'いいい' already exists CREATE TABLE IF NOT EXISTS `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = utf8 engine=MyISAM; +Warnings: +Note 1050 Table '龖龖龖' already exists CREATE TABLE IF NOT EXISTS `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = utf8 engine=MyISAM; +Warnings: +Note 1050 Table '龗龗龗' already exists CREATE TABLE IF NOT EXISTS `ｳｳｳ`(`ｸｸｸ` char(1)) DEFAULT CHARSET = utf8 engine=MyISAM; CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = utf8 engine=MyISAM; CREATE TABLE IF NOT EXISTS `龞龞龞`(`丅丅丅`char(1)) DEFAULT CHARSET = utf8 engine=MyISAM; @@ -240,77 +264,77 @@ Field Type Null Key Default Extra SHOW CREATE TABLE `ｱｱｱ`; Table Create Table ｱｱｱ CREATE TABLE `ｱｱｱ` ( - `ｶｶｶ` char(1) default NULL + `ｶｶｶ` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 SHOW CREATE TABLE `ｲｲｲ`; Table Create Table ｲｲｲ CREATE TABLE `ｲｲｲ` ( - `ｷｷｷ` char(1) default NULL + `ｷｷｷ` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 SHOW CREATE TABLE `ｳｳｳ`; Table Create Table ｳｳｳ CREATE TABLE `ｳｳｳ` ( - `ｸｸｸ` char(1) default NULL + `ｸｸｸ` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 SHOW CREATE TABLE `ｴｴｴ`; Table Create Table ｴｴｴ CREATE TEMPORARY TABLE `ｴｴｴ` ( - `ｹｹｹ` char(1) default NULL + `ｹｹｹ` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 SHOW CREATE TABLE `ｵｵｵ`; Table Create Table ｵｵｵ CREATE TEMPORARY TABLE `ｵｵｵ` ( - `ｺｺｺ` char(1) default NULL + `ｺｺｺ` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 SHOW CREATE TABLE `あああ`; Table Create Table あああ CREATE TABLE `あああ` ( - `かかか` char(1) default NULL + `かかか` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 SHOW CREATE TABLE `いいい`; Table Create Table いいい CREATE TABLE `いいい` ( - `ききき` char(1) default NULL + `ききき` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 SHOW CREATE TABLE `ううう`; Table Create Table ううう CREATE TABLE `ううう` ( - `くくく` char(1) default NULL + `くくく` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 SHOW CREATE TABLE `えええ`; Table Create Table えええ CREATE TEMPORARY TABLE `えええ` ( - `けけけ` char(1) default NULL + `けけけ` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 SHOW CREATE TABLE `おおお`; Table Create Table おおお CREATE TEMPORARY TABLE `おおお` ( - `こここ` char(1) default NULL + `こここ` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 SHOW CREATE TABLE `龖龖龖`; Table Create Table 龖龖龖 CREATE TABLE `龖龖龖` ( - `丂丂丂` char(1) default NULL + `丂丂丂` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 SHOW CREATE TABLE `龗龗龗`; Table Create Table 龗龗龗 CREATE TABLE `龗龗龗` ( - `丄丄丄` char(1) default NULL + `丄丄丄` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 SHOW CREATE TABLE `龞龞龞`; Table Create Table 龞龞龞 CREATE TABLE `龞龞龞` ( - `丅丅丅` char(1) default NULL + `丅丅丅` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 SHOW CREATE TABLE `龡龡龡`; Table Create Table 龡龡龡 CREATE TEMPORARY TABLE `龡龡龡` ( - `丌丌丌` char(1) default NULL + `丌丌丌` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 SHOW CREATE TABLE `龢龢龢`; Table Create Table 龢龢龢 CREATE TEMPORARY TABLE `龢龢龢` ( - `丒丒丒` char(1) default NULL + `丒丒丒` char(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 DROP TABLE `ｱｱｱ`; DROP TABLE `ｲｲｲ`; @@ -327,27 +351,39 @@ DROP TABLE `龗龗龗`; DROP TABLE `龞龞龞`; DROP TABLE `龡龡龡`; DROP TABLE `龢龢龢`; -CREATE TABLE `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = utf8 engine=HEAP; -CREATE TABLE `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = utf8 engine=HEAP; -CREATE TABLE `あああ`(`かかか` char(1)) DEFAULT CHARSET = utf8 engine=HEAP; -CREATE TABLE `いいい`(`ききき` char(1)) DEFAULT CHARSET = utf8 engine=HEAP; -CREATE TABLE `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = utf8 engine=HEAP; -CREATE TABLE `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = utf8 engine=HEAP; -CREATE TABLE IF NOT EXISTS `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = utf8 engine=HEAP; -CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = utf8 engine=HEAP; -CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = utf8 engine=HEAP; -CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = utf8 engine=HEAP; -CREATE TABLE IF NOT EXISTS `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = utf8 engine=HEAP; -CREATE TABLE IF NOT EXISTS `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = utf8 engine=HEAP; -CREATE TABLE IF NOT EXISTS `ｳｳｳ`(`ｸｸｸ` char(1)) DEFAULT CHARSET = utf8 engine=HEAP; -CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = utf8 engine=HEAP; -CREATE TABLE IF NOT EXISTS `龞龞龞`(`丅丅丅`char(1)) DEFAULT CHARSET = utf8 engine=HEAP; -CREATE TEMPORARY TABLE `ｴｴｴ`(`ｹｹｹ` char(1)) DEFAULT CHARSET = utf8 engine=HEAP; -CREATE TEMPORARY TABLE `ｵｵｵ`(`ｺｺｺ` char(1)) DEFAULT CHARSET = utf8 engine=HEAP; -CREATE TEMPORARY TABLE `えええ`(`けけけ` char(1)) DEFAULT CHARSET = utf8 engine=HEAP; -CREATE TEMPORARY TABLE `おおお`(`こここ` char(1)) DEFAULT CHARSET = utf8 engine=HEAP; -CREATE TEMPORARY TABLE `龡龡龡`(`丌丌丌` char(1)) DEFAULT CHARSET = utf8 engine=HEAP; -CREATE TEMPORARY TABLE `龢龢龢`(`丒丒丒` char(1)) DEFAULT CHARSET = utf8 engine=HEAP; +CREATE TABLE `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY; +CREATE TABLE `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY; +CREATE TABLE `あああ`(`かかか` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY; +CREATE TABLE `いいい`(`ききき` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY; +CREATE TABLE `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY; +CREATE TABLE `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY; +CREATE TABLE IF NOT EXISTS `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY; +Warnings: +Note 1050 Table 'ｱｱｱ' already exists +CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY; +Warnings: +Note 1050 Table 'ｲｲｲ' already exists +CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY; +Warnings: +Note 1050 Table 'あああ' already exists +CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY; +Warnings: +Note 1050 Table 'いいい' already exists +CREATE TABLE IF NOT EXISTS `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY; +Warnings: +Note 1050 Table '龖龖龖' already exists +CREATE TABLE IF NOT EXISTS `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY; +Warnings: +Note 1050 Table '龗龗龗' already exists +CREATE TABLE IF NOT EXISTS `ｳｳｳ`(`ｸｸｸ` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY; +CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY; +CREATE TABLE IF NOT EXISTS `龞龞龞`(`丅丅丅`char(1)) DEFAULT CHARSET = utf8 engine=MEMORY; +CREATE TEMPORARY TABLE `ｴｴｴ`(`ｹｹｹ` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY; +CREATE TEMPORARY TABLE `ｵｵｵ`(`ｺｺｺ` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY; +CREATE TEMPORARY TABLE `えええ`(`けけけ` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY; +CREATE TEMPORARY TABLE `おおお`(`こここ` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY; +CREATE TEMPORARY TABLE `龡龡龡`(`丌丌丌` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY; +CREATE TEMPORARY TABLE `龢龢龢`(`丒丒丒` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY; DESC `ｱｱｱ`; Field Type Null Key Default Extra ｶｶｶ char(1) YES NULL @@ -396,234 +432,78 @@ Field Type Null Key Default Extra SHOW CREATE TABLE `ｱｱｱ`; Table Create Table ｱｱｱ CREATE TABLE `ｱｱｱ` ( - `ｶｶｶ` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=utf8 + `ｶｶｶ` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=utf8 SHOW CREATE TABLE `ｲｲｲ`; Table Create Table ｲｲｲ CREATE TABLE `ｲｲｲ` ( - `ｷｷｷ` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=utf8 + `ｷｷｷ` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=utf8 SHOW CREATE TABLE `ｳｳｳ`; Table Create Table ｳｳｳ CREATE TABLE `ｳｳｳ` ( - `ｸｸｸ` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=utf8 + `ｸｸｸ` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=utf8 SHOW CREATE TABLE `ｴｴｴ`; Table Create Table ｴｴｴ CREATE TEMPORARY TABLE `ｴｴｴ` ( - `ｹｹｹ` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=utf8 + `ｹｹｹ` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=utf8 SHOW CREATE TABLE `ｵｵｵ`; Table Create Table ｵｵｵ CREATE TEMPORARY TABLE `ｵｵｵ` ( - `ｺｺｺ` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=utf8 + `ｺｺｺ` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=utf8 SHOW CREATE TABLE `あああ`; Table Create Table あああ CREATE TABLE `あああ` ( - `かかか` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=utf8 + `かかか` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=utf8 SHOW CREATE TABLE `いいい`; Table Create Table いいい CREATE TABLE `いいい` ( - `ききき` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=utf8 + `ききき` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=utf8 SHOW CREATE TABLE `ううう`; Table Create Table ううう CREATE TABLE `ううう` ( - `くくく` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=utf8 + `くくく` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=utf8 SHOW CREATE TABLE `えええ`; Table Create Table えええ CREATE TEMPORARY TABLE `えええ` ( - `けけけ` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=utf8 + `けけけ` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=utf8 SHOW CREATE TABLE `おおお`; Table Create Table おおお CREATE TEMPORARY TABLE `おおお` ( - `こここ` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=utf8 + `こここ` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=utf8 SHOW CREATE TABLE `龖龖龖`; Table Create Table 龖龖龖 CREATE TABLE `龖龖龖` ( - `丂丂丂` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=utf8 + `丂丂丂` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=utf8 SHOW CREATE TABLE `龗龗龗`; Table Create Table 龗龗龗 CREATE TABLE `龗龗龗` ( - `丄丄丄` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=utf8 + `丄丄丄` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=utf8 SHOW CREATE TABLE `龞龞龞`; Table Create Table 龞龞龞 CREATE TABLE `龞龞龞` ( - `丅丅丅` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=utf8 + `丅丅丅` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=utf8 SHOW CREATE TABLE `龡龡龡`; Table Create Table 龡龡龡 CREATE TEMPORARY TABLE `龡龡龡` ( - `丌丌丌` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=utf8 + `丌丌丌` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=utf8 SHOW CREATE TABLE `龢龢龢`; Table Create Table 龢龢龢 CREATE TEMPORARY TABLE `龢龢龢` ( - `丒丒丒` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=utf8 -DROP TABLE `ｱｱｱ`; -DROP TABLE `ｲｲｲ`; -DROP TABLE `ｳｳｳ`; -DROP TABLE `ｴｴｴ`; -DROP TABLE `ｵｵｵ`; -DROP TABLE `あああ`; -DROP TABLE `いいい`; -DROP TABLE `ううう`; -DROP TABLE `えええ`; -DROP TABLE `おおお`; -DROP TABLE `龖龖龖`; -DROP TABLE `龗龗龗`; -DROP TABLE `龞龞龞`; -DROP TABLE `龡龡龡`; -DROP TABLE `龢龢龢`; -CREATE TABLE `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = utf8 engine=BDB; -CREATE TABLE `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = utf8 engine=BDB; -CREATE TABLE `あああ`(`かかか` char(1)) DEFAULT CHARSET = utf8 engine=BDB; -CREATE TABLE `いいい`(`ききき` char(1)) DEFAULT CHARSET = utf8 engine=BDB; -CREATE TABLE `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = utf8 engine=BDB; -CREATE TABLE `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = utf8 engine=BDB; -CREATE TABLE IF NOT EXISTS `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = utf8 engine=BDB; -CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = utf8 engine=BDB; -CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = utf8 engine=BDB; -CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = utf8 engine=BDB; -CREATE TABLE IF NOT EXISTS `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = utf8 engine=BDB; -CREATE TABLE IF NOT EXISTS `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = utf8 engine=BDB; -CREATE TABLE IF NOT EXISTS `ｳｳｳ`(`ｸｸｸ` char(1)) DEFAULT CHARSET = utf8 engine=BDB; -CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = utf8 engine=BDB; -CREATE TABLE IF NOT EXISTS `龞龞龞`(`丅丅丅`char(1)) DEFAULT CHARSET = utf8 engine=BDB; -CREATE TEMPORARY TABLE `ｴｴｴ`(`ｹｹｹ` char(1)) DEFAULT CHARSET = utf8 engine=BDB; -CREATE TEMPORARY TABLE `ｵｵｵ`(`ｺｺｺ` char(1)) DEFAULT CHARSET = utf8 engine=BDB; -CREATE TEMPORARY TABLE `えええ`(`けけけ` char(1)) DEFAULT CHARSET = utf8 engine=BDB; -CREATE TEMPORARY TABLE `おおお`(`こここ` char(1)) DEFAULT CHARSET = utf8 engine=BDB; -CREATE TEMPORARY TABLE `龡龡龡`(`丌丌丌` char(1)) DEFAULT CHARSET = utf8 engine=BDB; -CREATE TEMPORARY TABLE `龢龢龢`(`丒丒丒` char(1)) DEFAULT CHARSET = utf8 engine=BDB; -DESC `ｱｱｱ`; -Field Type Null Key Default Extra -ｶｶｶ char(1) YES NULL -DESC `ｲｲｲ`; -Field Type Null Key Default Extra -ｷｷｷ char(1) YES NULL -DESC `ｳｳｳ`; -Field Type Null Key Default Extra -ｸｸｸ char(1) YES NULL -DESC `ｴｴｴ`; -Field Type Null Key Default Extra -ｹｹｹ char(1) YES NULL -DESC `ｵｵｵ`; -Field Type Null Key Default Extra -ｺｺｺ char(1) YES NULL -DESC `あああ`; -Field Type Null Key Default Extra -かかか char(1) YES NULL -DESC `いいい`; -Field Type Null Key Default Extra -ききき char(1) YES NULL -DESC `ううう`; -Field Type Null Key Default Extra -くくく char(1) YES NULL -DESC `えええ`; -Field Type Null Key Default Extra -けけけ char(1) YES NULL -DESC `おおお`; -Field Type Null Key Default Extra -こここ char(1) YES NULL -DESC `龖龖龖`; -Field Type Null Key Default Extra -丂丂丂 char(1) YES NULL -DESC `龗龗龗`; -Field Type Null Key Default Extra -丄丄丄 char(1) YES NULL -DESC `龞龞龞`; -Field Type Null Key Default Extra -丅丅丅 char(1) YES NULL -DESC `龡龡龡`; -Field Type Null Key Default Extra -丌丌丌 char(1) YES NULL -DESC `龢龢龢`; -Field Type Null Key Default Extra -丒丒丒 char(1) YES NULL -SHOW CREATE TABLE `ｱｱｱ`; -Table Create Table -ｱｱｱ CREATE TABLE `ｱｱｱ` ( - `ｶｶｶ` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8 -SHOW CREATE TABLE `ｲｲｲ`; -Table Create Table -ｲｲｲ CREATE TABLE `ｲｲｲ` ( - `ｷｷｷ` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8 -SHOW CREATE TABLE `ｳｳｳ`; -Table Create Table -ｳｳｳ CREATE TABLE `ｳｳｳ` ( - `ｸｸｸ` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8 -SHOW CREATE TABLE `ｴｴｴ`; -Table Create Table -ｴｴｴ CREATE TEMPORARY TABLE `ｴｴｴ` ( - `ｹｹｹ` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8 -SHOW CREATE TABLE `ｵｵｵ`; -Table Create Table -ｵｵｵ CREATE TEMPORARY TABLE `ｵｵｵ` ( - `ｺｺｺ` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8 -SHOW CREATE TABLE `あああ`; -Table Create Table -あああ CREATE TABLE `あああ` ( - `かかか` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8 -SHOW CREATE TABLE `いいい`; -Table Create Table -いいい CREATE TABLE `いいい` ( - `ききき` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8 -SHOW CREATE TABLE `ううう`; -Table Create Table -ううう CREATE TABLE `ううう` ( - `くくく` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8 -SHOW CREATE TABLE `えええ`; -Table Create Table -えええ CREATE TEMPORARY TABLE `えええ` ( - `けけけ` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8 -SHOW CREATE TABLE `おおお`; -Table Create Table -おおお CREATE TEMPORARY TABLE `おおお` ( - `こここ` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8 -SHOW CREATE TABLE `龖龖龖`; -Table Create Table -龖龖龖 CREATE TABLE `龖龖龖` ( - `丂丂丂` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8 -SHOW CREATE TABLE `龗龗龗`; -Table Create Table -龗龗龗 CREATE TABLE `龗龗龗` ( - `丄丄丄` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8 -SHOW CREATE TABLE `龞龞龞`; -Table Create Table -龞龞龞 CREATE TABLE `龞龞龞` ( - `丅丅丅` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8 -SHOW CREATE TABLE `龡龡龡`; -Table Create Table -龡龡龡 CREATE TEMPORARY TABLE `龡龡龡` ( - `丌丌丌` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8 -SHOW CREATE TABLE `龢龢龢`; -Table Create Table -龢龢龢 CREATE TEMPORARY TABLE `龢龢龢` ( - `丒丒丒` char(1) default NULL -) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8 + `丒丒丒` char(1) DEFAULT NULL +) ENGINE=MEMORY DEFAULT CHARSET=utf8 DROP TABLE `ｱｱｱ`; DROP TABLE `ｲｲｲ`; DROP TABLE `ｳｳｳ`; diff --git a/mysql-test/suite/jp/r/jp_enum_sjis.result b/mysql-test/suite/jp/r/jp_enum_sjis.result index 1e46dbffbb1..cc68c1536a0 100644 --- a/mysql-test/suite/jp/r/jp_enum_sjis.result +++ b/mysql-test/suite/jp/r/jp_enum_sjis.result @@ -7,9 +7,7 @@ drop table if exists `sU`; 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`; +drop table if exists t1; SET NAMES sjis; SET character_set_database = sjis; CREATE TABLE `sP` (`bP` ENUM('','',''), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = innodb; @@ -18,12 +16,9 @@ CREATE TABLE `sR` (`bP` ENUM('\','\','\'), INDEX(`bP`)) DEFAULT CHARSET CREATE TABLE `sS` (`bP` ENUM('','',''), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sT` (`bP` ENUM('','',''), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sU` (`bP` ENUM('\','\','\'), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; -CREATE TABLE `sV` (`bP` ENUM('','',''), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sW` (`bP` ENUM('','',''), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sX` (`bP` ENUM('\','\','\'), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPO` (`bP` ENUM('','',''), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPP` (`bP` ENUM('','',''), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPQ` (`bP` ENUM('\','\','\'), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; +CREATE TABLE `sV` (`bP` ENUM('','',''), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sW` (`bP` ENUM('','',''), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sX` (`bP` ENUM('\','\','\'), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; INSERT INTO `sP` VALUES (''),(''),(''); INSERT INTO `sQ` VALUES (''),(''),(''); INSERT INTO `sR` VALUES ('\'),('\'),('\'); @@ -33,9 +28,6 @@ INSERT INTO `sU` VALUES ('\'),('\'),('\'); INSERT INTO `sV` VALUES (''),(''),(''); INSERT INTO `sW` VALUES (''),(''),(''); INSERT INTO `sX` VALUES ('\'),('\'),('\'); -INSERT INTO `sPO` VALUES (''),(''),(''); -INSERT INTO `sPP` VALUES (''),(''),(''); -INSERT INTO `sPQ` VALUES ('\'),('\'),('\'); SELECT * FROM `sP`; bP @@ -81,93 +73,60 @@ SELECT * FROM `sX`; \ \ \ -SELECT * FROM `sPO`; -bP - - - -SELECT * FROM `sPP`; -bP - - - -SELECT * FROM `sPQ`; -bP -\ -\ -\ SHOW CREATE TABLE `sP`; Table Create Table sP CREATE TABLE `sP` ( - `bP` enum('','','') default NULL, + `bP` enum('','','') DEFAULT NULL, KEY `bP` (`bP`) ) ENGINE=InnoDB DEFAULT CHARSET=sjis SHOW CREATE TABLE `sQ`; Table Create Table sQ CREATE TABLE `sQ` ( - `bP` enum('','','') default NULL, + `bP` enum('','','') DEFAULT NULL, KEY `bP` (`bP`) ) ENGINE=InnoDB DEFAULT CHARSET=sjis SHOW CREATE TABLE `sR`; Table Create Table sR CREATE TABLE `sR` ( - `bP` enum('\','\','\') default NULL, + `bP` enum('\','\','\') DEFAULT NULL, KEY `bP` (`bP`) ) ENGINE=InnoDB DEFAULT CHARSET=sjis SHOW CREATE TABLE `sS`; Table Create Table sS CREATE TABLE `sS` ( - `bP` enum('','','') default NULL, + `bP` enum('','','') DEFAULT NULL, KEY `bP` (`bP`) ) ENGINE=MyISAM DEFAULT CHARSET=sjis SHOW CREATE TABLE `sT`; Table Create Table sT CREATE TABLE `sT` ( - `bP` enum('','','') default NULL, + `bP` enum('','','') DEFAULT NULL, KEY `bP` (`bP`) ) ENGINE=MyISAM DEFAULT CHARSET=sjis SHOW CREATE TABLE `sU`; Table Create Table sU CREATE TABLE `sU` ( - `bP` enum('\','\','\') default NULL, + `bP` enum('\','\','\') DEFAULT NULL, KEY `bP` (`bP`) ) ENGINE=MyISAM DEFAULT CHARSET=sjis SHOW CREATE TABLE `sV`; Table Create Table sV CREATE TABLE `sV` ( - `bP` enum('','','') default NULL, + `bP` enum('','','') DEFAULT NULL, KEY `bP` (`bP`) -) ENGINE=HEAP DEFAULT CHARSET=sjis +) ENGINE=MEMORY DEFAULT CHARSET=sjis SHOW CREATE TABLE `sW`; Table Create Table sW CREATE TABLE `sW` ( - `bP` enum('','','') default NULL, + `bP` enum('','','') DEFAULT NULL, KEY `bP` (`bP`) -) ENGINE=HEAP DEFAULT CHARSET=sjis +) ENGINE=MEMORY DEFAULT CHARSET=sjis SHOW CREATE TABLE `sX`; Table Create Table sX CREATE TABLE `sX` ( - `bP` enum('\','\','\') default NULL, - KEY `bP` (`bP`) -) ENGINE=HEAP DEFAULT CHARSET=sjis -SHOW CREATE TABLE `sPO`; -Table Create Table -sPO CREATE TABLE `sPO` ( - `bP` enum('','','') default NULL, - KEY `bP` (`bP`) -) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis -SHOW CREATE TABLE `sPP`; -Table Create Table -sPP CREATE TABLE `sPP` ( - `bP` enum('','','') default NULL, - KEY `bP` (`bP`) -) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis -SHOW CREATE TABLE `sPQ`; -Table Create Table -sPQ CREATE TABLE `sPQ` ( - `bP` enum('\','\','\') default NULL, + `bP` enum('\','\','\') DEFAULT NULL, KEY `bP` (`bP`) -) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis +) ENGINE=MEMORY DEFAULT CHARSET=sjis DESC `sP`; Field Type Null Key Default Extra bP enum('','','') YES MUL NULL @@ -195,15 +154,6 @@ Field Type Null Key Default Extra DESC `sX`; Field Type Null Key Default Extra bP enum('\','\','\') YES MUL NULL -DESC `sPO`; -Field Type Null Key Default Extra -bP enum('','','') YES MUL NULL -DESC `sPP`; -Field Type Null Key Default Extra -bP enum('','','') YES MUL NULL -DESC `sPQ`; -Field Type Null Key Default Extra -bP enum('\','\','\') YES MUL NULL ALTER TABLE `sP` ADD `bQ` CHAR(1) NOT NULL FIRST; ALTER TABLE `sQ` ADD `bQ` CHAR(1) NOT NULL FIRST; ALTER TABLE `sR` ADD `bQ` CHAR(1) NOT NULL FIRST; @@ -213,140 +163,110 @@ ALTER TABLE `sU` ADD `bQ` CHAR(1) NOT NULL FIRST; ALTER TABLE `sV` ADD `bQ` CHAR(1) NOT NULL FIRST; ALTER TABLE `sW` ADD `bQ` CHAR(1) NOT NULL FIRST; ALTER TABLE `sX` ADD `bQ` CHAR(1) NOT NULL FIRST; -ALTER TABLE `sPO` ADD `bQ` CHAR(1) NOT NULL FIRST; -ALTER TABLE `sPP` ADD `bQ` CHAR(1) NOT NULL FIRST; -ALTER TABLE `sPQ` ADD `bQ` CHAR(1) NOT NULL FIRST; SHOW CREATE TABLE `sP`; Table Create Table sP CREATE TABLE `sP` ( - `bQ` char(1) NOT NULL default '', - `bP` enum('','','') default NULL, + `bQ` char(1) NOT NULL, + `bP` enum('','','') DEFAULT NULL, KEY `bP` (`bP`) ) ENGINE=InnoDB DEFAULT CHARSET=sjis SHOW CREATE TABLE `sQ`; Table Create Table sQ CREATE TABLE `sQ` ( - `bQ` char(1) NOT NULL default '', - `bP` enum('','','') default NULL, + `bQ` char(1) NOT NULL, + `bP` enum('','','') DEFAULT NULL, KEY `bP` (`bP`) ) ENGINE=InnoDB DEFAULT CHARSET=sjis SHOW CREATE TABLE `sR`; Table Create Table sR CREATE TABLE `sR` ( - `bQ` char(1) NOT NULL default '', - `bP` enum('\','\','\') default NULL, + `bQ` char(1) NOT NULL, + `bP` enum('\','\','\') DEFAULT NULL, KEY `bP` (`bP`) ) ENGINE=InnoDB DEFAULT CHARSET=sjis SHOW CREATE TABLE `sS`; Table Create Table sS CREATE TABLE `sS` ( - `bQ` char(1) NOT NULL default '', - `bP` enum('','','') default NULL, + `bQ` char(1) NOT NULL, + `bP` enum('','','') DEFAULT NULL, KEY `bP` (`bP`) ) ENGINE=MyISAM DEFAULT CHARSET=sjis SHOW CREATE TABLE `sT`; Table Create Table sT CREATE TABLE `sT` ( - `bQ` char(1) NOT NULL default '', - `bP` enum('','','') default NULL, + `bQ` char(1) NOT NULL, + `bP` enum('','','') DEFAULT NULL, KEY `bP` (`bP`) ) ENGINE=MyISAM DEFAULT CHARSET=sjis SHOW CREATE TABLE `sU`; Table Create Table sU CREATE TABLE `sU` ( - `bQ` char(1) NOT NULL default '', - `bP` enum('\','\','\') default NULL, + `bQ` char(1) NOT NULL, + `bP` enum('\','\','\') DEFAULT NULL, KEY `bP` (`bP`) ) ENGINE=MyISAM DEFAULT CHARSET=sjis SHOW CREATE TABLE `sV`; Table Create Table sV CREATE TABLE `sV` ( - `bQ` char(1) NOT NULL default '', - `bP` enum('','','') default NULL, + `bQ` char(1) NOT NULL, + `bP` enum('','','') DEFAULT NULL, KEY `bP` (`bP`) -) ENGINE=HEAP DEFAULT CHARSET=sjis +) ENGINE=MEMORY DEFAULT CHARSET=sjis SHOW CREATE TABLE `sW`; Table Create Table sW CREATE TABLE `sW` ( - `bQ` char(1) NOT NULL default '', - `bP` enum('','','') default NULL, + `bQ` char(1) NOT NULL, + `bP` enum('','','') DEFAULT NULL, KEY `bP` (`bP`) -) ENGINE=HEAP DEFAULT CHARSET=sjis +) ENGINE=MEMORY DEFAULT CHARSET=sjis SHOW CREATE TABLE `sX`; Table Create Table sX CREATE TABLE `sX` ( - `bQ` char(1) NOT NULL default '', - `bP` enum('\','\','\') default NULL, - KEY `bP` (`bP`) -) ENGINE=HEAP DEFAULT CHARSET=sjis -SHOW CREATE TABLE `sPO`; -Table Create Table -sPO CREATE TABLE `sPO` ( - `bQ` char(1) NOT NULL default '', - `bP` enum('','','') default NULL, - KEY `bP` (`bP`) -) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis -SHOW CREATE TABLE `sPP`; -Table Create Table -sPP CREATE TABLE `sPP` ( - `bQ` char(1) NOT NULL default '', - `bP` enum('','','') default NULL, - KEY `bP` (`bP`) -) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis -SHOW CREATE TABLE `sPQ`; -Table Create Table -sPQ CREATE TABLE `sPQ` ( - `bQ` char(1) NOT NULL default '', - `bP` enum('\','\','\') default NULL, + `bQ` char(1) NOT NULL, + `bP` enum('\','\','\') DEFAULT NULL, KEY `bP` (`bP`) -) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis +) ENGINE=MEMORY DEFAULT CHARSET=sjis +CREATE TABLE t1(c1 enum('S','s')) default character set = sjis; +INSERT INTO t1 VALUES('S'),('s'); +SELECT * FROM t1 WHERE c1 LIKE 'S'; +c1 +S +DROP TABLE t1; DESC `sP`; Field Type Null Key Default Extra -bQ char(1) +bQ char(1) NO NULL bP enum('','','') YES MUL NULL DESC `sQ`; Field Type Null Key Default Extra -bQ char(1) +bQ char(1) NO NULL bP enum('','','') YES MUL NULL DESC `sR`; Field Type Null Key Default Extra -bQ char(1) +bQ char(1) NO NULL bP enum('\','\','\') YES MUL NULL DESC `sS`; Field Type Null Key Default Extra -bQ char(1) +bQ char(1) NO NULL bP enum('','','') YES MUL NULL DESC `sT`; Field Type Null Key Default Extra -bQ char(1) +bQ char(1) NO NULL bP enum('','','') YES MUL NULL DESC `sU`; Field Type Null Key Default Extra -bQ char(1) +bQ char(1) NO NULL bP enum('\','\','\') YES MUL NULL DESC `sV`; Field Type Null Key Default Extra -bQ char(1) +bQ char(1) NO NULL bP enum('','','') YES MUL NULL DESC `sW`; Field Type Null Key Default Extra -bQ char(1) +bQ char(1) NO NULL bP enum('','','') YES MUL NULL DESC `sX`; Field Type Null Key Default Extra -bQ char(1) -bP enum('\','\','\') YES MUL NULL -DESC `sPO`; -Field Type Null Key Default Extra -bQ char(1) -bP enum('','','') YES MUL NULL -DESC `sPP`; -Field Type Null Key Default Extra -bQ char(1) -bP enum('','','') YES MUL NULL -DESC `sPQ`; -Field Type Null Key Default Extra -bQ char(1) +bQ char(1) NO NULL bP enum('\','\','\') YES MUL NULL DROP TABLE `sP`; DROP TABLE `sQ`; @@ -357,6 +277,3 @@ DROP TABLE `sU`; DROP TABLE `sV`; DROP TABLE `sW`; DROP TABLE `sX`; -DROP TABLE `sPO`; -DROP TABLE `sPP`; -DROP TABLE `sPQ`; diff --git a/mysql-test/suite/jp/r/jp_enum_ucs2.result b/mysql-test/suite/jp/r/jp_enum_ucs2.result index a84cace35fe..cb0726cd623 100644 --- a/mysql-test/suite/jp/r/jp_enum_ucs2.result +++ b/mysql-test/suite/jp/r/jp_enum_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 `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHAR CREATE TABLE `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = myisam; CREATE TABLE `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = myisam; CREATE TABLE `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = myisam; -CREATE TABLE `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = bdb; -CREATE TABLE `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = bdb; -CREATE TABLE `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = bdb; +CREATE TABLE `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = MEMORY; INSERT INTO `ԣ` VALUES (''),(''),(''); INSERT INTO `ԣ` VALUES (''),(''),(''); INSERT INTO `ԣ` VALUES (''),(''),(''); @@ -34,9 +28,6 @@ INSERT INTO `ԣ` VALUES (''),(''),(''); INSERT INTO `ԣ` VALUES (''),(''),(''); INSERT INTO `ԣ` VALUES (''),(''),(''); INSERT INTO `ԣ` VALUES (''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''); SELECT * FROM `ԣ`; ã @@ -82,93 +73,60 @@ SELECT * FROM `ԣ`; -SELECT * FROM `ԣ`; -ã - - - -SELECT * FROM `ԣ`; -ã - - - -SELECT * FROM `ԣ`; -ã - - - SHOW CREATE TABLE `ԣ`; Table Create Table ԣ CREATE TABLE `ԣ` ( - `ã` enum('','','') default NULL, + `ã` enum('','','') DEFAULT NULL, KEY `ã` (`ã`) ) ENGINE=InnoDB DEFAULT CHARSET=ucs2 SHOW CREATE TABLE `ԣ`; Table Create Table ԣ CREATE TABLE `ԣ` ( - `ã` enum('','','') default NULL, + `ã` enum('','','') DEFAULT NULL, KEY `ã` (`ã`) ) ENGINE=InnoDB DEFAULT CHARSET=ucs2 SHOW CREATE TABLE `ԣ`; Table Create Table ԣ CREATE TABLE `ԣ` ( - `ã` enum('','','') default NULL, + `ã` enum('','','') DEFAULT NULL, KEY `ã` (`ã`) ) ENGINE=InnoDB DEFAULT CHARSET=ucs2 SHOW CREATE TABLE `ԣ`; Table Create Table ԣ CREATE TABLE `ԣ` ( - `ã` enum('','','') default NULL, + `ã` enum('','','') DEFAULT NULL, KEY `ã` (`ã`) ) ENGINE=MyISAM DEFAULT CHARSET=ucs2 SHOW CREATE TABLE `ԣ`; Table Create Table ԣ CREATE TABLE `ԣ` ( - `ã` enum('','','') default NULL, + `ã` enum('','','') DEFAULT NULL, KEY `ã` (`ã`) ) ENGINE=MyISAM DEFAULT CHARSET=ucs2 SHOW CREATE TABLE `ԣ`; Table Create Table ԣ CREATE TABLE `ԣ` ( - `ã` enum('','','') default NULL, + `ã` enum('','','') DEFAULT NULL, KEY `ã` (`ã`) ) ENGINE=MyISAM DEFAULT CHARSET=ucs2 SHOW CREATE TABLE `ԣ`; Table Create Table ԣ CREATE TABLE `ԣ` ( - `ã` enum('','','') default NULL, + `ã` enum('','','') DEFAULT NULL, KEY `ã` (`ã`) -) ENGINE=HEAP DEFAULT CHARSET=ucs2 +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 SHOW CREATE TABLE `ԣ`; Table Create Table ԣ CREATE TABLE `ԣ` ( - `ã` enum('','','') default NULL, + `ã` enum('','','') DEFAULT NULL, KEY `ã` (`ã`) -) ENGINE=HEAP DEFAULT CHARSET=ucs2 +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 SHOW CREATE TABLE `ԣ`; Table Create Table ԣ CREATE TABLE `ԣ` ( - `ã` enum('','','') default NULL, - KEY `ã` (`ã`) -) ENGINE=HEAP DEFAULT CHARSET=ucs2 -SHOW CREATE TABLE `ԣ`; -Table Create Table -ԣ CREATE TABLE `ԣ` ( - `ã` enum('','','') default NULL, - KEY `ã` (`ã`) -) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2 -SHOW CREATE TABLE `ԣ`; -Table Create Table -ԣ CREATE TABLE `ԣ` ( - `ã` enum('','','') default NULL, + `ã` enum('','','') DEFAULT NULL, KEY `ã` (`ã`) -) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2 -SHOW CREATE TABLE `ԣ`; -Table Create Table -ԣ CREATE TABLE `ԣ` ( - `ã` enum('','','') default NULL, - KEY `ã` (`ã`) -) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2 +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 DESC `ԣ`; Field Type Null Key Default Extra ã enum('','','') YES MUL NULL @@ -196,14 +154,113 @@ Field Type Null Key Default Extra DESC `ԣ`; Field Type Null Key Default Extra ã enum('','','') YES MUL NULL -DESC `ԣ`; +ALTER TABLE `ԣ` ADD `ã` CHAR(1) NOT NULL FIRST; +ALTER TABLE `ԣ` ADD `ã` CHAR(1) NOT NULL FIRST; +ALTER TABLE `ԣ` ADD `ã` CHAR(1) NOT NULL FIRST; +ALTER TABLE `ԣ` ADD `ã` CHAR(1) NOT NULL FIRST; +ALTER TABLE `ԣ` ADD `ã` CHAR(1) NOT NULL FIRST; +ALTER TABLE `ԣ` ADD `ã` CHAR(1) NOT NULL FIRST; +ALTER TABLE `ԣ` ADD `ã` CHAR(1) NOT NULL FIRST; +ALTER TABLE `ԣ` ADD `ã` CHAR(1) NOT NULL FIRST; +ALTER TABLE `ԣ` ADD `ã` CHAR(1) NOT NULL FIRST; +SHOW CREATE TABLE `ԣ`; +Table Create Table +ԣ CREATE TABLE `ԣ` ( + `ã` char(1) NOT NULL, + `ã` enum('','','') DEFAULT NULL, + KEY `ã` (`ã`) +) ENGINE=InnoDB DEFAULT CHARSET=ucs2 +SHOW CREATE TABLE `ԣ`; +Table Create Table +ԣ CREATE TABLE `ԣ` ( + `ã` char(1) NOT NULL, + `ã` enum('','','') DEFAULT NULL, + KEY `ã` (`ã`) +) ENGINE=InnoDB DEFAULT CHARSET=ucs2 +SHOW CREATE TABLE `ԣ`; +Table Create Table +ԣ CREATE TABLE `ԣ` ( + `ã` char(1) NOT NULL, + `ã` enum('','','') DEFAULT NULL, + KEY `ã` (`ã`) +) ENGINE=InnoDB DEFAULT CHARSET=ucs2 +SHOW CREATE TABLE `ԣ`; +Table Create Table +ԣ CREATE TABLE `ԣ` ( + `ã` char(1) NOT NULL, + `ã` enum('','','') DEFAULT NULL, + KEY `ã` (`ã`) +) ENGINE=MyISAM DEFAULT CHARSET=ucs2 +SHOW CREATE TABLE `ԣ`; +Table Create Table +ԣ CREATE TABLE `ԣ` ( + `ã` char(1) NOT NULL, + `ã` enum('','','') DEFAULT NULL, + KEY `ã` (`ã`) +) ENGINE=MyISAM DEFAULT CHARSET=ucs2 +SHOW CREATE TABLE `ԣ`; +Table Create Table +ԣ CREATE TABLE `ԣ` ( + `ã` char(1) NOT NULL, + `ã` enum('','','') DEFAULT NULL, + KEY `ã` (`ã`) +) ENGINE=MyISAM DEFAULT CHARSET=ucs2 +SHOW CREATE TABLE `ԣ`; +Table Create Table +ԣ CREATE TABLE `ԣ` ( + `ã` char(1) NOT NULL, + `ã` enum('','','') DEFAULT NULL, + KEY `ã` (`ã`) +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 +SHOW CREATE TABLE `ԣ`; +Table Create Table +ԣ CREATE TABLE `ԣ` ( + `ã` char(1) NOT NULL, + `ã` enum('','','') DEFAULT NULL, + KEY `ã` (`ã`) +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 +SHOW CREATE TABLE `ԣ`; +Table Create Table +ԣ CREATE TABLE `ԣ` ( + `ã` char(1) NOT NULL, + `ã` enum('','','') DEFAULT NULL, + KEY `ã` (`ã`) +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 +DESC `ԣ`; Field Type Null Key Default Extra +ã char(1) NO NULL ã enum('','','') YES MUL NULL -DESC `ԣ`; +DESC `ԣ`; +Field Type Null Key Default Extra +ã char(1) NO NULL +ã enum('','','') YES MUL NULL +DESC `ԣ`; +Field Type Null Key Default Extra +ã char(1) NO NULL +ã enum('','','') YES MUL NULL +DESC `ԣ`; +Field Type Null Key Default Extra +ã char(1) NO NULL +ã enum('','','') YES MUL NULL +DESC `ԣ`; Field Type Null Key Default Extra +ã char(1) NO NULL ã enum('','','') YES MUL NULL -DESC `ԣ`; +DESC `ԣ`; +Field Type Null Key Default Extra +ã char(1) NO NULL +ã enum('','','') YES MUL NULL +DESC `ԣ`; +Field Type Null Key Default Extra +ã char(1) NO NULL +ã enum('','','') YES MUL NULL +DESC `ԣ`; +Field Type Null Key Default Extra +ã char(1) NO NULL +ã enum('','','') YES MUL NULL +DESC `ԣ`; Field Type Null Key Default Extra +ã char(1) NO NULL ã enum('','','') YES MUL NULL DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -214,6 +271,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/r/jp_enum_ujis.result b/mysql-test/suite/jp/r/jp_enum_ujis.result index dbc850b1368..217c7e0e655 100644 --- a/mysql-test/suite/jp/r/jp_enum_ujis.result +++ b/mysql-test/suite/jp/r/jp_enum_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 `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = innodb; @@ -18,12 +15,9 @@ CREATE TABLE `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHAR CREATE TABLE `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = myisam; CREATE TABLE `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = myisam; CREATE TABLE `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = myisam; -CREATE TABLE `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = bdb; -CREATE TABLE `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = bdb; -CREATE TABLE `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = bdb; +CREATE TABLE `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHARSET = ujis 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 * FROM `ԣ`; ã @@ -81,93 +72,60 @@ SELECT * FROM `ԣ`; -SELECT * FROM `ԣ`; -ã - - - -SELECT * FROM `ԣ`; -ã - - - -SELECT * FROM `ԣ`; -ã - - - SHOW CREATE TABLE `ԣ`; Table Create Table ԣ CREATE TABLE `ԣ` ( - `ã` enum('','','') default NULL, + `ã` enum('','','') DEFAULT NULL, KEY `ã` (`ã`) ) ENGINE=InnoDB DEFAULT CHARSET=ujis SHOW CREATE TABLE `ԣ`; Table Create Table ԣ CREATE TABLE `ԣ` ( - `ã` enum('','','') default NULL, + `ã` enum('','','') DEFAULT NULL, KEY `ã` (`ã`) ) ENGINE=InnoDB DEFAULT CHARSET=ujis SHOW CREATE TABLE `ԣ`; Table Create Table ԣ CREATE TABLE `ԣ` ( - `ã` enum('','','') default NULL, + `ã` enum('','','') DEFAULT NULL, KEY `ã` (`ã`) ) ENGINE=InnoDB DEFAULT CHARSET=ujis SHOW CREATE TABLE `ԣ`; Table Create Table ԣ CREATE TABLE `ԣ` ( - `ã` enum('','','') default NULL, + `ã` enum('','','') DEFAULT NULL, KEY `ã` (`ã`) ) ENGINE=MyISAM DEFAULT CHARSET=ujis SHOW CREATE TABLE `ԣ`; Table Create Table ԣ CREATE TABLE `ԣ` ( - `ã` enum('','','') default NULL, + `ã` enum('','','') DEFAULT NULL, KEY `ã` (`ã`) ) ENGINE=MyISAM DEFAULT CHARSET=ujis SHOW CREATE TABLE `ԣ`; Table Create Table ԣ CREATE TABLE `ԣ` ( - `ã` enum('','','') default NULL, + `ã` enum('','','') DEFAULT NULL, KEY `ã` (`ã`) ) ENGINE=MyISAM DEFAULT CHARSET=ujis SHOW CREATE TABLE `ԣ`; Table Create Table ԣ CREATE TABLE `ԣ` ( - `ã` enum('','','') default NULL, + `ã` enum('','','') DEFAULT NULL, KEY `ã` (`ã`) -) ENGINE=HEAP DEFAULT CHARSET=ujis +) ENGINE=MEMORY DEFAULT CHARSET=ujis SHOW CREATE TABLE `ԣ`; Table Create Table ԣ CREATE TABLE `ԣ` ( - `ã` enum('','','') default NULL, + `ã` enum('','','') DEFAULT NULL, KEY `ã` (`ã`) -) ENGINE=HEAP DEFAULT CHARSET=ujis +) ENGINE=MEMORY DEFAULT CHARSET=ujis SHOW CREATE TABLE `ԣ`; Table Create Table ԣ CREATE TABLE `ԣ` ( - `ã` enum('','','') default NULL, - KEY `ã` (`ã`) -) ENGINE=HEAP DEFAULT CHARSET=ujis -SHOW CREATE TABLE `ԣ`; -Table Create Table -ԣ CREATE TABLE `ԣ` ( - `ã` enum('','','') default NULL, - KEY `ã` (`ã`) -) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis -SHOW CREATE TABLE `ԣ`; -Table Create Table -ԣ CREATE TABLE `ԣ` ( - `ã` enum('','','') default NULL, - KEY `ã` (`ã`) -) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis -SHOW CREATE TABLE `ԣ`; -Table Create Table -ԣ CREATE TABLE `ԣ` ( - `ã` enum('','','') default NULL, + `ã` enum('','','') DEFAULT NULL, KEY `ã` (`ã`) -) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis +) ENGINE=MEMORY DEFAULT CHARSET=ujis DESC `ԣ`; Field Type Null Key Default Extra ã enum('','','') YES MUL NULL @@ -195,15 +153,6 @@ Field Type Null Key Default Extra DESC `ԣ`; Field Type Null Key Default Extra ã enum('','','') YES MUL NULL -DESC `ԣ`; -Field Type Null Key Default Extra -ã enum('','','') YES MUL NULL -DESC `ԣ`; -Field Type Null Key Default Extra -ã enum('','','') YES MUL NULL -DESC `ԣ`; -Field Type Null Key Default Extra -ã enum('','','') YES MUL NULL ALTER TABLE `ԣ` ADD `ã` CHAR(1) NOT NULL FIRST; ALTER TABLE `ԣ` ADD `ã` CHAR(1) NOT NULL FIRST; ALTER TABLE `ԣ` ADD `ã` CHAR(1) NOT NULL FIRST; @@ -213,140 +162,104 @@ ALTER TABLE `ԣ` ADD `ã` CHAR(1) NOT NULL FIRST; ALTER TABLE `ԣ` ADD `ã` CHAR(1) NOT NULL FIRST; ALTER TABLE `ԣ` ADD `ã` CHAR(1) NOT NULL FIRST; ALTER TABLE `ԣ` ADD `ã` CHAR(1) NOT NULL FIRST; -ALTER TABLE `ԣ` ADD `ã` CHAR(1) NOT NULL FIRST; -ALTER TABLE `ԣ` ADD `ã` CHAR(1) NOT NULL FIRST; -ALTER TABLE `ԣ` ADD `ã` CHAR(1) NOT NULL FIRST; SHOW CREATE TABLE `ԣ`; Table Create Table ԣ CREATE TABLE `ԣ` ( - `ã` char(1) NOT NULL default '', - `ã` enum('','','') default NULL, + `ã` char(1) NOT NULL, + `ã` enum('','','') DEFAULT NULL, KEY `ã` (`ã`) ) ENGINE=InnoDB DEFAULT CHARSET=ujis SHOW CREATE TABLE `ԣ`; Table Create Table ԣ CREATE TABLE `ԣ` ( - `ã` char(1) NOT NULL default '', - `ã` enum('','','') default NULL, + `ã` char(1) NOT NULL, + `ã` enum('','','') DEFAULT NULL, KEY `ã` (`ã`) ) ENGINE=InnoDB DEFAULT CHARSET=ujis SHOW CREATE TABLE `ԣ`; Table Create Table ԣ CREATE TABLE `ԣ` ( - `ã` char(1) NOT NULL default '', - `ã` enum('','','') default NULL, + `ã` char(1) NOT NULL, + `ã` enum('','','') DEFAULT NULL, KEY `ã` (`ã`) ) ENGINE=InnoDB DEFAULT CHARSET=ujis SHOW CREATE TABLE `ԣ`; Table Create Table ԣ CREATE TABLE `ԣ` ( - `ã` char(1) NOT NULL default '', - `ã` enum('','','') default NULL, + `ã` char(1) NOT NULL, + `ã` enum('','','') DEFAULT NULL, KEY `ã` (`ã`) ) ENGINE=MyISAM DEFAULT CHARSET=ujis SHOW CREATE TABLE `ԣ`; Table Create Table ԣ CREATE TABLE `ԣ` ( - `ã` char(1) NOT NULL default '', - `ã` enum('','','') default NULL, + `ã` char(1) NOT NULL, + `ã` enum('','','') DEFAULT NULL, KEY `ã` (`ã`) ) ENGINE=MyISAM DEFAULT CHARSET=ujis SHOW CREATE TABLE `ԣ`; Table Create Table ԣ CREATE TABLE `ԣ` ( - `ã` char(1) NOT NULL default '', - `ã` enum('','','') default NULL, + `ã` char(1) NOT NULL, + `ã` enum('','','') DEFAULT NULL, KEY `ã` (`ã`) ) ENGINE=MyISAM DEFAULT CHARSET=ujis SHOW CREATE TABLE `ԣ`; Table Create Table ԣ CREATE TABLE `ԣ` ( - `ã` char(1) NOT NULL default '', - `ã` enum('','','') default NULL, + `ã` char(1) NOT NULL, + `ã` enum('','','') DEFAULT NULL, KEY `ã` (`ã`) -) ENGINE=HEAP DEFAULT CHARSET=ujis +) ENGINE=MEMORY DEFAULT CHARSET=ujis SHOW CREATE TABLE `ԣ`; Table Create Table ԣ CREATE TABLE `ԣ` ( - `ã` char(1) NOT NULL default '', - `ã` enum('','','') default NULL, + `ã` char(1) NOT NULL, + `ã` enum('','','') DEFAULT NULL, KEY `ã` (`ã`) -) ENGINE=HEAP DEFAULT CHARSET=ujis +) ENGINE=MEMORY DEFAULT CHARSET=ujis SHOW CREATE TABLE `ԣ`; Table Create Table ԣ CREATE TABLE `ԣ` ( - `ã` char(1) NOT NULL default '', - `ã` enum('','','') default NULL, - KEY `ã` (`ã`) -) ENGINE=HEAP DEFAULT CHARSET=ujis -SHOW CREATE TABLE `ԣ`; -Table Create Table -ԣ CREATE TABLE `ԣ` ( - `ã` char(1) NOT NULL default '', - `ã` enum('','','') default NULL, - KEY `ã` (`ã`) -) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis -SHOW CREATE TABLE `ԣ`; -Table Create Table -ԣ CREATE TABLE `ԣ` ( - `ã` char(1) NOT NULL default '', - `ã` enum('','','') default NULL, - KEY `ã` (`ã`) -) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis -SHOW CREATE TABLE `ԣ`; -Table Create Table -ԣ CREATE TABLE `ԣ` ( - `ã` char(1) NOT NULL default '', - `ã` enum('','','') default NULL, + `ã` char(1) NOT NULL, + `ã` enum('','','') DEFAULT NULL, KEY `ã` (`ã`) -) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis +) ENGINE=MEMORY DEFAULT CHARSET=ujis DESC `ԣ`; Field Type Null Key Default Extra -ã char(1) +ã char(1) NO NULL ã enum('','','') YES MUL NULL DESC `ԣ`; Field Type Null Key Default Extra -ã char(1) +ã char(1) NO NULL ã enum('','','') YES MUL NULL DESC `ԣ`; Field Type Null Key Default Extra -ã char(1) +ã char(1) NO NULL ã enum('','','') YES MUL NULL DESC `ԣ`; Field Type Null Key Default Extra -ã char(1) +ã char(1) NO NULL ã enum('','','') YES MUL NULL DESC `ԣ`; Field Type Null Key Default Extra -ã char(1) +ã char(1) NO NULL ã enum('','','') YES MUL NULL DESC `ԣ`; Field Type Null Key Default Extra -ã char(1) +ã char(1) NO NULL ã enum('','','') YES MUL NULL DESC `ԣ`; Field Type Null Key Default Extra -ã char(1) +ã char(1) NO NULL ã enum('','','') YES MUL NULL DESC `ԣ`; Field Type Null Key Default Extra -ã char(1) +ã char(1) NO NULL ã enum('','','') YES MUL NULL DESC `ԣ`; Field Type Null Key Default Extra -ã char(1) -ã enum('','','') YES MUL NULL -DESC `ԣ`; -Field Type Null Key Default Extra -ã char(1) -ã enum('','','') YES MUL NULL -DESC `ԣ`; -Field Type Null Key Default Extra -ã char(1) -ã enum('','','') YES MUL NULL -DESC `ԣ`; -Field Type Null Key Default Extra -ã char(1) +ã char(1) NO NULL ã enum('','','') YES MUL NULL DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -357,6 +270,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/r/jp_enum_utf8.result b/mysql-test/suite/jp/r/jp_enum_utf8.result index f2515871ece..861aef0462d 100644 --- a/mysql-test/suite/jp/r/jp_enum_utf8.result +++ b/mysql-test/suite/jp/r/jp_enum_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 `Ｔ１` (`Ｃ１` ENUM('ｱ','ｲ','ｳ'), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = innodb; @@ -18,12 +15,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` ENUM('龔','龖','龗'), INDEX(`Ｃ１`)) DEFAUL CREATE TABLE `Ｔ４` (`Ｃ１` ENUM('ｱ','ｲ','ｳ'), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam; CREATE TABLE `Ｔ５` (`Ｃ１` ENUM('あ','い','う'), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam; CREATE TABLE `Ｔ６` (`Ｃ１` ENUM('龔','龖','龗'), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam; -CREATE TABLE `Ｔ７` (`Ｃ１` ENUM('ｱ','ｲ','ｳ'), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ８` (`Ｃ１` ENUM('あ','い','う'), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ９` (`Ｃ１` ENUM('龔','龖','龗'), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ１０` (`Ｃ１` ENUM('ｱ','ｲ','ｳ'), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb; -CREATE TABLE `Ｔ１１` (`Ｃ１` ENUM('あ','い','う'), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb; -CREATE TABLE `Ｔ１２` (`Ｃ１` ENUM('龔','龖','龗'), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb; +CREATE TABLE `Ｔ７` (`Ｃ１` ENUM('ｱ','ｲ','ｳ'), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ８` (`Ｃ１` ENUM('あ','い','う'), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ９` (`Ｃ１` ENUM('龔','龖','龗'), 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 * FROM `Ｔ１`; Ｃ１ ｱ @@ -81,93 +72,60 @@ SELECT * FROM `Ｔ９`; 龔 龖 龗 -SELECT * FROM `Ｔ１０`; -Ｃ１ -ｱ -ｲ -ｳ -SELECT * FROM `Ｔ１１`; -Ｃ１ -あ -い -う -SELECT * FROM `Ｔ１２`; -Ｃ１ -龔 -龖 -龗 SHOW CREATE TABLE `Ｔ１`; Table Create Table Ｔ１ CREATE TABLE `Ｔ１` ( - `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL, + `Ｃ１` enum('ｱ','ｲ','ｳ') DEFAULT NULL, KEY `Ｃ１` (`Ｃ１`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 SHOW CREATE TABLE `Ｔ２`; Table Create Table Ｔ２ CREATE TABLE `Ｔ２` ( - `Ｃ１` enum('あ','い','う') default NULL, + `Ｃ１` enum('あ','い','う') DEFAULT NULL, KEY `Ｃ１` (`Ｃ１`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 SHOW CREATE TABLE `Ｔ３`; Table Create Table Ｔ３ CREATE TABLE `Ｔ３` ( - `Ｃ１` enum('龔','龖','龗') default NULL, + `Ｃ１` enum('龔','龖','龗') DEFAULT NULL, KEY `Ｃ１` (`Ｃ１`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 SHOW CREATE TABLE `Ｔ４`; Table Create Table Ｔ４ CREATE TABLE `Ｔ４` ( - `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL, + `Ｃ１` enum('ｱ','ｲ','ｳ') DEFAULT NULL, KEY `Ｃ１` (`Ｃ１`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 SHOW CREATE TABLE `Ｔ５`; Table Create Table Ｔ５ CREATE TABLE `Ｔ５` ( - `Ｃ１` enum('あ','い','う') default NULL, + `Ｃ１` enum('あ','い','う') DEFAULT NULL, KEY `Ｃ１` (`Ｃ１`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 SHOW CREATE TABLE `Ｔ６`; Table Create Table Ｔ６ CREATE TABLE `Ｔ６` ( - `Ｃ１` enum('龔','龖','龗') default NULL, + `Ｃ１` enum('龔','龖','龗') DEFAULT NULL, KEY `Ｃ１` (`Ｃ１`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 SHOW CREATE TABLE `Ｔ７`; Table Create Table Ｔ７ CREATE TABLE `Ｔ７` ( - `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL, + `Ｃ１` enum('ｱ','ｲ','ｳ') DEFAULT NULL, KEY `Ｃ１` (`Ｃ１`) -) ENGINE=HEAP DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 SHOW CREATE TABLE `Ｔ８`; Table Create Table Ｔ８ CREATE TABLE `Ｔ８` ( - `Ｃ１` enum('あ','い','う') default NULL, + `Ｃ１` enum('あ','い','う') DEFAULT NULL, KEY `Ｃ１` (`Ｃ１`) -) ENGINE=HEAP DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 SHOW CREATE TABLE `Ｔ９`; Table Create Table Ｔ９ CREATE TABLE `Ｔ９` ( - `Ｃ１` enum('龔','龖','龗') default NULL, - KEY `Ｃ１` (`Ｃ１`) -) ENGINE=HEAP DEFAULT CHARSET=utf8 -SHOW CREATE TABLE `Ｔ１０`; -Table Create Table -Ｔ１０ CREATE TABLE `Ｔ１０` ( - `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL, - KEY `Ｃ１` (`Ｃ１`) -) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8 -SHOW CREATE TABLE `Ｔ１１`; -Table Create Table -Ｔ１１ CREATE TABLE `Ｔ１１` ( - `Ｃ１` enum('あ','い','う') default NULL, - KEY `Ｃ１` (`Ｃ１`) -) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8 -SHOW CREATE TABLE `Ｔ１２`; -Table Create Table -Ｔ１２ CREATE TABLE `Ｔ１２` ( - `Ｃ１` enum('龔','龖','龗') default NULL, + `Ｃ１` enum('龔','龖','龗') DEFAULT NULL, KEY `Ｃ１` (`Ｃ１`) -) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 DESC `Ｔ１`; Field Type Null Key Default Extra Ｃ１ enum('ｱ','ｲ','ｳ') YES MUL NULL @@ -195,15 +153,6 @@ Field Type Null Key Default Extra DESC `Ｔ９`; Field Type Null Key Default Extra Ｃ１ enum('龔','龖','龗') YES MUL NULL -DESC `Ｔ１０`; -Field Type Null Key Default Extra -Ｃ１ enum('ｱ','ｲ','ｳ') YES MUL NULL -DESC `Ｔ１１`; -Field Type Null Key Default Extra -Ｃ１ enum('あ','い','う') YES MUL NULL -DESC `Ｔ１２`; -Field Type Null Key Default Extra -Ｃ１ enum('龔','龖','龗') YES MUL NULL ALTER TABLE `Ｔ１` ADD `Ｃ２` CHAR(1) NOT NULL FIRST; ALTER TABLE `Ｔ２` ADD `Ｃ２` CHAR(1) NOT NULL FIRST; ALTER TABLE `Ｔ３` ADD `Ｃ２` CHAR(1) NOT NULL FIRST; @@ -213,140 +162,104 @@ ALTER TABLE `Ｔ６` ADD `Ｃ２` CHAR(1) NOT NULL FIRST; ALTER TABLE `Ｔ７` ADD `Ｃ２` CHAR(1) NOT NULL FIRST; ALTER TABLE `Ｔ８` ADD `Ｃ２` CHAR(1) NOT NULL FIRST; ALTER TABLE `Ｔ９` ADD `Ｃ２` CHAR(1) NOT NULL FIRST; -ALTER TABLE `Ｔ１０` ADD `Ｃ２` CHAR(1) NOT NULL FIRST; -ALTER TABLE `Ｔ１１` ADD `Ｃ２` CHAR(1) NOT NULL FIRST; -ALTER TABLE `Ｔ１２` ADD `Ｃ２` CHAR(1) NOT NULL FIRST; SHOW CREATE TABLE `Ｔ１`; Table Create Table Ｔ１ CREATE TABLE `Ｔ１` ( - `Ｃ２` char(1) NOT NULL default '', - `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL, + `Ｃ２` char(1) NOT NULL, + `Ｃ１` enum('ｱ','ｲ','ｳ') DEFAULT NULL, KEY `Ｃ１` (`Ｃ１`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 SHOW CREATE TABLE `Ｔ２`; Table Create Table Ｔ２ CREATE TABLE `Ｔ２` ( - `Ｃ２` char(1) NOT NULL default '', - `Ｃ１` enum('あ','い','う') default NULL, + `Ｃ２` char(1) NOT NULL, + `Ｃ１` enum('あ','い','う') DEFAULT NULL, KEY `Ｃ１` (`Ｃ１`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 SHOW CREATE TABLE `Ｔ３`; Table Create Table Ｔ３ CREATE TABLE `Ｔ３` ( - `Ｃ２` char(1) NOT NULL default '', - `Ｃ１` enum('龔','龖','龗') default NULL, + `Ｃ２` char(1) NOT NULL, + `Ｃ１` enum('龔','龖','龗') DEFAULT NULL, KEY `Ｃ１` (`Ｃ１`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 SHOW CREATE TABLE `Ｔ４`; Table Create Table Ｔ４ CREATE TABLE `Ｔ４` ( - `Ｃ２` char(1) NOT NULL default '', - `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL, + `Ｃ２` char(1) NOT NULL, + `Ｃ１` enum('ｱ','ｲ','ｳ') DEFAULT NULL, KEY `Ｃ１` (`Ｃ１`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 SHOW CREATE TABLE `Ｔ５`; Table Create Table Ｔ５ CREATE TABLE `Ｔ５` ( - `Ｃ２` char(1) NOT NULL default '', - `Ｃ１` enum('あ','い','う') default NULL, + `Ｃ２` char(1) NOT NULL, + `Ｃ１` enum('あ','い','う') DEFAULT NULL, KEY `Ｃ１` (`Ｃ１`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 SHOW CREATE TABLE `Ｔ６`; Table Create Table Ｔ６ CREATE TABLE `Ｔ６` ( - `Ｃ２` char(1) NOT NULL default '', - `Ｃ１` enum('龔','龖','龗') default NULL, + `Ｃ２` char(1) NOT NULL, + `Ｃ１` enum('龔','龖','龗') DEFAULT NULL, KEY `Ｃ１` (`Ｃ１`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 SHOW CREATE TABLE `Ｔ７`; Table Create Table Ｔ７ CREATE TABLE `Ｔ７` ( - `Ｃ２` char(1) NOT NULL default '', - `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL, + `Ｃ２` char(1) NOT NULL, + `Ｃ１` enum('ｱ','ｲ','ｳ') DEFAULT NULL, KEY `Ｃ１` (`Ｃ１`) -) ENGINE=HEAP DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 SHOW CREATE TABLE `Ｔ８`; Table Create Table Ｔ８ CREATE TABLE `Ｔ８` ( - `Ｃ２` char(1) NOT NULL default '', - `Ｃ１` enum('あ','い','う') default NULL, + `Ｃ２` char(1) NOT NULL, + `Ｃ１` enum('あ','い','う') DEFAULT NULL, KEY `Ｃ１` (`Ｃ１`) -) ENGINE=HEAP DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 SHOW CREATE TABLE `Ｔ９`; Table Create Table Ｔ９ CREATE TABLE `Ｔ９` ( - `Ｃ２` char(1) NOT NULL default '', - `Ｃ１` enum('龔','龖','龗') default NULL, - KEY `Ｃ１` (`Ｃ１`) -) ENGINE=HEAP DEFAULT CHARSET=utf8 -SHOW CREATE TABLE `Ｔ１０`; -Table Create Table -Ｔ１０ CREATE TABLE `Ｔ１０` ( - `Ｃ２` char(1) NOT NULL default '', - `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL, - KEY `Ｃ１` (`Ｃ１`) -) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8 -SHOW CREATE TABLE `Ｔ１１`; -Table Create Table -Ｔ１１ CREATE TABLE `Ｔ１１` ( - `Ｃ２` char(1) NOT NULL default '', - `Ｃ１` enum('あ','い','う') default NULL, - KEY `Ｃ１` (`Ｃ１`) -) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8 -SHOW CREATE TABLE `Ｔ１２`; -Table Create Table -Ｔ１２ CREATE TABLE `Ｔ１２` ( - `Ｃ２` char(1) NOT NULL default '', - `Ｃ１` enum('龔','龖','龗') default NULL, + `Ｃ２` char(1) NOT NULL, + `Ｃ１` enum('龔','龖','龗') DEFAULT NULL, KEY `Ｃ１` (`Ｃ１`) -) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 DESC `Ｔ１`; Field Type Null Key Default Extra -Ｃ２ char(1) +Ｃ２ char(1) NO NULL Ｃ１ enum('ｱ','ｲ','ｳ') YES MUL NULL DESC `Ｔ２`; Field Type Null Key Default Extra -Ｃ２ char(1) +Ｃ２ char(1) NO NULL Ｃ１ enum('あ','い','う') YES MUL NULL DESC `Ｔ３`; Field Type Null Key Default Extra -Ｃ２ char(1) +Ｃ２ char(1) NO NULL Ｃ１ enum('龔','龖','龗') YES MUL NULL DESC `Ｔ４`; Field Type Null Key Default Extra -Ｃ２ char(1) +Ｃ２ char(1) NO NULL Ｃ１ enum('ｱ','ｲ','ｳ') YES MUL NULL DESC `Ｔ５`; Field Type Null Key Default Extra -Ｃ２ char(1) +Ｃ２ char(1) NO NULL Ｃ１ enum('あ','い','う') YES MUL NULL DESC `Ｔ６`; Field Type Null Key Default Extra -Ｃ２ char(1) +Ｃ２ char(1) NO NULL Ｃ１ enum('龔','龖','龗') YES MUL NULL DESC `Ｔ７`; Field Type Null Key Default Extra -Ｃ２ char(1) +Ｃ２ char(1) NO NULL Ｃ１ enum('ｱ','ｲ','ｳ') YES MUL NULL DESC `Ｔ８`; Field Type Null Key Default Extra -Ｃ２ char(1) +Ｃ２ char(1) NO NULL Ｃ１ enum('あ','い','う') YES MUL NULL DESC `Ｔ９`; Field Type Null Key Default Extra -Ｃ２ char(1) -Ｃ１ enum('龔','龖','龗') YES MUL NULL -DESC `Ｔ１０`; -Field Type Null Key Default Extra -Ｃ２ char(1) -Ｃ１ enum('ｱ','ｲ','ｳ') YES MUL NULL -DESC `Ｔ１１`; -Field Type Null Key Default Extra -Ｃ２ char(1) -Ｃ１ enum('あ','い','う') YES MUL NULL -DESC `Ｔ１２`; -Field Type Null Key Default Extra -Ｃ２ char(1) +Ｃ２ char(1) NO NULL Ｃ１ enum('龔','龖','龗') YES MUL NULL DROP TABLE `Ｔ１`; DROP TABLE `Ｔ２`; @@ -357,6 +270,3 @@ DROP TABLE `Ｔ６`; DROP TABLE `Ｔ７`; DROP TABLE `Ｔ８`; DROP TABLE `Ｔ９`; -DROP TABLE `Ｔ１０`; -DROP TABLE `Ｔ１１`; -DROP TABLE `Ｔ１２`; diff --git a/mysql-test/suite/jp/r/jp_insert_sjis.result b/mysql-test/suite/jp/r/jp_insert_sjis.result index c516986a256..53b1cdc692b 100644 --- a/mysql-test/suite/jp/r/jp_insert_sjis.result +++ b/mysql-test/suite/jp/r/jp_insert_sjis.result @@ -7,9 +7,6 @@ drop table if exists `sU`; 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(5)) DEFAULT CHARSET = sjis engine = innodb; @@ -18,12 +15,9 @@ CREATE TABLE `sR` (`bP` char(5)) DEFAULT CHARSET = sjis engine = innodb; CREATE TABLE `sS` (`bP` char(5)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sT` (`bP` char(5)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sU` (`bP` char(5)) DEFAULT CHARSET = sjis engine = myisam; -CREATE TABLE `sV` (`bP` char(5)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sW` (`bP` char(5)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sX` (`bP` char(5)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPO` (`bP` char(5)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPP` (`bP` char(5)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPQ` (`bP` char(5)) DEFAULT CHARSET = sjis engine = bdb; +CREATE TABLE `sV` (`bP` char(5)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sW` (`bP` char(5)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sX` (`bP` char(5)) DEFAULT CHARSET = sjis engine = MEMORY; INSERT INTO `sP` VALUES (''); INSERT INTO `sQ` VALUES (''); INSERT INTO `sR` VALUES ('\\\\\'); @@ -33,9 +27,6 @@ INSERT INTO `sU` VALUES ('\\\\\'); INSERT INTO `sV` VALUES (''); INSERT INTO `sW` VALUES (''); INSERT INTO `sX` VALUES ('\\\\\'); -INSERT INTO `sPO` VALUES (''); -INSERT INTO `sPP` VALUES (''); -INSERT INTO `sPQ` VALUES ('\\\\\'); SELECT INSERT(`bP`,1,1,'') FROM `sP`; INSERT(`bP`,1,1,'') @@ -711,186 +702,6 @@ INSERT(`bP`,4,2,'\\' ) SELECT INSERT(`bP`,5,1,'\') FROM `sX`; INSERT(`bP`,5,1,'\') \\\\\ -SELECT INSERT(`bP`,1,1,'') FROM `sPO`; -INSERT(`bP`,1,1,'') - -SELECT INSERT(`bP`,1,2,'') FROM `sPO`; -INSERT(`bP`,1,2,'') - -SELECT INSERT(`bP`,1,3,'') FROM `sPO`; -INSERT(`bP`,1,3,'') - -SELECT INSERT(`bP`,1,4,'') FROM `sPO`; -INSERT(`bP`,1,4,'') - -SELECT INSERT(`bP`,1,5,'') FROM `sPO`; -INSERT(`bP`,1,5,'') - -SELECT INSERT(`bP`,2,1,'') FROM `sPO`; -INSERT(`bP`,2,1,'') - -SELECT INSERT(`bP`,2,2,'') FROM `sPO`; -INSERT(`bP`,2,2,'') - -SELECT INSERT(`bP`,2,3,'') FROM `sPO`; -INSERT(`bP`,2,3,'') - -SELECT INSERT(`bP`,2,4,'') FROM `sPO`; -INSERT(`bP`,2,4,'') - -SELECT INSERT(`bP`,3,1,'') FROM `sPO`; -INSERT(`bP`,3,1,'') - -SELECT INSERT(`bP`,3,2,'') FROM `sPO`; -INSERT(`bP`,3,2,'') - -SELECT INSERT(`bP`,3,3,'') FROM `sPO`; -INSERT(`bP`,3,3,'') - -SELECT INSERT(`bP`,4,1,'') FROM `sPO`; -INSERT(`bP`,4,1,'') - -SELECT INSERT(`bP`,4,2,'') FROM `sPO`; -INSERT(`bP`,4,2,'') - -SELECT INSERT(`bP`,5,1,'') FROM `sPO`; -INSERT(`bP`,5,1,'') - -SELECT INSERT(`bP`,1,1,'') FROM `sPP`; -INSERT(`bP`,1,1,'') - -SELECT INSERT(`bP`,1,2,'') FROM `sPP`; -INSERT(`bP`,1,2,'') - -SELECT INSERT(`bP`,1,3,'') FROM `sPP`; -INSERT(`bP`,1,3,'') - -SELECT INSERT(`bP`,1,4,'') FROM `sPP`; -INSERT(`bP`,1,4,'') - -SELECT INSERT(`bP`,1,5,'') FROM `sPP`; -INSERT(`bP`,1,5,'') - -SELECT INSERT(`bP`,2,1,'') FROM `sPP`; -INSERT(`bP`,2,1,'') - -SELECT INSERT(`bP`,2,2,'') FROM `sPP`; -INSERT(`bP`,2,2,'') - -SELECT INSERT(`bP`,2,3,'') FROM `sPP`; -INSERT(`bP`,2,3,'') - -SELECT INSERT(`bP`,2,4,'') FROM `sPP`; -INSERT(`bP`,2,4,'') - -SELECT INSERT(`bP`,3,1,'') FROM `sPP`; -INSERT(`bP`,3,1,'') - -SELECT INSERT(`bP`,3,2,'') FROM `sPP`; -INSERT(`bP`,3,2,'') - -SELECT INSERT(`bP`,3,3,'') FROM `sPP`; -INSERT(`bP`,3,3,'') - -SELECT INSERT(`bP`,4,1,'') FROM `sPP`; -INSERT(`bP`,4,1,'') - -SELECT INSERT(`bP`,4,2,'') FROM `sPP`; -INSERT(`bP`,4,2,'') - -SELECT INSERT(`bP`,5,1,'') FROM `sPP`; -INSERT(`bP`,5,1,'') - -SELECT INSERT(`bP`,1,1,'@') FROM `sPP`; -INSERT(`bP`,1,1,'@') -@ -SELECT INSERT(`bP`,1,2,'@@') FROM `sPP`; -INSERT(`bP`,1,2,'@@') -@@ -SELECT INSERT(`bP`,1,3,'@@@') FROM `sPP`; -INSERT(`bP`,1,3,'@@@') -@@@ -SELECT INSERT(`bP`,1,4,'@@@@') FROM `sPP`; -INSERT(`bP`,1,4,'@@@@') -@@@@ -SELECT INSERT(`bP`,1,5,'@@@@@') FROM `sPP`; -INSERT(`bP`,1,5,'@@@@@') -@@@@@ -SELECT INSERT(`bP`,2,1,'@') FROM `sPP`; -INSERT(`bP`,2,1,'@') -@ -SELECT INSERT(`bP`,2,2,'@@') FROM `sPP`; -INSERT(`bP`,2,2,'@@') -@@ -SELECT INSERT(`bP`,2,3,'@@@') FROM `sPP`; -INSERT(`bP`,2,3,'@@@') -@@@ -SELECT INSERT(`bP`,2,4,'@@@@') FROM `sPP`; -INSERT(`bP`,2,4,'@@@@') -@@@@ -SELECT INSERT(`bP`,3,1,'@') FROM `sPP`; -INSERT(`bP`,3,1,'@') -@ -SELECT INSERT(`bP`,3,2,'@@') FROM `sPP`; -INSERT(`bP`,3,2,'@@') -@@ -SELECT INSERT(`bP`,3,3,'@@@') FROM `sPP`; -INSERT(`bP`,3,3,'@@@') -@@@ -SELECT INSERT(`bP`,4,1,'@') FROM `sPP`; -INSERT(`bP`,4,1,'@') -@ -SELECT INSERT(`bP`,4,2,'@@') FROM `sPP`; -INSERT(`bP`,4,2,'@@') -@@ -SELECT INSERT(`bP`,5,1,'@') FROM `sPP`; -INSERT(`bP`,5,1,'@') -@ -SELECT INSERT(`bP`,1,1,'\') FROM `sPQ`; -INSERT(`bP`,1,1,'\') -\\\\\ -SELECT INSERT(`bP`,1,2,'\\') FROM `sPQ`; -INSERT(`bP`,1,2,'\\') -\\\\\ -SELECT INSERT(`bP`,1,3,'\\\') FROM `sPQ`; -INSERT(`bP`,1,3,'\\\') -\\\\\ -SELECT INSERT(`bP`,1,4,'\\\\') FROM `sPQ`; -INSERT(`bP`,1,4,'\\\\') -\\\\\ -SELECT INSERT(`bP`,1,5,'\\\\\') FROM `sPQ`; -INSERT(`bP`,1,5,'\\\\\') -\\\\\ -SELECT INSERT(`bP`,2,1,'\') FROM `sPQ`; -INSERT(`bP`,2,1,'\') -\\\\\ -SELECT INSERT(`bP`,2,2,'\\') FROM `sPQ`; -INSERT(`bP`,2,2,'\\') -\\\\\ -SELECT INSERT(`bP`,2,3,'\\\') FROM `sPQ`; -INSERT(`bP`,2,3,'\\\') -\\\\\ -SELECT INSERT(`bP`,2,4,'\\\\') FROM `sPQ`; -INSERT(`bP`,2,4,'\\\\') -\\\\\ -SELECT INSERT(`bP`,3,1,'\') FROM `sPQ`; -INSERT(`bP`,3,1,'\') -\\\\\ -SELECT INSERT(`bP`,3,2,'\\') FROM `sPQ`; -INSERT(`bP`,3,2,'\\') -\\\\\ -SELECT INSERT(`bP`,3,3,'\\\') FROM `sPQ`; -INSERT(`bP`,3,3,'\\\') -\\\\\ -SELECT INSERT(`bP`,4,1,'\') FROM `sPQ`; -INSERT(`bP`,4,1,'\') -\\\\\ -SELECT INSERT(`bP`,4,2,'\\') FROM `sPQ`; -INSERT(`bP`,4,2,'\\') -\\\\\ -SELECT INSERT(`bP`,5,1,'\') FROM `sPQ`; -INSERT(`bP`,5,1,'\') -\\\\\ DROP TABLE `sP`; DROP TABLE `sQ`; DROP TABLE `sR`; @@ -900,6 +711,3 @@ DROP TABLE `sU`; DROP TABLE `sV`; DROP TABLE `sW`; DROP TABLE `sX`; -DROP TABLE `sPO`; -DROP TABLE `sPP`; -DROP TABLE `sPQ`; diff --git a/mysql-test/suite/jp/r/jp_insert_ucs2.result b/mysql-test/suite/jp/r/jp_insert_ucs2.result index 45487f65138..e382f38515c 100644 --- a/mysql-test/suite/jp/r/jp_insert_ucs2.result +++ b/mysql-test/suite/jp/r/jp_insert_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 `ԣ` (`ã` char(5)) DEFAULT CHARSET = ucs2 engine = innodb; CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ucs2 engine = myisam; CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ucs2 engine = myisam; CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ucs2 engine = myisam; -CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ucs2 engine = bdb; -CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ucs2 engine = bdb; -CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ucs2 engine = bdb; +CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ucs2 engine = MEMORY; INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES ('ݏޏߏ'); @@ -34,9 +28,6 @@ INSERT INTO `ԣ` VALUES ('ݏޏߏ'); INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES ('ݏޏߏ'); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'); SELECT INSERT(`ã`,1,1,'') FROM `ԣ`; INSERT(`ã`,1,1,'') @@ -712,186 +703,6 @@ INSERT(`ã`,4,2,'' ) SELECT INSERT(`ã`,5,1,'') FROM `ԣ`; INSERT(`ã`,5,1,'') ݏޏߏ -SELECT INSERT(`ã`,1,1,'') FROM `ԣ`; -INSERT(`ã`,1,1,'') - -SELECT INSERT(`ã`,1,2,'') FROM `ԣ`; -INSERT(`ã`,1,2,'') - -SELECT INSERT(`ã`,1,3,'') FROM `ԣ`; -INSERT(`ã`,1,3,'') - -SELECT INSERT(`ã`,1,4,'') FROM `ԣ`; -INSERT(`ã`,1,4,'') - -SELECT INSERT(`ã`,1,5,'') FROM `ԣ`; -INSERT(`ã`,1,5,'') - -SELECT INSERT(`ã`,2,1,'') FROM `ԣ`; -INSERT(`ã`,2,1,'') - -SELECT INSERT(`ã`,2,2,'') FROM `ԣ`; -INSERT(`ã`,2,2,'') - -SELECT INSERT(`ã`,2,3,'') FROM `ԣ`; -INSERT(`ã`,2,3,'') - -SELECT INSERT(`ã`,2,4,'') FROM `ԣ`; -INSERT(`ã`,2,4,'') - -SELECT INSERT(`ã`,3,1,'') FROM `ԣ`; -INSERT(`ã`,3,1,'') - -SELECT INSERT(`ã`,3,2,'') FROM `ԣ`; -INSERT(`ã`,3,2,'') - -SELECT INSERT(`ã`,3,3,'') FROM `ԣ`; -INSERT(`ã`,3,3,'') - -SELECT INSERT(`ã`,4,1,'') FROM `ԣ`; -INSERT(`ã`,4,1,'') - -SELECT INSERT(`ã`,4,2,'') FROM `ԣ`; -INSERT(`ã`,4,2,'') - -SELECT INSERT(`ã`,5,1,'') FROM `ԣ`; -INSERT(`ã`,5,1,'') - -SELECT INSERT(`ã`,1,1,'') FROM `ԣ`; -INSERT(`ã`,1,1,'') - -SELECT INSERT(`ã`,1,2,'') FROM `ԣ`; -INSERT(`ã`,1,2,'') - -SELECT INSERT(`ã`,1,3,'') FROM `ԣ`; -INSERT(`ã`,1,3,'') - -SELECT INSERT(`ã`,1,4,'') FROM `ԣ`; -INSERT(`ã`,1,4,'') - -SELECT INSERT(`ã`,1,5,'') FROM `ԣ`; -INSERT(`ã`,1,5,'') - -SELECT INSERT(`ã`,2,1,'') FROM `ԣ`; -INSERT(`ã`,2,1,'') - -SELECT INSERT(`ã`,2,2,'') FROM `ԣ`; -INSERT(`ã`,2,2,'') - -SELECT INSERT(`ã`,2,3,'') FROM `ԣ`; -INSERT(`ã`,2,3,'') - -SELECT INSERT(`ã`,2,4,'') FROM `ԣ`; -INSERT(`ã`,2,4,'') - -SELECT INSERT(`ã`,3,1,'') FROM `ԣ`; -INSERT(`ã`,3,1,'') - -SELECT INSERT(`ã`,3,2,'') FROM `ԣ`; -INSERT(`ã`,3,2,'') - -SELECT INSERT(`ã`,3,3,'') FROM `ԣ`; -INSERT(`ã`,3,3,'') - -SELECT INSERT(`ã`,4,1,'') FROM `ԣ`; -INSERT(`ã`,4,1,'') - -SELECT INSERT(`ã`,4,2,'') FROM `ԣ`; -INSERT(`ã`,4,2,'') - -SELECT INSERT(`ã`,5,1,'') FROM `ԣ`; -INSERT(`ã`,5,1,'') - -SELECT INSERT(`ã`,1,1,'') FROM `ԣ`; -INSERT(`ã`,1,1,'') - -SELECT INSERT(`ã`,1,2,'') FROM `ԣ`; -INSERT(`ã`,1,2,'') - -SELECT INSERT(`ã`,1,3,'') FROM `ԣ`; -INSERT(`ã`,1,3,'') - -SELECT INSERT(`ã`,1,4,'') FROM `ԣ`; -INSERT(`ã`,1,4,'') - -SELECT INSERT(`ã`,1,5,'') FROM `ԣ`; -INSERT(`ã`,1,5,'') - -SELECT INSERT(`ã`,2,1,'') FROM `ԣ`; -INSERT(`ã`,2,1,'') - -SELECT INSERT(`ã`,2,2,'') FROM `ԣ`; -INSERT(`ã`,2,2,'') - -SELECT INSERT(`ã`,2,3,'') FROM `ԣ`; -INSERT(`ã`,2,3,'') - -SELECT INSERT(`ã`,2,4,'') FROM `ԣ`; -INSERT(`ã`,2,4,'') - -SELECT INSERT(`ã`,3,1,'') FROM `ԣ`; -INSERT(`ã`,3,1,'') - -SELECT INSERT(`ã`,3,2,'') FROM `ԣ`; -INSERT(`ã`,3,2,'') - -SELECT INSERT(`ã`,3,3,'') FROM `ԣ`; -INSERT(`ã`,3,3,'') - -SELECT INSERT(`ã`,4,1,'') FROM `ԣ`; -INSERT(`ã`,4,1,'') - -SELECT INSERT(`ã`,4,2,'') FROM `ԣ`; -INSERT(`ã`,4,2,'') - -SELECT INSERT(`ã`,5,1,'') FROM `ԣ`; -INSERT(`ã`,5,1,'') - -SELECT INSERT(`ã`,1,1,'') FROM `ԣ`; -INSERT(`ã`,1,1,'') -ݏޏߏ -SELECT INSERT(`ã`,1,2,'') FROM `ԣ`; -INSERT(`ã`,1,2,'') -ޏߏ -SELECT INSERT(`ã`,1,3,'') FROM `ԣ`; -INSERT(`ã`,1,3,'') -ߏ -SELECT INSERT(`ã`,1,4,'') FROM `ԣ`; -INSERT(`ã`,1,4,'') - -SELECT INSERT(`ã`,1,5,'') FROM `ԣ`; -INSERT(`ã`,1,5,'') - -SELECT INSERT(`ã`,2,1,'') FROM `ԣ`; -INSERT(`ã`,2,1,'') -ޏߏ -SELECT INSERT(`ã`,2,2,'') FROM `ԣ`; -INSERT(`ã`,2,2,'') -ߏ -SELECT INSERT(`ã`,2,3,'') FROM `ԣ`; -INSERT(`ã`,2,3,'') - -SELECT INSERT(`ã`,2,4,'') FROM `ԣ`; -INSERT(`ã`,2,4,'') - -SELECT INSERT(`ã`,3,1,'') FROM `ԣ`; -INSERT(`ã`,3,1,'') -ݏߏ -SELECT INSERT(`ã`,3,2,'') FROM `ԣ`; -INSERT(`ã`,3,2,'') -ݏ -SELECT INSERT(`ã`,3,3,'') FROM `ԣ`; -INSERT(`ã`,3,3,'') -ݏ -SELECT INSERT(`ã`,4,1,'') FROM `ԣ`; -INSERT(`ã`,4,1,'') -ݏޏ -SELECT INSERT(`ã`,4,2,'') FROM `ԣ`; -INSERT(`ã`,4,2,'') -ݏޏ -SELECT INSERT(`ã`,5,1,'') FROM `ԣ`; -INSERT(`ã`,5,1,'') -ݏޏߏ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -901,6 +712,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/r/jp_insert_ujis.result b/mysql-test/suite/jp/r/jp_insert_ujis.result index 7f42d66c565..905769863f4 100644 --- a/mysql-test/suite/jp/r/jp_insert_ujis.result +++ b/mysql-test/suite/jp/r/jp_insert_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; SET collation_connection = ujis_japanese_ci; @@ -19,12 +16,9 @@ CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ujis engine = innodb; CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ujis engine = myisam; CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ujis engine = myisam; CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ujis engine = myisam; -CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ujis engine = bdb; -CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ujis engine = bdb; -CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ujis engine = bdb; +CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ujis engine = MEMORY; INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES ('ݏޏߏ'); @@ -34,9 +28,6 @@ INSERT INTO `ԣ` VALUES ('ݏޏߏ'); INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES ('ݏޏߏ'); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'); SELECT INSERT(`ã`,1,1,'') FROM `ԣ`; INSERT(`ã`,1,1,'') @@ -712,186 +703,6 @@ INSERT(`ã`,4,2,'' ) SELECT INSERT(`ã`,5,1,'') FROM `ԣ`; INSERT(`ã`,5,1,'') ݏޏߏ -SELECT INSERT(`ã`,1,1,'') FROM `ԣ`; -INSERT(`ã`,1,1,'') - -SELECT INSERT(`ã`,1,2,'') FROM `ԣ`; -INSERT(`ã`,1,2,'') - -SELECT INSERT(`ã`,1,3,'') FROM `ԣ`; -INSERT(`ã`,1,3,'') - -SELECT INSERT(`ã`,1,4,'') FROM `ԣ`; -INSERT(`ã`,1,4,'') - -SELECT INSERT(`ã`,1,5,'') FROM `ԣ`; -INSERT(`ã`,1,5,'') - -SELECT INSERT(`ã`,2,1,'') FROM `ԣ`; -INSERT(`ã`,2,1,'') - -SELECT INSERT(`ã`,2,2,'') FROM `ԣ`; -INSERT(`ã`,2,2,'') - -SELECT INSERT(`ã`,2,3,'') FROM `ԣ`; -INSERT(`ã`,2,3,'') - -SELECT INSERT(`ã`,2,4,'') FROM `ԣ`; -INSERT(`ã`,2,4,'') - -SELECT INSERT(`ã`,3,1,'') FROM `ԣ`; -INSERT(`ã`,3,1,'') - -SELECT INSERT(`ã`,3,2,'') FROM `ԣ`; -INSERT(`ã`,3,2,'') - -SELECT INSERT(`ã`,3,3,'') FROM `ԣ`; -INSERT(`ã`,3,3,'') - -SELECT INSERT(`ã`,4,1,'') FROM `ԣ`; -INSERT(`ã`,4,1,'') - -SELECT INSERT(`ã`,4,2,'') FROM `ԣ`; -INSERT(`ã`,4,2,'') - -SELECT INSERT(`ã`,5,1,'') FROM `ԣ`; -INSERT(`ã`,5,1,'') - -SELECT INSERT(`ã`,1,1,'') FROM `ԣ`; -INSERT(`ã`,1,1,'') - -SELECT INSERT(`ã`,1,2,'') FROM `ԣ`; -INSERT(`ã`,1,2,'') - -SELECT INSERT(`ã`,1,3,'') FROM `ԣ`; -INSERT(`ã`,1,3,'') - -SELECT INSERT(`ã`,1,4,'') FROM `ԣ`; -INSERT(`ã`,1,4,'') - -SELECT INSERT(`ã`,1,5,'') FROM `ԣ`; -INSERT(`ã`,1,5,'') - -SELECT INSERT(`ã`,2,1,'') FROM `ԣ`; -INSERT(`ã`,2,1,'') - -SELECT INSERT(`ã`,2,2,'') FROM `ԣ`; -INSERT(`ã`,2,2,'') - -SELECT INSERT(`ã`,2,3,'') FROM `ԣ`; -INSERT(`ã`,2,3,'') - -SELECT INSERT(`ã`,2,4,'') FROM `ԣ`; -INSERT(`ã`,2,4,'') - -SELECT INSERT(`ã`,3,1,'') FROM `ԣ`; -INSERT(`ã`,3,1,'') - -SELECT INSERT(`ã`,3,2,'') FROM `ԣ`; -INSERT(`ã`,3,2,'') - -SELECT INSERT(`ã`,3,3,'') FROM `ԣ`; -INSERT(`ã`,3,3,'') - -SELECT INSERT(`ã`,4,1,'') FROM `ԣ`; -INSERT(`ã`,4,1,'') - -SELECT INSERT(`ã`,4,2,'') FROM `ԣ`; -INSERT(`ã`,4,2,'') - -SELECT INSERT(`ã`,5,1,'') FROM `ԣ`; -INSERT(`ã`,5,1,'') - -SELECT INSERT(`ã`,1,1,'') FROM `ԣ`; -INSERT(`ã`,1,1,'') - -SELECT INSERT(`ã`,1,2,'') FROM `ԣ`; -INSERT(`ã`,1,2,'') - -SELECT INSERT(`ã`,1,3,'') FROM `ԣ`; -INSERT(`ã`,1,3,'') - -SELECT INSERT(`ã`,1,4,'') FROM `ԣ`; -INSERT(`ã`,1,4,'') - -SELECT INSERT(`ã`,1,5,'') FROM `ԣ`; -INSERT(`ã`,1,5,'') - -SELECT INSERT(`ã`,2,1,'') FROM `ԣ`; -INSERT(`ã`,2,1,'') - -SELECT INSERT(`ã`,2,2,'') FROM `ԣ`; -INSERT(`ã`,2,2,'') - -SELECT INSERT(`ã`,2,3,'') FROM `ԣ`; -INSERT(`ã`,2,3,'') - -SELECT INSERT(`ã`,2,4,'') FROM `ԣ`; -INSERT(`ã`,2,4,'') - -SELECT INSERT(`ã`,3,1,'') FROM `ԣ`; -INSERT(`ã`,3,1,'') - -SELECT INSERT(`ã`,3,2,'') FROM `ԣ`; -INSERT(`ã`,3,2,'') - -SELECT INSERT(`ã`,3,3,'') FROM `ԣ`; -INSERT(`ã`,3,3,'') - -SELECT INSERT(`ã`,4,1,'') FROM `ԣ`; -INSERT(`ã`,4,1,'') - -SELECT INSERT(`ã`,4,2,'') FROM `ԣ`; -INSERT(`ã`,4,2,'') - -SELECT INSERT(`ã`,5,1,'') FROM `ԣ`; -INSERT(`ã`,5,1,'') - -SELECT INSERT(`ã`,1,1,'') FROM `ԣ`; -INSERT(`ã`,1,1,'') -ݏޏߏ -SELECT INSERT(`ã`,1,2,'') FROM `ԣ`; -INSERT(`ã`,1,2,'') -ޏߏ -SELECT INSERT(`ã`,1,3,'') FROM `ԣ`; -INSERT(`ã`,1,3,'') -ߏ -SELECT INSERT(`ã`,1,4,'') FROM `ԣ`; -INSERT(`ã`,1,4,'') - -SELECT INSERT(`ã`,1,5,'') FROM `ԣ`; -INSERT(`ã`,1,5,'') - -SELECT INSERT(`ã`,2,1,'') FROM `ԣ`; -INSERT(`ã`,2,1,'') -ޏߏ -SELECT INSERT(`ã`,2,2,'') FROM `ԣ`; -INSERT(`ã`,2,2,'') -ߏ -SELECT INSERT(`ã`,2,3,'') FROM `ԣ`; -INSERT(`ã`,2,3,'') - -SELECT INSERT(`ã`,2,4,'') FROM `ԣ`; -INSERT(`ã`,2,4,'') - -SELECT INSERT(`ã`,3,1,'') FROM `ԣ`; -INSERT(`ã`,3,1,'') -ݏߏ -SELECT INSERT(`ã`,3,2,'') FROM `ԣ`; -INSERT(`ã`,3,2,'') -ݏ -SELECT INSERT(`ã`,3,3,'') FROM `ԣ`; -INSERT(`ã`,3,3,'') -ݏ -SELECT INSERT(`ã`,4,1,'') FROM `ԣ`; -INSERT(`ã`,4,1,'') -ݏޏ -SELECT INSERT(`ã`,4,2,'') FROM `ԣ`; -INSERT(`ã`,4,2,'') -ݏޏ -SELECT INSERT(`ã`,5,1,'') FROM `ԣ`; -INSERT(`ã`,5,1,'') -ݏޏߏ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -901,6 +712,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/r/jp_insert_utf8.result b/mysql-test/suite/jp/r/jp_insert_utf8.result index 368ba35f637..b49b13f8b47 100644 --- a/mysql-test/suite/jp/r/jp_insert_utf8.result +++ b/mysql-test/suite/jp/r/jp_insert_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)) DEFAULT CHARSET = utf8 engine = innodb; @@ -18,12 +15,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = innodb; CREATE TABLE `Ｔ４` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = myisam; CREATE TABLE `Ｔ５` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = myisam; CREATE TABLE `Ｔ６` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = myisam; -CREATE TABLE `Ｔ７` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ８` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ９` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ１０` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = bdb; -CREATE TABLE `Ｔ１１` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = bdb; -CREATE TABLE `Ｔ１２` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = bdb; +CREATE TABLE `Ｔ７` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ８` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ９` (`Ｃ１` char(5)) 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 INSERT(`Ｃ１`,1,1,'ｶ') FROM `Ｔ１`; INSERT(`Ｃ１`,1,1,'ｶ') ｶｲｳｴｵ @@ -711,186 +702,6 @@ INSERT(`Ｃ１`,4,2,'丂丂' ) SELECT INSERT(`Ｃ１`,5,1,'丂') FROM `Ｔ９`; INSERT(`Ｃ１`,5,1,'丂') 龔龖龗龞丂 -SELECT INSERT(`Ｃ１`,1,1,'ｶ') FROM `Ｔ１０`; -INSERT(`Ｃ１`,1,1,'ｶ') -ｶｲｳｴｵ -SELECT INSERT(`Ｃ１`,1,2,'ｶｶ') FROM `Ｔ１０`; -INSERT(`Ｃ１`,1,2,'ｶｶ') -ｶｶｳｴｵ -SELECT INSERT(`Ｃ１`,1,3,'ｶｶｶ') FROM `Ｔ１０`; -INSERT(`Ｃ１`,1,3,'ｶｶｶ') -ｶｶｶｴｵ -SELECT INSERT(`Ｃ１`,1,4,'ｶｶｶｶ') FROM `Ｔ１０`; -INSERT(`Ｃ１`,1,4,'ｶｶｶｶ') -ｶｶｶｶｵ -SELECT INSERT(`Ｃ１`,1,5,'ｶｶｶｶｶ') FROM `Ｔ１０`; -INSERT(`Ｃ１`,1,5,'ｶｶｶｶｶ') -ｶｶｶｶｶ -SELECT INSERT(`Ｃ１`,2,1,'ｶ') FROM `Ｔ１０`; -INSERT(`Ｃ１`,2,1,'ｶ') -ｱｶｳｴｵ -SELECT INSERT(`Ｃ１`,2,2,'ｶｶ') FROM `Ｔ１０`; -INSERT(`Ｃ１`,2,2,'ｶｶ') -ｱｶｶｴｵ -SELECT INSERT(`Ｃ１`,2,3,'ｶｶｶ') FROM `Ｔ１０`; -INSERT(`Ｃ１`,2,3,'ｶｶｶ') -ｱｶｶｶｵ -SELECT INSERT(`Ｃ１`,2,4,'ｶｶｶｶ') FROM `Ｔ１０`; -INSERT(`Ｃ１`,2,4,'ｶｶｶｶ') -ｱｶｶｶｶ -SELECT INSERT(`Ｃ１`,3,1,'ｶ') FROM `Ｔ１０`; -INSERT(`Ｃ１`,3,1,'ｶ') -ｱｲｶｴｵ -SELECT INSERT(`Ｃ１`,3,2,'ｶｶ') FROM `Ｔ１０`; -INSERT(`Ｃ１`,3,2,'ｶｶ') -ｱｲｶｶｵ -SELECT INSERT(`Ｃ１`,3,3,'ｶｶｶ') FROM `Ｔ１０`; -INSERT(`Ｃ１`,3,3,'ｶｶｶ') -ｱｲｶｶｶ -SELECT INSERT(`Ｃ１`,4,1,'ｶ') FROM `Ｔ１０`; -INSERT(`Ｃ１`,4,1,'ｶ') -ｱｲｳｶｵ -SELECT INSERT(`Ｃ１`,4,2,'ｶｶ') FROM `Ｔ１０`; -INSERT(`Ｃ１`,4,2,'ｶｶ') -ｱｲｳｶｶ -SELECT INSERT(`Ｃ１`,5,1,'ｶ') FROM `Ｔ１０`; -INSERT(`Ｃ１`,5,1,'ｶ') -ｱｲｳｴｶ -SELECT INSERT(`Ｃ１`,1,1,'か') FROM `Ｔ１１`; -INSERT(`Ｃ１`,1,1,'か') -かいうえお -SELECT INSERT(`Ｃ１`,1,2,'かか') FROM `Ｔ１１`; -INSERT(`Ｃ１`,1,2,'かか') -かかうえお -SELECT INSERT(`Ｃ１`,1,3,'かかか') FROM `Ｔ１１`; -INSERT(`Ｃ１`,1,3,'かかか') -かかかえお -SELECT INSERT(`Ｃ１`,1,4,'かかかか') FROM `Ｔ１１`; -INSERT(`Ｃ１`,1,4,'かかかか') -かかかかお -SELECT INSERT(`Ｃ１`,1,5,'かかかかか') FROM `Ｔ１１`; -INSERT(`Ｃ１`,1,5,'かかかかか') -かかかかか -SELECT INSERT(`Ｃ１`,2,1,'か') FROM `Ｔ１１`; -INSERT(`Ｃ１`,2,1,'か') -あかうえお -SELECT INSERT(`Ｃ１`,2,2,'かか') FROM `Ｔ１１`; -INSERT(`Ｃ１`,2,2,'かか') -あかかえお -SELECT INSERT(`Ｃ１`,2,3,'かかか') FROM `Ｔ１１`; -INSERT(`Ｃ１`,2,3,'かかか') -あかかかお -SELECT INSERT(`Ｃ１`,2,4,'かかかか') FROM `Ｔ１１`; -INSERT(`Ｃ１`,2,4,'かかかか') -あかかかか -SELECT INSERT(`Ｃ１`,3,1,'か') FROM `Ｔ１１`; -INSERT(`Ｃ１`,3,1,'か') -あいかえお -SELECT INSERT(`Ｃ１`,3,2,'かか') FROM `Ｔ１１`; -INSERT(`Ｃ１`,3,2,'かか') -あいかかお -SELECT INSERT(`Ｃ１`,3,3,'かかか') FROM `Ｔ１１`; -INSERT(`Ｃ１`,3,3,'かかか') -あいかかか -SELECT INSERT(`Ｃ１`,4,1,'か') FROM `Ｔ１１`; -INSERT(`Ｃ１`,4,1,'か') -あいうかお -SELECT INSERT(`Ｃ１`,4,2,'かか') FROM `Ｔ１１`; -INSERT(`Ｃ１`,4,2,'かか') -あいうかか -SELECT INSERT(`Ｃ１`,5,1,'か') FROM `Ｔ１１`; -INSERT(`Ｃ１`,5,1,'か') -あいうえか -SELECT INSERT(`Ｃ１`,1,1,' ') FROM `Ｔ１１`; -INSERT(`Ｃ１`,1,1,' ') - いうえお -SELECT INSERT(`Ｃ１`,1,2,' ') FROM `Ｔ１１`; -INSERT(`Ｃ１`,1,2,' ') - うえお -SELECT INSERT(`Ｃ１`,1,3,' ') FROM `Ｔ１１`; -INSERT(`Ｃ１`,1,3,' ') - えお -SELECT INSERT(`Ｃ１`,1,4,' ') FROM `Ｔ１１`; -INSERT(`Ｃ１`,1,4,' ') - お -SELECT INSERT(`Ｃ１`,1,5,' ') FROM `Ｔ１１`; -INSERT(`Ｃ１`,1,5,' ') - -SELECT INSERT(`Ｃ１`,2,1,' ') FROM `Ｔ１１`; -INSERT(`Ｃ１`,2,1,' ') -あ うえお -SELECT INSERT(`Ｃ１`,2,2,' ') FROM `Ｔ１１`; -INSERT(`Ｃ１`,2,2,' ') -あ えお -SELECT INSERT(`Ｃ１`,2,3,' ') FROM `Ｔ１１`; -INSERT(`Ｃ１`,2,3,' ') -あ お -SELECT INSERT(`Ｃ１`,2,4,' ') FROM `Ｔ１１`; -INSERT(`Ｃ１`,2,4,' ') -あ -SELECT INSERT(`Ｃ１`,3,1,' ') FROM `Ｔ１１`; -INSERT(`Ｃ１`,3,1,' ') -あい えお -SELECT INSERT(`Ｃ１`,3,2,' ') FROM `Ｔ１１`; -INSERT(`Ｃ１`,3,2,' ') -あい お -SELECT INSERT(`Ｃ１`,3,3,' ') FROM `Ｔ１１`; -INSERT(`Ｃ１`,3,3,' ') -あい -SELECT INSERT(`Ｃ１`,4,1,' ') FROM `Ｔ１１`; -INSERT(`Ｃ１`,4,1,' ') -あいう お -SELECT INSERT(`Ｃ１`,4,2,' ') FROM `Ｔ１１`; -INSERT(`Ｃ１`,4,2,' ') -あいう -SELECT INSERT(`Ｃ１`,5,1,' ') FROM `Ｔ１１`; -INSERT(`Ｃ１`,5,1,' ') -あいうえ -SELECT INSERT(`Ｃ１`,1,1,'丂') FROM `Ｔ１２`; -INSERT(`Ｃ１`,1,1,'丂') -丂龖龗龞龡 -SELECT INSERT(`Ｃ１`,1,2,'丂丂') FROM `Ｔ１２`; -INSERT(`Ｃ１`,1,2,'丂丂') -丂丂龗龞龡 -SELECT INSERT(`Ｃ１`,1,3,'丂丂丂') FROM `Ｔ１２`; -INSERT(`Ｃ１`,1,3,'丂丂丂') -丂丂丂龞龡 -SELECT INSERT(`Ｃ１`,1,4,'丂丂丂丂') FROM `Ｔ１２`; -INSERT(`Ｃ１`,1,4,'丂丂丂丂') -丂丂丂丂龡 -SELECT INSERT(`Ｃ１`,1,5,'丂丂丂丂丂') FROM `Ｔ１２`; -INSERT(`Ｃ１`,1,5,'丂丂丂丂丂') -丂丂丂丂丂 -SELECT INSERT(`Ｃ１`,2,1,'丂') FROM `Ｔ１２`; -INSERT(`Ｃ１`,2,1,'丂') -龔丂龗龞龡 -SELECT INSERT(`Ｃ１`,2,2,'丂丂') FROM `Ｔ１２`; -INSERT(`Ｃ１`,2,2,'丂丂') -龔丂丂龞龡 -SELECT INSERT(`Ｃ１`,2,3,'丂丂丂') FROM `Ｔ１２`; -INSERT(`Ｃ１`,2,3,'丂丂丂') -龔丂丂丂龡 -SELECT INSERT(`Ｃ１`,2,4,'丂丂丂丂') FROM `Ｔ１２`; -INSERT(`Ｃ１`,2,4,'丂丂丂丂') -龔丂丂丂丂 -SELECT INSERT(`Ｃ１`,3,1,'丂') FROM `Ｔ１２`; -INSERT(`Ｃ１`,3,1,'丂') -龔龖丂龞龡 -SELECT INSERT(`Ｃ１`,3,2,'丂丂') FROM `Ｔ１２`; -INSERT(`Ｃ１`,3,2,'丂丂') -龔龖丂丂龡 -SELECT INSERT(`Ｃ１`,3,3,'丂丂丂') FROM `Ｔ１２`; -INSERT(`Ｃ１`,3,3,'丂丂丂') -龔龖丂丂丂 -SELECT INSERT(`Ｃ１`,4,1,'丂') FROM `Ｔ１２`; -INSERT(`Ｃ１`,4,1,'丂') -龔龖龗丂龡 -SELECT INSERT(`Ｃ１`,4,2,'丂丂') FROM `Ｔ１２`; -INSERT(`Ｃ１`,4,2,'丂丂') -龔龖龗丂丂 -SELECT INSERT(`Ｃ１`,5,1,'丂') FROM `Ｔ１２`; -INSERT(`Ｃ１`,5,1,'丂') -龔龖龗龞丂 DROP TABLE `Ｔ１`; DROP TABLE `Ｔ２`; DROP TABLE `Ｔ３`; @@ -900,6 +711,3 @@ DROP TABLE `Ｔ６`; DROP TABLE `Ｔ７`; DROP TABLE `Ｔ８`; DROP TABLE `Ｔ９`; -DROP TABLE `Ｔ１０`; -DROP TABLE `Ｔ１１`; -DROP TABLE `Ｔ１２`; diff --git a/mysql-test/suite/jp/r/jp_instr_sjis.result b/mysql-test/suite/jp/r/jp_instr_sjis.result index 9a6dea5a426..b102b1a1b46 100644 --- a/mysql-test/suite/jp/r/jp_instr_sjis.result +++ b/mysql-test/suite/jp/r/jp_instr_sjis.result @@ -7,7 +7,6 @@ drop table if exists `sU`; drop table if exists `sV`; drop table if exists `sW`; drop table if exists `sX`; -drop table if exists `sPO`; SET NAMES sjis; SET character_set_database = sjis; CREATE TABLE `sP` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = innodb; @@ -16,12 +15,9 @@ CREATE TABLE `sR` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engin CREATE TABLE `sS` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sT` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sU` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; -CREATE TABLE `sV` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sW` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sX` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPO` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPP` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPQ` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; +CREATE TABLE `sV` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sW` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sX` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; INSERT INTO `sP` VALUES (''); INSERT INTO `sQ` VALUES (''); INSERT INTO `sR` VALUES ('\\\\\'); @@ -31,9 +27,6 @@ INSERT INTO `sU` VALUES ('\\\\\'); INSERT INTO `sV` VALUES (''); INSERT INTO `sW` VALUES (''); INSERT INTO `sX` VALUES ('\\\\\'); -INSERT INTO `sPO` VALUES (''); -INSERT INTO `sPP` VALUES (''); -INSERT INTO `sPQ` VALUES ('\\\\\'); SELECT INSTR(`bP`,'') from `sP`; INSTR(`bP`,'') 1 @@ -196,60 +189,6 @@ INSTR(`bP`,'\') SELECT INSTR(`bP`,'\') from `sX`; INSTR(`bP`,'\') 0 -SELECT INSTR(`bP`,'') from `sPO`; -INSTR(`bP`,'') -1 -SELECT INSTR(`bP`,'') from `sPO`; -INSTR(`bP`,'') -2 -SELECT INSTR(`bP`,'') from `sPO`; -INSTR(`bP`,'') -3 -SELECT INSTR(`bP`,'') from `sPO`; -INSTR(`bP`,'') -4 -SELECT INSTR(`bP`,'') from `sPO`; -INSTR(`bP`,'') -5 -SELECT INSTR(`bP`,'') from `sPO`; -INSTR(`bP`,'') -0 -SELECT INSTR(`bP`,'') from `sPP`; -INSTR(`bP`,'') -1 -SELECT INSTR(`bP`,'') from `sPP`; -INSTR(`bP`,'') -2 -SELECT INSTR(`bP`,'') from `sPP`; -INSTR(`bP`,'') -3 -SELECT INSTR(`bP`,'') from `sPP`; -INSTR(`bP`,'') -4 -SELECT INSTR(`bP`,'') from `sPP`; -INSTR(`bP`,'') -5 -SELECT INSTR(`bP`,'') from `sPP`; -INSTR(`bP`,'') -0 -SELECT INSTR(`bP`,'\') from `sPQ`; -INSTR(`bP`,'\') -1 -SELECT INSTR(`bP`,'\') from `sPQ`; -INSTR(`bP`,'\') -2 -SELECT INSTR(`bP`,'\') from `sPQ`; -INSTR(`bP`,'\') -3 -SELECT INSTR(`bP`,'\') from `sPQ`; -INSTR(`bP`,'\') -4 -SELECT INSTR(`bP`,'\') from `sPQ`; -INSTR(`bP`,'\') -5 -SELECT INSTR(`bP`,'\') from `sPQ`; -INSTR(`bP`,'\') -0 DROP TABLE `sP`; DROP TABLE `sQ`; DROP TABLE `sR`; @@ -259,6 +198,3 @@ DROP TABLE `sU`; DROP TABLE `sV`; DROP TABLE `sW`; DROP TABLE `sX`; -DROP TABLE `sPO`; -DROP TABLE `sPP`; -DROP TABLE `sPQ`; diff --git a/mysql-test/suite/jp/r/jp_instr_ucs2.result b/mysql-test/suite/jp/r/jp_instr_ucs2.result index 352525eee0b..5840bf49088 100644 --- a/mysql-test/suite/jp/r/jp_instr_ucs2.result +++ b/mysql-test/suite/jp/r/jp_instr_ucs2.result @@ -7,7 +7,6 @@ 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; @@ -17,12 +16,9 @@ CREATE TABLE `ԣ` (`ã` char(5), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engin 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 ('ݏޏߏ'); @@ -32,9 +28,6 @@ INSERT INTO `ԣ` VALUES ('ݏޏߏ'); INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES ('ݏޏߏ'); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'); SELECT INSTR(`ã`,'') from `ԣ`; INSTR(`ã`,'') 1 @@ -197,60 +190,6 @@ INSTR(`ã`,'') SELECT INSTR(`ã`,'') from `ԣ`; INSTR(`ã`,'') 0 -SELECT INSTR(`ã`,'') from `ԣ`; -INSTR(`ã`,'') -1 -SELECT INSTR(`ã`,'') from `ԣ`; -INSTR(`ã`,'') -2 -SELECT INSTR(`ã`,'') from `ԣ`; -INSTR(`ã`,'') -3 -SELECT INSTR(`ã`,'') from `ԣ`; -INSTR(`ã`,'') -4 -SELECT INSTR(`ã`,'') from `ԣ`; -INSTR(`ã`,'') -5 -SELECT INSTR(`ã`,'') from `ԣ`; -INSTR(`ã`,'') -0 -SELECT INSTR(`ã`,'') from `ԣ`; -INSTR(`ã`,'') -1 -SELECT INSTR(`ã`,'') from `ԣ`; -INSTR(`ã`,'') -2 -SELECT INSTR(`ã`,'') from `ԣ`; -INSTR(`ã`,'') -3 -SELECT INSTR(`ã`,'') from `ԣ`; -INSTR(`ã`,'') -4 -SELECT INSTR(`ã`,'') from `ԣ`; -INSTR(`ã`,'') -5 -SELECT INSTR(`ã`,'') from `ԣ`; -INSTR(`ã`,'') -0 -SELECT INSTR(`ã`,'') from `ԣ`; -INSTR(`ã`,'') -1 -SELECT INSTR(`ã`,'') from `ԣ`; -INSTR(`ã`,'') -2 -SELECT INSTR(`ã`,'') from `ԣ`; -INSTR(`ã`,'') -3 -SELECT INSTR(`ã`,'') from `ԣ`; -INSTR(`ã`,'') -4 -SELECT INSTR(`ã`,'') from `ԣ`; -INSTR(`ã`,'') -5 -SELECT INSTR(`ã`,'') from `ԣ`; -INSTR(`ã`,'') -0 DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -260,6 +199,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/r/jp_instr_ujis.result b/mysql-test/suite/jp/r/jp_instr_ujis.result index 0cf9895a740..345d23ecbcb 100644 --- a/mysql-test/suite/jp/r/jp_instr_ujis.result +++ b/mysql-test/suite/jp/r/jp_instr_ujis.result @@ -7,7 +7,6 @@ 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; @@ -16,12 +15,9 @@ CREATE TABLE `ԣ` (`ã` char(5), INDEX(`ã`)) DEFAULT CHARSET = ujis engin 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 ('ݏޏߏ'); @@ -31,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 INSTR(`ã`,'') from `ԣ`; INSTR(`ã`,'') 1 @@ -196,60 +189,6 @@ INSTR(`ã`,'') SELECT INSTR(`ã`,'') from `ԣ`; INSTR(`ã`,'') 0 -SELECT INSTR(`ã`,'') from `ԣ`; -INSTR(`ã`,'') -1 -SELECT INSTR(`ã`,'') from `ԣ`; -INSTR(`ã`,'') -2 -SELECT INSTR(`ã`,'') from `ԣ`; -INSTR(`ã`,'') -3 -SELECT INSTR(`ã`,'') from `ԣ`; -INSTR(`ã`,'') -4 -SELECT INSTR(`ã`,'') from `ԣ`; -INSTR(`ã`,'') -5 -SELECT INSTR(`ã`,'') from `ԣ`; -INSTR(`ã`,'') -0 -SELECT INSTR(`ã`,'') from `ԣ`; -INSTR(`ã`,'') -1 -SELECT INSTR(`ã`,'') from `ԣ`; -INSTR(`ã`,'') -2 -SELECT INSTR(`ã`,'') from `ԣ`; -INSTR(`ã`,'') -3 -SELECT INSTR(`ã`,'') from `ԣ`; -INSTR(`ã`,'') -4 -SELECT INSTR(`ã`,'') from `ԣ`; -INSTR(`ã`,'') -5 -SELECT INSTR(`ã`,'') from `ԣ`; -INSTR(`ã`,'') -0 -SELECT INSTR(`ã`,'') from `ԣ`; -INSTR(`ã`,'') -1 -SELECT INSTR(`ã`,'') from `ԣ`; -INSTR(`ã`,'') -2 -SELECT INSTR(`ã`,'') from `ԣ`; -INSTR(`ã`,'') -3 -SELECT INSTR(`ã`,'') from `ԣ`; -INSTR(`ã`,'') -4 -SELECT INSTR(`ã`,'') from `ԣ`; -INSTR(`ã`,'') -5 -SELECT INSTR(`ã`,'') from `ԣ`; -INSTR(`ã`,'') -0 DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -259,6 +198,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/r/jp_instr_utf8.result b/mysql-test/suite/jp/r/jp_instr_utf8.result index 0e55227e4b7..fb6b8c7c6ea 100644 --- a/mysql-test/suite/jp/r/jp_instr_utf8.result +++ b/mysql-test/suite/jp/r/jp_instr_utf8.result @@ -7,7 +7,6 @@ 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; @@ -16,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 ('龔龖龗龞龡'); @@ -31,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 INSTR(`Ｃ１`,'ｱ') from `Ｔ１`; INSTR(`Ｃ１`,'ｱ') 1 @@ -196,60 +189,6 @@ INSTR(`Ｃ１`,'龡') SELECT INSTR(`Ｃ１`,'丂') from `Ｔ９`; INSTR(`Ｃ１`,'丂') 0 -SELECT INSTR(`Ｃ１`,'ｱ') from `Ｔ１０`; -INSTR(`Ｃ１`,'ｱ') -1 -SELECT INSTR(`Ｃ１`,'ｲ') from `Ｔ１０`; -INSTR(`Ｃ１`,'ｲ') -2 -SELECT INSTR(`Ｃ１`,'ｳ') from `Ｔ１０`; -INSTR(`Ｃ１`,'ｳ') -3 -SELECT INSTR(`Ｃ１`,'ｴ') from `Ｔ１０`; -INSTR(`Ｃ１`,'ｴ') -4 -SELECT INSTR(`Ｃ１`,'ｵ') from `Ｔ１０`; -INSTR(`Ｃ１`,'ｵ') -5 -SELECT INSTR(`Ｃ１`,'ﾝ') from `Ｔ１０`; -INSTR(`Ｃ１`,'ﾝ') -0 -SELECT INSTR(`Ｃ１`,'あ') from `Ｔ１１`; -INSTR(`Ｃ１`,'あ') -1 -SELECT INSTR(`Ｃ１`,'い') from `Ｔ１１`; -INSTR(`Ｃ１`,'い') -2 -SELECT INSTR(`Ｃ１`,'う') from `Ｔ１１`; -INSTR(`Ｃ１`,'う') -3 -SELECT INSTR(`Ｃ１`,'え') from `Ｔ１１`; -INSTR(`Ｃ１`,'え') -4 -SELECT INSTR(`Ｃ１`,'お') from `Ｔ１１`; -INSTR(`Ｃ１`,'お') -5 -SELECT INSTR(`Ｃ１`,'ん') from `Ｔ１１`; -INSTR(`Ｃ１`,'ん') -0 -SELECT INSTR(`Ｃ１`,'龔') from `Ｔ１２`; -INSTR(`Ｃ１`,'龔') -1 -SELECT INSTR(`Ｃ１`,'龖') from `Ｔ１２`; -INSTR(`Ｃ１`,'龖') -2 -SELECT INSTR(`Ｃ１`,'龗') from `Ｔ１２`; -INSTR(`Ｃ１`,'龗') -3 -SELECT INSTR(`Ｃ１`,'龞') from `Ｔ１２`; -INSTR(`Ｃ１`,'龞') -4 -SELECT INSTR(`Ｃ１`,'龡') from `Ｔ１２`; -INSTR(`Ｃ１`,'龡') -5 -SELECT INSTR(`Ｃ１`,'丂') from `Ｔ１２`; -INSTR(`Ｃ１`,'丂') -0 DROP TABLE `Ｔ１`; DROP TABLE `Ｔ２`; DROP TABLE `Ｔ３`; @@ -259,6 +198,3 @@ DROP TABLE `Ｔ６`; DROP TABLE `Ｔ７`; DROP TABLE `Ｔ８`; DROP TABLE `Ｔ９`; -DROP TABLE `Ｔ１０`; -DROP TABLE `Ｔ１１`; -DROP TABLE `Ｔ１２`; diff --git a/mysql-test/suite/jp/r/jp_join_sjis.result b/mysql-test/suite/jp/r/jp_join_sjis.result index a5ccc58ae4c..5e7e51e0925 100644 --- a/mysql-test/suite/jp/r/jp_join_sjis.result +++ b/mysql-test/suite/jp/r/jp_join_sjis.result @@ -1,15 +1,21 @@ -drop table if exists `sP`; -drop table if exists `sQ`; -drop table if exists `sR`; -drop table if exists `sS`; -drop table if exists `sT`; -drop table if exists `sU`; -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`; +DROP TABLE IF EXISTS `sPa`; +DROP TABLE IF EXISTS `sPb`; +DROP TABLE IF EXISTS `sQa`; +DROP TABLE IF EXISTS `sQb`; +DROP TABLE IF EXISTS `sRa`; +DROP TABLE IF EXISTS `sRb`; +DROP TABLE IF EXISTS `sSa`; +DROP TABLE IF EXISTS `sSb`; +DROP TABLE IF EXISTS `sTa`; +DROP TABLE IF EXISTS `sTb`; +DROP TABLE IF EXISTS `sUa`; +DROP TABLE IF EXISTS `sUb`; +DROP TABLE IF EXISTS `sVa`; +DROP TABLE IF EXISTS `sVb`; +DROP TABLE IF EXISTS `sWa`; +DROP TABLE IF EXISTS `sWb`; +DROP TABLE IF EXISTS `sXa`; +DROP TABLE IF EXISTS `sXb`; SET NAMES sjis; SET character_set_database = sjis; CREATE TABLE `sPa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = innodb; @@ -24,18 +30,12 @@ CREATE TABLE `sTa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine CREATE TABLE `sTb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sUa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sUb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = myisam; -CREATE TABLE `sVa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sVb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sWa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sWb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sXa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sXb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPOa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPOb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPPa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPPb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPQa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPQb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap; +CREATE TABLE `sVa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sVb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sWa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sWb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sXa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sXb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY; INSERT INTO `sPa` VALUES (''),(''),(''); INSERT INTO `sPb` VALUES (''); INSERT INTO `sQa` VALUES (''),(''),(''); @@ -54,12 +54,6 @@ INSERT INTO `sWa` VALUES (''),(''),(''); INSERT INTO `sWb` VALUES (''); INSERT INTO `sXa` VALUES ('\'),('\'),('\'); INSERT INTO `sXb` VALUES ('\'); -INSERT INTO `sPOa` VALUES (''),(''),(''); -INSERT INTO `sPOb` VALUES (''); -INSERT INTO `sPPa` VALUES (''),(''),(''); -INSERT INTO `sPPb` VALUES (''); -INSERT INTO `sPQa` VALUES ('\'),('\'),('\'); -INSERT INTO `sPQb` VALUES ('\'); SELECT * FROM `sPa` JOIN `sPb`; bP bP @@ -71,31 +65,31 @@ SELECT * FROM `sPa` INNER JOIN `sPb`; SELECT * FROM `sPa` JOIN `sPb` USING (`bP`); -bP bP - +bP + SELECT * FROM `sPa` INNER JOIN `sPb` USING (`bP`); -bP bP - +bP + SELECT * FROM `sPa` CROSS JOIN `sPb`; bP bP SELECT * FROM `sPa` LEFT JOIN `sPb` USING (`bP`); -bP bP - - NULL - NULL +bP + + + SELECT * FROM `sPa` LEFT JOIN `sPb` ON (`sPa`.`bP` = `sPb`.`bP`); bP bP NULL NULL SELECT * FROM `sPb` RIGHT JOIN `sPa` USING (`bP`); -bP bP - -NULL -NULL +bP + + + SELECT * FROM `sPb` RIGHT JOIN `sPa` ON (`sPa`.`bP` = `sPb`.`bP`); bP bP @@ -112,31 +106,31 @@ SELECT * FROM `sQa` INNER JOIN `sQb`; SELECT * FROM `sQa` JOIN `sQb` USING (`bP`); -bP bP - +bP + SELECT * FROM `sQa` INNER JOIN `sQb` USING (`bP`); -bP bP - +bP + SELECT * FROM `sQa` CROSS JOIN `sQb`; bP bP SELECT * FROM `sQa` LEFT JOIN `sQb` USING (`bP`); -bP bP - - NULL - NULL +bP + + + SELECT * FROM `sQa` LEFT JOIN `sQb` ON (`sQa`.`bP` = `sQb`.`bP`); bP bP NULL NULL SELECT * FROM `sQb` RIGHT JOIN `sQa` USING (`bP`); -bP bP - -NULL -NULL +bP + + + SELECT * FROM `sQb` RIGHT JOIN `sQa` ON (`sQa`.`bP` = `sQb`.`bP`); bP bP @@ -153,31 +147,31 @@ SELECT * FROM `sRa` INNER JOIN `sRb`; \ \ \ \ SELECT * FROM `sRa` JOIN `sRb` USING (`bP`); -bP bP -\ \ +bP +\ SELECT * FROM `sRa` INNER JOIN `sRb` USING (`bP`); -bP bP -\ \ +bP +\ SELECT * FROM `sRa` CROSS JOIN `sRb`; bP bP \ \ \ \ \ \ SELECT * FROM `sRa` LEFT JOIN `sRb` USING (`bP`); -bP bP -\ \ -\ NULL -\ NULL +bP +\ +\ +\ SELECT * FROM `sRa` LEFT JOIN `sRb` ON (`sRa`.`bP` = `sRb`.`bP`); bP bP \ \ \ NULL \ NULL SELECT * FROM `sRb` RIGHT JOIN `sRa` USING (`bP`); -bP bP -\ \ -NULL \ -NULL \ +bP +\ +\ +\ SELECT * FROM `sRb` RIGHT JOIN `sRa` ON (`sRa`.`bP` = `sRb`.`bP`); bP bP \ \ @@ -194,31 +188,31 @@ SELECT * FROM `sSa` INNER JOIN `sSb`; SELECT * FROM `sSa` JOIN `sSb` USING (`bP`); -bP bP - +bP + SELECT * FROM `sSa` INNER JOIN `sSb` USING (`bP`); -bP bP - +bP + SELECT * FROM `sSa` CROSS JOIN `sSb`; bP bP SELECT * FROM `sSa` LEFT JOIN `sSb` USING (`bP`); -bP bP - - NULL - NULL +bP + + + SELECT * FROM `sSa` LEFT JOIN `sSb` ON (`sSa`.`bP` = `sSb`.`bP`); bP bP NULL NULL SELECT * FROM `sSb` RIGHT JOIN `sSa` USING (`bP`); -bP bP - -NULL -NULL +bP + + + SELECT * FROM `sSb` RIGHT JOIN `sSa` ON (`sSa`.`bP` = `sSb`.`bP`); bP bP @@ -235,31 +229,31 @@ SELECT * FROM `sTa` INNER JOIN `sTb`; SELECT * FROM `sTa` JOIN `sTb` USING (`bP`); -bP bP - +bP + SELECT * FROM `sTa` INNER JOIN `sTb` USING (`bP`); -bP bP - +bP + SELECT * FROM `sTa` CROSS JOIN `sTb`; bP bP SELECT * FROM `sTa` LEFT JOIN `sTb` USING (`bP`); -bP bP - - NULL - NULL +bP + + + SELECT * FROM `sTa` LEFT JOIN `sTb` ON (`sTa`.`bP` = `sTb`.`bP`); bP bP NULL NULL SELECT * FROM `sTb` RIGHT JOIN `sTa` USING (`bP`); -bP bP - -NULL -NULL +bP + + + SELECT * FROM `sTb` RIGHT JOIN `sTa` ON (`sTa`.`bP` = `sTb`.`bP`); bP bP @@ -276,31 +270,31 @@ SELECT * FROM `sUa` INNER JOIN `sUb`; \ \ \ \ SELECT * FROM `sUa` JOIN `sUb` USING (`bP`); -bP bP -\ \ +bP +\ SELECT * FROM `sUa` INNER JOIN `sUb` USING (`bP`); -bP bP -\ \ +bP +\ SELECT * FROM `sUa` CROSS JOIN `sUb`; bP bP \ \ \ \ \ \ SELECT * FROM `sUa` LEFT JOIN `sUb` USING (`bP`); -bP bP -\ \ -\ NULL -\ NULL +bP +\ +\ +\ SELECT * FROM `sUa` LEFT JOIN `sUb` ON (`sUa`.`bP` = `sUb`.`bP`); bP bP \ \ \ NULL \ NULL SELECT * FROM `sUb` RIGHT JOIN `sUa` USING (`bP`); -bP bP -\ \ -NULL \ -NULL \ +bP +\ +\ +\ SELECT * FROM `sUb` RIGHT JOIN `sUa` ON (`sUa`.`bP` = `sUb`.`bP`); bP bP \ \ @@ -317,31 +311,31 @@ SELECT * FROM `sVa` INNER JOIN `sVb`; SELECT * FROM `sVa` JOIN `sVb` USING (`bP`); -bP bP - +bP + SELECT * FROM `sVa` INNER JOIN `sVb` USING (`bP`); -bP bP - +bP + SELECT * FROM `sVa` CROSS JOIN `sVb`; bP bP SELECT * FROM `sVa` LEFT JOIN `sVb` USING (`bP`); -bP bP - - NULL - NULL +bP + + + SELECT * FROM `sVa` LEFT JOIN `sVb` ON (`sVa`.`bP` = `sVb`.`bP`); bP bP NULL NULL SELECT * FROM `sVb` RIGHT JOIN `sVa` USING (`bP`); -bP bP - -NULL -NULL +bP + + + SELECT * FROM `sVb` RIGHT JOIN `sVa` ON (`sVa`.`bP` = `sVb`.`bP`); bP bP @@ -358,31 +352,31 @@ SELECT * FROM `sWa` INNER JOIN `sWb`; SELECT * FROM `sWa` JOIN `sWb` USING (`bP`); -bP bP - +bP + SELECT * FROM `sWa` INNER JOIN `sWb` USING (`bP`); -bP bP - +bP + SELECT * FROM `sWa` CROSS JOIN `sWb`; bP bP SELECT * FROM `sWa` LEFT JOIN `sWb` USING (`bP`); -bP bP - - NULL - NULL +bP + + + SELECT * FROM `sWa` LEFT JOIN `sWb` ON (`sWa`.`bP` = `sWb`.`bP`); bP bP NULL NULL SELECT * FROM `sWb` RIGHT JOIN `sWa` USING (`bP`); -bP bP - -NULL -NULL +bP + + + SELECT * FROM `sWb` RIGHT JOIN `sWa` ON (`sWa`.`bP` = `sWb`.`bP`); bP bP @@ -399,159 +393,36 @@ SELECT * FROM `sXa` INNER JOIN `sXb`; \ \ \ \ SELECT * FROM `sXa` JOIN `sXb` USING (`bP`); -bP bP -\ \ +bP +\ SELECT * FROM `sXa` INNER JOIN `sXb` USING (`bP`); -bP bP -\ \ +bP +\ SELECT * FROM `sXa` CROSS JOIN `sXb`; bP bP \ \ \ \ \ \ SELECT * FROM `sXa` LEFT JOIN `sXb` USING (`bP`); -bP bP -\ \ -\ NULL -\ NULL +bP +\ +\ +\ SELECT * FROM `sXa` LEFT JOIN `sXb` ON (`sXa`.`bP` = `sXb`.`bP`); bP bP \ \ \ NULL \ NULL SELECT * FROM `sXb` RIGHT JOIN `sXa` USING (`bP`); -bP bP -\ \ -NULL \ -NULL \ +bP +\ +\ +\ SELECT * FROM `sXb` RIGHT JOIN `sXa` ON (`sXa`.`bP` = `sXb`.`bP`); bP bP \ \ NULL \ NULL \ -SELECT * FROM `sPOa` JOIN `sPOb`; -bP bP - - - -SELECT * FROM `sPOa` INNER JOIN `sPOb`; -bP bP - - - -SELECT * FROM `sPOa` JOIN `sPOb` USING (`bP`); -bP bP - -SELECT * FROM `sPOa` INNER JOIN `sPOb` USING (`bP`); -bP bP - -SELECT * FROM `sPOa` CROSS JOIN `sPOb`; -bP bP - - - -SELECT * FROM `sPOa` LEFT JOIN `sPOb` USING (`bP`); -bP bP - - NULL - NULL -SELECT * FROM `sPOa` LEFT JOIN `sPOb` ON (`sPOa`.`bP` = `sPOb`.`bP`); -bP bP - - NULL - NULL -SELECT * FROM `sPOb` RIGHT JOIN `sPOa` USING (`bP`); -bP bP - -NULL -NULL -SELECT * FROM `sPOb` RIGHT JOIN `sPOa` ON (`sPOa`.`bP` = `sPOb`.`bP`); -bP bP - -NULL -NULL -SELECT * FROM `sPPa` JOIN `sPPb`; -bP bP - - - -SELECT * FROM `sPPa` INNER JOIN `sPPb`; -bP bP - - - -SELECT * FROM `sPPa` JOIN `sPPb` USING (`bP`); -bP bP - -SELECT * FROM `sPPa` INNER JOIN `sPPb` USING (`bP`); -bP bP - -SELECT * FROM `sPPa` CROSS JOIN `sPPb`; -bP bP - - - -SELECT * FROM `sPPa` LEFT JOIN `sPPb` USING (`bP`); -bP bP - - NULL - NULL -SELECT * FROM `sPPa` LEFT JOIN `sPPb` ON (`sPPa`.`bP` = `sPPb`.`bP`); -bP bP - - NULL - NULL -SELECT * FROM `sPPb` RIGHT JOIN `sPPa` USING (`bP`); -bP bP - -NULL -NULL -SELECT * FROM `sPPb` RIGHT JOIN `sPPa` ON (`sPPa`.`bP` = `sPPb`.`bP`); -bP bP - -NULL -NULL -SELECT * FROM `sPQa` JOIN `sPQb`; -bP bP -\ \ -\ \ -\ \ -SELECT * FROM `sPQa` INNER JOIN `sPQb`; -bP bP -\ \ -\ \ -\ \ -SELECT * FROM `sPQa` JOIN `sPQb` USING (`bP`); -bP bP -\ \ -SELECT * FROM `sPQa` INNER JOIN `sPQb` USING (`bP`); -bP bP -\ \ -SELECT * FROM `sPQa` CROSS JOIN `sPQb`; -bP bP -\ \ -\ \ -\ \ -SELECT * FROM `sPQa` LEFT JOIN `sPQb` USING (`bP`); -bP bP -\ \ -\ NULL -\ NULL -SELECT * FROM `sPQa` LEFT JOIN `sPQb` ON (`sPQa`.`bP` = `sPQb`.`bP`); -bP bP -\ \ -\ NULL -\ NULL -SELECT * FROM `sPQb` RIGHT JOIN `sPQa` USING (`bP`); -bP bP -\ \ -NULL \ -NULL \ -SELECT * FROM `sPQb` RIGHT JOIN `sPQa` ON (`sPQa`.`bP` = `sPQb`.`bP`); -bP bP -\ \ -NULL \ -NULL \ DROP TABLE `sPa`; DROP TABLE `sPb`; DROP TABLE `sQa`; @@ -570,9 +441,3 @@ DROP TABLE `sWa`; DROP TABLE `sWb`; DROP TABLE `sXa`; DROP TABLE `sXb`; -DROP TABLE `sPOa`; -DROP TABLE `sPOb`; -DROP TABLE `sPPa`; -DROP TABLE `sPPb`; -DROP TABLE `sPQa`; -DROP TABLE `sPQb`; diff --git a/mysql-test/suite/jp/r/jp_join_ucs2.result b/mysql-test/suite/jp/r/jp_join_ucs2.result index 76988f15cc4..d3ebd9c94ca 100644 --- a/mysql-test/suite/jp/r/jp_join_ucs2.result +++ b/mysql-test/suite/jp/r/jp_join_ucs2.result @@ -1,15 +1,21 @@ -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 `ԣ`; -drop table if exists `ԣ`; -drop table if exists `ԣ`; -drop table if exists `ԣ`; -drop table if exists `ԣ`; -drop table if exists `ԣ`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; SET NAMES ujis; SET character_set_database = ucs2; SET collation_connection = ucs2_general_ci; @@ -19,24 +25,18 @@ CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb; CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb; CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb; +CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MyISAM; +CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MyISAM; +CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MyISAM; +CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MyISAM; +CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MyISAM; +CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MyISAM; +CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY; INSERT INTO `ԣa` VALUES (''),(''),(''); INSERT INTO `ԣb` VALUES (''); INSERT INTO `ԣa` VALUES (''),(''),(''); @@ -55,12 +55,6 @@ INSERT INTO `ԣa` VALUES (''),(''),(''); INSERT INTO `ԣb` VALUES (''); INSERT INTO `ԣa` VALUES (''),(''),(''); INSERT INTO `ԣb` VALUES (''); -INSERT INTO `ԣa` VALUES (''),(''),(''); -INSERT INTO `ԣb` VALUES (''); -INSERT INTO `ԣa` VALUES (''),(''),(''); -INSERT INTO `ԣb` VALUES (''); -INSERT INTO `ԣa` VALUES (''),(''),(''); -INSERT INTO `ԣb` VALUES (''); SELECT * FROM `ԣa` JOIN `ԣb`; ã ã @@ -72,31 +66,31 @@ SELECT * FROM `ԣa` INNER JOIN `ԣb`; SELECT * FROM `ԣa` JOIN `ԣb` USING (`ã`); -ã ã - +ã + SELECT * FROM `ԣa` INNER JOIN `ԣb` USING (`ã`); -ã ã - +ã + SELECT * FROM `ԣa` CROSS JOIN `ԣb`; ã ã SELECT * FROM `ԣa` LEFT JOIN `ԣb` USING (`ã`); -ã ã - - NULL - NULL +ã + + + SELECT * FROM `ԣa` LEFT JOIN `ԣb` ON (`ԣa`.`ã` = `ԣb`.`ã`); ã ã NULL NULL SELECT * FROM `ԣb` RIGHT JOIN `ԣa` USING (`ã`); -ã ã - -NULL -NULL +ã + + + SELECT * FROM `ԣb` RIGHT JOIN `ԣa` ON (`ԣa`.`ã` = `ԣb`.`ã`); ã ã @@ -113,31 +107,31 @@ SELECT * FROM `ԣa` INNER JOIN `ԣb`; SELECT * FROM `ԣa` JOIN `ԣb` USING (`ã`); -ã ã - +ã + SELECT * FROM `ԣa` INNER JOIN `ԣb` USING (`ã`); -ã ã - +ã + SELECT * FROM `ԣa` CROSS JOIN `ԣb`; ã ã SELECT * FROM `ԣa` LEFT JOIN `ԣb` USING (`ã`); -ã ã - - NULL - NULL +ã + + + SELECT * FROM `ԣa` LEFT JOIN `ԣb` ON (`ԣa`.`ã` = `ԣb`.`ã`); ã ã NULL NULL SELECT * FROM `ԣb` RIGHT JOIN `ԣa` USING (`ã`); -ã ã - -NULL -NULL +ã + + + SELECT * FROM `ԣb` RIGHT JOIN `ԣa` ON (`ԣa`.`ã` = `ԣb`.`ã`); ã ã @@ -154,31 +148,31 @@ SELECT * FROM `ԣa` INNER JOIN `ԣb`; SELECT * FROM `ԣa` JOIN `ԣb` USING (`ã`); -ã ã - +ã + SELECT * FROM `ԣa` INNER JOIN `ԣb` USING (`ã`); -ã ã - +ã + SELECT * FROM `ԣa` CROSS JOIN `ԣb`; ã ã SELECT * FROM `ԣa` LEFT JOIN `ԣb` USING (`ã`); -ã ã - - NULL - NULL +ã + + + SELECT * FROM `ԣa` LEFT JOIN `ԣb` ON (`ԣa`.`ã` = `ԣb`.`ã`); ã ã NULL NULL SELECT * FROM `ԣb` RIGHT JOIN `ԣa` USING (`ã`); -ã ã - -NULL -NULL +ã + + + SELECT * FROM `ԣb` RIGHT JOIN `ԣa` ON (`ԣa`.`ã` = `ԣb`.`ã`); ã ã @@ -195,31 +189,31 @@ SELECT * FROM `ԣa` INNER JOIN `ԣb`; SELECT * FROM `ԣa` JOIN `ԣb` USING (`ã`); -ã ã - +ã + SELECT * FROM `ԣa` INNER JOIN `ԣb` USING (`ã`); -ã ã - +ã + SELECT * FROM `ԣa` CROSS JOIN `ԣb`; ã ã SELECT * FROM `ԣa` LEFT JOIN `ԣb` USING (`ã`); -ã ã - - NULL - NULL +ã + + + SELECT * FROM `ԣa` LEFT JOIN `ԣb` ON (`ԣa`.`ã` = `ԣb`.`ã`); ã ã NULL NULL SELECT * FROM `ԣb` RIGHT JOIN `ԣa` USING (`ã`); -ã ã - -NULL -NULL +ã + + + SELECT * FROM `ԣb` RIGHT JOIN `ԣa` ON (`ԣa`.`ã` = `ԣb`.`ã`); ã ã @@ -236,31 +230,31 @@ SELECT * FROM `ԣa` INNER JOIN `ԣb`; SELECT * FROM `ԣa` JOIN `ԣb` USING (`ã`); -ã ã - +ã + SELECT * FROM `ԣa` INNER JOIN `ԣb` USING (`ã`); -ã ã - +ã + SELECT * FROM `ԣa` CROSS JOIN `ԣb`; ã ã SELECT * FROM `ԣa` LEFT JOIN `ԣb` USING (`ã`); -ã ã - - NULL - NULL +ã + + + SELECT * FROM `ԣa` LEFT JOIN `ԣb` ON (`ԣa`.`ã` = `ԣb`.`ã`); ã ã NULL NULL SELECT * FROM `ԣb` RIGHT JOIN `ԣa` USING (`ã`); -ã ã - -NULL -NULL +ã + + + SELECT * FROM `ԣb` RIGHT JOIN `ԣa` ON (`ԣa`.`ã` = `ԣb`.`ã`); ã ã @@ -277,31 +271,31 @@ SELECT * FROM `ԣa` INNER JOIN `ԣb`; SELECT * FROM `ԣa` JOIN `ԣb` USING (`ã`); -ã ã - +ã + SELECT * FROM `ԣa` INNER JOIN `ԣb` USING (`ã`); -ã ã - +ã + SELECT * FROM `ԣa` CROSS JOIN `ԣb`; ã ã SELECT * FROM `ԣa` LEFT JOIN `ԣb` USING (`ã`); -ã ã - - NULL - NULL +ã + + + SELECT * FROM `ԣa` LEFT JOIN `ԣb` ON (`ԣa`.`ã` = `ԣb`.`ã`); ã ã NULL NULL SELECT * FROM `ԣb` RIGHT JOIN `ԣa` USING (`ã`); -ã ã - -NULL -NULL +ã + + + SELECT * FROM `ԣb` RIGHT JOIN `ԣa` ON (`ԣa`.`ã` = `ԣb`.`ã`); ã ã @@ -318,31 +312,31 @@ SELECT * FROM `ԣa` INNER JOIN `ԣb`; SELECT * FROM `ԣa` JOIN `ԣb` USING (`ã`); -ã ã - +ã + SELECT * FROM `ԣa` INNER JOIN `ԣb` USING (`ã`); -ã ã - +ã + SELECT * FROM `ԣa` CROSS JOIN `ԣb`; ã ã SELECT * FROM `ԣa` LEFT JOIN `ԣb` USING (`ã`); -ã ã - - NULL - NULL +ã + + + SELECT * FROM `ԣa` LEFT JOIN `ԣb` ON (`ԣa`.`ã` = `ԣb`.`ã`); ã ã NULL NULL SELECT * FROM `ԣb` RIGHT JOIN `ԣa` USING (`ã`); -ã ã - -NULL -NULL +ã + + + SELECT * FROM `ԣb` RIGHT JOIN `ԣa` ON (`ԣa`.`ã` = `ԣb`.`ã`); ã ã @@ -359,31 +353,31 @@ SELECT * FROM `ԣa` INNER JOIN `ԣb`; SELECT * FROM `ԣa` JOIN `ԣb` USING (`ã`); -ã ã - +ã + SELECT * FROM `ԣa` INNER JOIN `ԣb` USING (`ã`); -ã ã - +ã + SELECT * FROM `ԣa` CROSS JOIN `ԣb`; ã ã SELECT * FROM `ԣa` LEFT JOIN `ԣb` USING (`ã`); -ã ã - - NULL - NULL +ã + + + SELECT * FROM `ԣa` LEFT JOIN `ԣb` ON (`ԣa`.`ã` = `ԣb`.`ã`); ã ã NULL NULL SELECT * FROM `ԣb` RIGHT JOIN `ԣa` USING (`ã`); -ã ã - -NULL -NULL +ã + + + SELECT * FROM `ԣb` RIGHT JOIN `ԣa` ON (`ԣa`.`ã` = `ԣb`.`ã`); ã ã @@ -400,159 +394,36 @@ SELECT * FROM `ԣa` INNER JOIN `ԣb`; SELECT * FROM `ԣa` JOIN `ԣb` USING (`ã`); -ã ã - +ã + SELECT * FROM `ԣa` INNER JOIN `ԣb` USING (`ã`); -ã ã - +ã + SELECT * FROM `ԣa` CROSS JOIN `ԣb`; ã ã SELECT * FROM `ԣa` LEFT JOIN `ԣb` USING (`ã`); -ã ã - - NULL - NULL +ã + + + SELECT * FROM `ԣa` LEFT JOIN `ԣb` ON (`ԣa`.`ã` = `ԣb`.`ã`); ã ã NULL NULL SELECT * FROM `ԣb` RIGHT JOIN `ԣa` USING (`ã`); -ã ã - -NULL -NULL +ã + + + SELECT * FROM `ԣb` RIGHT JOIN `ԣa` ON (`ԣa`.`ã` = `ԣb`.`ã`); ã ã NULL NULL -SELECT * FROM `ԣa` JOIN `ԣb`; -ã ã - - - -SELECT * FROM `ԣa` INNER JOIN `ԣb`; -ã ã - - - -SELECT * FROM `ԣa` JOIN `ԣb` USING (`ã`); -ã ã - -SELECT * FROM `ԣa` INNER JOIN `ԣb` USING (`ã`); -ã ã - -SELECT * FROM `ԣa` CROSS JOIN `ԣb`; -ã ã - - - -SELECT * FROM `ԣa` LEFT JOIN `ԣb` USING (`ã`); -ã ã - - NULL - NULL -SELECT * FROM `ԣa` LEFT JOIN `ԣb` ON (`ԣa`.`ã` = `ԣb`.`ã`); -ã ã - - NULL - NULL -SELECT * FROM `ԣb` RIGHT JOIN `ԣa` USING (`ã`); -ã ã - -NULL -NULL -SELECT * FROM `ԣb` RIGHT JOIN `ԣa` ON (`ԣa`.`ã` = `ԣb`.`ã`); -ã ã - -NULL -NULL -SELECT * FROM `ԣa` JOIN `ԣb`; -ã ã - - - -SELECT * FROM `ԣa` INNER JOIN `ԣb`; -ã ã - - - -SELECT * FROM `ԣa` JOIN `ԣb` USING (`ã`); -ã ã - -SELECT * FROM `ԣa` INNER JOIN `ԣb` USING (`ã`); -ã ã - -SELECT * FROM `ԣa` CROSS JOIN `ԣb`; -ã ã - - - -SELECT * FROM `ԣa` LEFT JOIN `ԣb` USING (`ã`); -ã ã - - NULL - NULL -SELECT * FROM `ԣa` LEFT JOIN `ԣb` ON (`ԣa`.`ã` = `ԣb`.`ã`); -ã ã - - NULL - NULL -SELECT * FROM `ԣb` RIGHT JOIN `ԣa` USING (`ã`); -ã ã - -NULL -NULL -SELECT * FROM `ԣb` RIGHT JOIN `ԣa` ON (`ԣa`.`ã` = `ԣb`.`ã`); -ã ã - -NULL -NULL -SELECT * FROM `ԣa` JOIN `ԣb`; -ã ã - - - -SELECT * FROM `ԣa` INNER JOIN `ԣb`; -ã ã - - - -SELECT * FROM `ԣa` JOIN `ԣb` USING (`ã`); -ã ã - -SELECT * FROM `ԣa` INNER JOIN `ԣb` USING (`ã`); -ã ã - -SELECT * FROM `ԣa` CROSS JOIN `ԣb`; -ã ã - - - -SELECT * FROM `ԣa` LEFT JOIN `ԣb` USING (`ã`); -ã ã - - NULL - NULL -SELECT * FROM `ԣa` LEFT JOIN `ԣb` ON (`ԣa`.`ã` = `ԣb`.`ã`); -ã ã - - NULL - NULL -SELECT * FROM `ԣb` RIGHT JOIN `ԣa` USING (`ã`); -ã ã - -NULL -NULL -SELECT * FROM `ԣb` RIGHT JOIN `ԣa` ON (`ԣa`.`ã` = `ԣb`.`ã`); -ã ã - -NULL -NULL DROP TABLE `ԣa`; DROP TABLE `ԣb`; DROP TABLE `ԣa`; @@ -571,9 +442,3 @@ DROP TABLE `ԣa`; DROP TABLE `ԣb`; DROP TABLE `ԣa`; DROP TABLE `ԣb`; -DROP TABLE `ԣa`; -DROP TABLE `ԣb`; -DROP TABLE `ԣa`; -DROP TABLE `ԣb`; -DROP TABLE `ԣa`; -DROP TABLE `ԣb`; diff --git a/mysql-test/suite/jp/r/jp_join_ujis.result b/mysql-test/suite/jp/r/jp_join_ujis.result index ac430cd9b5e..13de9dae9ca 100644 --- a/mysql-test/suite/jp/r/jp_join_ujis.result +++ b/mysql-test/suite/jp/r/jp_join_ujis.result @@ -1,15 +1,21 @@ -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 `ԣ`; -drop table if exists `ԣ`; -drop table if exists `ԣ`; -drop table if exists `ԣ`; -drop table if exists `ԣ`; -drop table if exists `ԣ`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; SET NAMES ujis; SET character_set_database = ujis; CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb; @@ -18,24 +24,18 @@ CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb; CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb; CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb; +CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = myisam; +CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = myisam; +CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = myisam; +CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = myisam; +CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = myisam; +CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = myisam; +CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = memory; +CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = memory; +CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = memory; +CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = memory; +CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = memory; +CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = memory; INSERT INTO `ԣa` VALUES (''),(''),(''); INSERT INTO `ԣb` VALUES (''); INSERT INTO `ԣa` VALUES (''),(''),(''); @@ -54,12 +54,6 @@ INSERT INTO `ԣa` VALUES (''),(''),(''); INSERT INTO `ԣb` VALUES (''); INSERT INTO `ԣa` VALUES (''),(''),(''); INSERT INTO `ԣb` VALUES (''); -INSERT INTO `ԣa` VALUES (''),(''),(''); -INSERT INTO `ԣb` VALUES (''); -INSERT INTO `ԣa` VALUES (''),(''),(''); -INSERT INTO `ԣb` VALUES (''); -INSERT INTO `ԣa` VALUES (''),(''),(''); -INSERT INTO `ԣb` VALUES (''); SELECT * FROM `ԣa` JOIN `ԣb`; ã ã @@ -71,31 +65,31 @@ SELECT * FROM `ԣa` INNER JOIN `ԣb`; SELECT * FROM `ԣa` JOIN `ԣb` USING (`ã`); -ã ã - +ã + SELECT * FROM `ԣa` INNER JOIN `ԣb` USING (`ã`); -ã ã - +ã + SELECT * FROM `ԣa` CROSS JOIN `ԣb`; ã ã SELECT * FROM `ԣa` LEFT JOIN `ԣb` USING (`ã`); -ã ã - - NULL - NULL +ã + + + SELECT * FROM `ԣa` LEFT JOIN `ԣb` ON (`ԣa`.`ã` = `ԣb`.`ã`); ã ã NULL NULL SELECT * FROM `ԣb` RIGHT JOIN `ԣa` USING (`ã`); -ã ã - -NULL -NULL +ã + + + SELECT * FROM `ԣb` RIGHT JOIN `ԣa` ON (`ԣa`.`ã` = `ԣb`.`ã`); ã ã @@ -112,31 +106,31 @@ SELECT * FROM `ԣa` INNER JOIN `ԣb`; SELECT * FROM `ԣa` JOIN `ԣb` USING (`ã`); -ã ã - +ã + SELECT * FROM `ԣa` INNER JOIN `ԣb` USING (`ã`); -ã ã - +ã + SELECT * FROM `ԣa` CROSS JOIN `ԣb`; ã ã SELECT * FROM `ԣa` LEFT JOIN `ԣb` USING (`ã`); -ã ã - - NULL - NULL +ã + + + SELECT * FROM `ԣa` LEFT JOIN `ԣb` ON (`ԣa`.`ã` = `ԣb`.`ã`); ã ã NULL NULL SELECT * FROM `ԣb` RIGHT JOIN `ԣa` USING (`ã`); -ã ã - -NULL -NULL +ã + + + SELECT * FROM `ԣb` RIGHT JOIN `ԣa` ON (`ԣa`.`ã` = `ԣb`.`ã`); ã ã @@ -153,31 +147,31 @@ SELECT * FROM `ԣa` INNER JOIN `ԣb`; SELECT * FROM `ԣa` JOIN `ԣb` USING (`ã`); -ã ã - +ã + SELECT * FROM `ԣa` INNER JOIN `ԣb` USING (`ã`); -ã ã - +ã + SELECT * FROM `ԣa` CROSS JOIN `ԣb`; ã ã SELECT * FROM `ԣa` LEFT JOIN `ԣb` USING (`ã`); -ã ã - - NULL - NULL +ã + + + SELECT * FROM `ԣa` LEFT JOIN `ԣb` ON (`ԣa`.`ã` = `ԣb`.`ã`); ã ã NULL NULL SELECT * FROM `ԣb` RIGHT JOIN `ԣa` USING (`ã`); -ã ã - -NULL -NULL +ã + + + SELECT * FROM `ԣb` RIGHT JOIN `ԣa` ON (`ԣa`.`ã` = `ԣb`.`ã`); ã ã @@ -194,31 +188,31 @@ SELECT * FROM `ԣa` INNER JOIN `ԣb`; SELECT * FROM `ԣa` JOIN `ԣb` USING (`ã`); -ã ã - +ã + SELECT * FROM `ԣa` INNER JOIN `ԣb` USING (`ã`); -ã ã - +ã + SELECT * FROM `ԣa` CROSS JOIN `ԣb`; ã ã SELECT * FROM `ԣa` LEFT JOIN `ԣb` USING (`ã`); -ã ã - - NULL - NULL +ã + + + SELECT * FROM `ԣa` LEFT JOIN `ԣb` ON (`ԣa`.`ã` = `ԣb`.`ã`); ã ã NULL NULL SELECT * FROM `ԣb` RIGHT JOIN `ԣa` USING (`ã`); -ã ã - -NULL -NULL +ã + + + SELECT * FROM `ԣb` RIGHT JOIN `ԣa` ON (`ԣa`.`ã` = `ԣb`.`ã`); ã ã @@ -235,31 +229,31 @@ SELECT * FROM `ԣa` INNER JOIN `ԣb`; SELECT * FROM `ԣa` JOIN `ԣb` USING (`ã`); -ã ã - +ã + SELECT * FROM `ԣa` INNER JOIN `ԣb` USING (`ã`); -ã ã - +ã + SELECT * FROM `ԣa` CROSS JOIN `ԣb`; ã ã SELECT * FROM `ԣa` LEFT JOIN `ԣb` USING (`ã`); -ã ã - - NULL - NULL +ã + + + SELECT * FROM `ԣa` LEFT JOIN `ԣb` ON (`ԣa`.`ã` = `ԣb`.`ã`); ã ã NULL NULL SELECT * FROM `ԣb` RIGHT JOIN `ԣa` USING (`ã`); -ã ã - -NULL -NULL +ã + + + SELECT * FROM `ԣb` RIGHT JOIN `ԣa` ON (`ԣa`.`ã` = `ԣb`.`ã`); ã ã @@ -276,31 +270,31 @@ SELECT * FROM `ԣa` INNER JOIN `ԣb`; SELECT * FROM `ԣa` JOIN `ԣb` USING (`ã`); -ã ã - +ã + SELECT * FROM `ԣa` INNER JOIN `ԣb` USING (`ã`); -ã ã - +ã + SELECT * FROM `ԣa` CROSS JOIN `ԣb`; ã ã SELECT * FROM `ԣa` LEFT JOIN `ԣb` USING (`ã`); -ã ã - - NULL - NULL +ã + + + SELECT * FROM `ԣa` LEFT JOIN `ԣb` ON (`ԣa`.`ã` = `ԣb`.`ã`); ã ã NULL NULL SELECT * FROM `ԣb` RIGHT JOIN `ԣa` USING (`ã`); -ã ã - -NULL -NULL +ã + + + SELECT * FROM `ԣb` RIGHT JOIN `ԣa` ON (`ԣa`.`ã` = `ԣb`.`ã`); ã ã @@ -317,31 +311,31 @@ SELECT * FROM `ԣa` INNER JOIN `ԣb`; SELECT * FROM `ԣa` JOIN `ԣb` USING (`ã`); -ã ã - +ã + SELECT * FROM `ԣa` INNER JOIN `ԣb` USING (`ã`); -ã ã - +ã + SELECT * FROM `ԣa` CROSS JOIN `ԣb`; ã ã SELECT * FROM `ԣa` LEFT JOIN `ԣb` USING (`ã`); -ã ã - - NULL - NULL +ã + + + SELECT * FROM `ԣa` LEFT JOIN `ԣb` ON (`ԣa`.`ã` = `ԣb`.`ã`); ã ã NULL NULL SELECT * FROM `ԣb` RIGHT JOIN `ԣa` USING (`ã`); -ã ã - -NULL -NULL +ã + + + SELECT * FROM `ԣb` RIGHT JOIN `ԣa` ON (`ԣa`.`ã` = `ԣb`.`ã`); ã ã @@ -358,31 +352,31 @@ SELECT * FROM `ԣa` INNER JOIN `ԣb`; SELECT * FROM `ԣa` JOIN `ԣb` USING (`ã`); -ã ã - +ã + SELECT * FROM `ԣa` INNER JOIN `ԣb` USING (`ã`); -ã ã - +ã + SELECT * FROM `ԣa` CROSS JOIN `ԣb`; ã ã SELECT * FROM `ԣa` LEFT JOIN `ԣb` USING (`ã`); -ã ã - - NULL - NULL +ã + + + SELECT * FROM `ԣa` LEFT JOIN `ԣb` ON (`ԣa`.`ã` = `ԣb`.`ã`); ã ã NULL NULL SELECT * FROM `ԣb` RIGHT JOIN `ԣa` USING (`ã`); -ã ã - -NULL -NULL +ã + + + SELECT * FROM `ԣb` RIGHT JOIN `ԣa` ON (`ԣa`.`ã` = `ԣb`.`ã`); ã ã @@ -399,159 +393,36 @@ SELECT * FROM `ԣa` INNER JOIN `ԣb`; SELECT * FROM `ԣa` JOIN `ԣb` USING (`ã`); -ã ã - +ã + SELECT * FROM `ԣa` INNER JOIN `ԣb` USING (`ã`); -ã ã - +ã + SELECT * FROM `ԣa` CROSS JOIN `ԣb`; ã ã SELECT * FROM `ԣa` LEFT JOIN `ԣb` USING (`ã`); -ã ã - - NULL - NULL +ã + + + SELECT * FROM `ԣa` LEFT JOIN `ԣb` ON (`ԣa`.`ã` = `ԣb`.`ã`); ã ã NULL NULL SELECT * FROM `ԣb` RIGHT JOIN `ԣa` USING (`ã`); -ã ã - -NULL -NULL +ã + + + SELECT * FROM `ԣb` RIGHT JOIN `ԣa` ON (`ԣa`.`ã` = `ԣb`.`ã`); ã ã NULL NULL -SELECT * FROM `ԣa` JOIN `ԣb`; -ã ã - - - -SELECT * FROM `ԣa` INNER JOIN `ԣb`; -ã ã - - - -SELECT * FROM `ԣa` JOIN `ԣb` USING (`ã`); -ã ã - -SELECT * FROM `ԣa` INNER JOIN `ԣb` USING (`ã`); -ã ã - -SELECT * FROM `ԣa` CROSS JOIN `ԣb`; -ã ã - - - -SELECT * FROM `ԣa` LEFT JOIN `ԣb` USING (`ã`); -ã ã - - NULL - NULL -SELECT * FROM `ԣa` LEFT JOIN `ԣb` ON (`ԣa`.`ã` = `ԣb`.`ã`); -ã ã - - NULL - NULL -SELECT * FROM `ԣb` RIGHT JOIN `ԣa` USING (`ã`); -ã ã - -NULL -NULL -SELECT * FROM `ԣb` RIGHT JOIN `ԣa` ON (`ԣa`.`ã` = `ԣb`.`ã`); -ã ã - -NULL -NULL -SELECT * FROM `ԣa` JOIN `ԣb`; -ã ã - - - -SELECT * FROM `ԣa` INNER JOIN `ԣb`; -ã ã - - - -SELECT * FROM `ԣa` JOIN `ԣb` USING (`ã`); -ã ã - -SELECT * FROM `ԣa` INNER JOIN `ԣb` USING (`ã`); -ã ã - -SELECT * FROM `ԣa` CROSS JOIN `ԣb`; -ã ã - - - -SELECT * FROM `ԣa` LEFT JOIN `ԣb` USING (`ã`); -ã ã - - NULL - NULL -SELECT * FROM `ԣa` LEFT JOIN `ԣb` ON (`ԣa`.`ã` = `ԣb`.`ã`); -ã ã - - NULL - NULL -SELECT * FROM `ԣb` RIGHT JOIN `ԣa` USING (`ã`); -ã ã - -NULL -NULL -SELECT * FROM `ԣb` RIGHT JOIN `ԣa` ON (`ԣa`.`ã` = `ԣb`.`ã`); -ã ã - -NULL -NULL -SELECT * FROM `ԣa` JOIN `ԣb`; -ã ã - - - -SELECT * FROM `ԣa` INNER JOIN `ԣb`; -ã ã - - - -SELECT * FROM `ԣa` JOIN `ԣb` USING (`ã`); -ã ã - -SELECT * FROM `ԣa` INNER JOIN `ԣb` USING (`ã`); -ã ã - -SELECT * FROM `ԣa` CROSS JOIN `ԣb`; -ã ã - - - -SELECT * FROM `ԣa` LEFT JOIN `ԣb` USING (`ã`); -ã ã - - NULL - NULL -SELECT * FROM `ԣa` LEFT JOIN `ԣb` ON (`ԣa`.`ã` = `ԣb`.`ã`); -ã ã - - NULL - NULL -SELECT * FROM `ԣb` RIGHT JOIN `ԣa` USING (`ã`); -ã ã - -NULL -NULL -SELECT * FROM `ԣb` RIGHT JOIN `ԣa` ON (`ԣa`.`ã` = `ԣb`.`ã`); -ã ã - -NULL -NULL DROP TABLE `ԣa`; DROP TABLE `ԣb`; DROP TABLE `ԣa`; @@ -570,9 +441,3 @@ DROP TABLE `ԣa`; DROP TABLE `ԣb`; DROP TABLE `ԣa`; DROP TABLE `ԣb`; -DROP TABLE `ԣa`; -DROP TABLE `ԣb`; -DROP TABLE `ԣa`; -DROP TABLE `ԣb`; -DROP TABLE `ԣa`; -DROP TABLE `ԣb`; diff --git a/mysql-test/suite/jp/r/jp_join_utf8.result b/mysql-test/suite/jp/r/jp_join_utf8.result index 716e97a2bb3..a4781c0fece 100644 --- a/mysql-test/suite/jp/r/jp_join_utf8.result +++ b/mysql-test/suite/jp/r/jp_join_utf8.result @@ -1,41 +1,41 @@ -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 `Ｔ７`; -drop table if exists `Ｔ８`; -drop table if exists `Ｔ９`; -drop table if exists `Ｔ１０`; -drop table if exists `Ｔ１１`; -drop table if exists `Ｔ１２`; +drop table if exists `Ｔ１a`; +drop table if exists `Ｔ１b`; +drop table if exists `Ｔ２a`; +drop table if exists `Ｔ２b`; +drop table if exists `Ｔ３a`; +drop table if exists `Ｔ３b`; +drop table if exists `Ｔ４a`; +drop table if exists `Ｔ４b`; +drop table if exists `Ｔ５a`; +drop table if exists `Ｔ５b`; +drop table if exists `Ｔ６a`; +drop table if exists `Ｔ６b`; +drop table if exists `Ｔ７a`; +drop table if exists `Ｔ７b`; +drop table if exists `Ｔ８a`; +drop table if exists `Ｔ８b`; +drop table if exists `Ｔ９a`; +drop table if exists `Ｔ９b`; SET NAMES utf8; SET character_set_database = utf8; -CREATE TABLE `Ｔ１a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb; -CREATE TABLE `Ｔ１b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb; -CREATE TABLE `Ｔ２a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb; -CREATE TABLE `Ｔ２b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb; -CREATE TABLE `Ｔ３a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb; -CREATE TABLE `Ｔ３b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb; -CREATE TABLE `Ｔ４a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb; -CREATE TABLE `Ｔ４b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb; -CREATE TABLE `Ｔ５a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb; -CREATE TABLE `Ｔ５b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb; -CREATE TABLE `Ｔ６a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb; -CREATE TABLE `Ｔ６b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb; -CREATE TABLE `Ｔ７a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb; -CREATE TABLE `Ｔ７b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb; -CREATE TABLE `Ｔ８a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb; -CREATE TABLE `Ｔ８b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb; -CREATE TABLE `Ｔ９a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb; -CREATE TABLE `Ｔ９b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb; -CREATE TABLE `Ｔ１０a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb; -CREATE TABLE `Ｔ１０b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb; -CREATE TABLE `Ｔ１１a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb; -CREATE TABLE `Ｔ１１b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb; -CREATE TABLE `Ｔ１２a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb; -CREATE TABLE `Ｔ１２b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb; +CREATE TABLE `Ｔ１a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = InnoDB; +CREATE TABLE `Ｔ１b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = InnoDB; +CREATE TABLE `Ｔ２a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = InnoDB; +CREATE TABLE `Ｔ２b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = InnoDB; +CREATE TABLE `Ｔ３a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = InnoDB; +CREATE TABLE `Ｔ３b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = InnoDB; +CREATE TABLE `Ｔ４a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MyISAM; +CREATE TABLE `Ｔ４b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MyISAM; +CREATE TABLE `Ｔ５a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MyISAM; +CREATE TABLE `Ｔ５b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MyISAM; +CREATE TABLE `Ｔ６a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MyISAM; +CREATE TABLE `Ｔ６b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MyISAM; +CREATE TABLE `Ｔ７a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ７b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ８a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ８b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ９a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ９b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MEMORY; INSERT INTO `Ｔ１a` VALUES ('ｱ'),('ｶ'),('ｻ'); INSERT INTO `Ｔ１b` VALUES ('ｱ'); INSERT INTO `Ｔ２a` VALUES ('あ'),('か'),('さ'); @@ -54,12 +54,6 @@ INSERT INTO `Ｔ８a` VALUES ('あ'),('か'),('さ'); INSERT INTO `Ｔ８b` VALUES ('あ'); INSERT INTO `Ｔ９a` VALUES ('龔'),('龖'),('龗'); INSERT INTO `Ｔ９b` VALUES ('龔'); -INSERT INTO `Ｔ１０a` VALUES ('ｱ'),('ｶ'),('ｻ'); -INSERT INTO `Ｔ１０b` VALUES ('ｱ'); -INSERT INTO `Ｔ１１a` VALUES ('あ'),('か'),('さ'); -INSERT INTO `Ｔ１１b` VALUES ('あ'); -INSERT INTO `Ｔ１２a` VALUES ('龔'),('龖'),('龗'); -INSERT INTO `Ｔ１２b` VALUES ('龔'); SELECT * FROM `Ｔ１a` JOIN `Ｔ１b`; Ｃ１ Ｃ１ ｱ ｱ @@ -71,31 +65,31 @@ SELECT * FROM `Ｔ１a` INNER JOIN `Ｔ１b`; ｶ ｱ ｻ ｱ SELECT * FROM `Ｔ１a` JOIN `Ｔ１b` USING (`Ｃ１`); -Ｃ１ Ｃ１ -ｱ ｱ +Ｃ１ +ｱ SELECT * FROM `Ｔ１a` INNER JOIN `Ｔ１b` USING (`Ｃ１`); -Ｃ１ Ｃ１ -ｱ ｱ +Ｃ１ +ｱ SELECT * FROM `Ｔ１a` CROSS JOIN `Ｔ１b`; Ｃ１ Ｃ１ ｱ ｱ ｶ ｱ ｻ ｱ SELECT * FROM `Ｔ１a` LEFT JOIN `Ｔ１b` USING (`Ｃ１`); -Ｃ１ Ｃ１ -ｱ ｱ -ｶ NULL -ｻ NULL +Ｃ１ +ｱ +ｶ +ｻ SELECT * FROM `Ｔ１a` LEFT JOIN `Ｔ１b` ON (`Ｔ１a`.`Ｃ１` = `Ｔ１b`.`Ｃ１`); Ｃ１ Ｃ１ ｱ ｱ ｶ NULL ｻ NULL SELECT * FROM `Ｔ１b` RIGHT JOIN `Ｔ１a` USING (`Ｃ１`); -Ｃ１ Ｃ１ -ｱ ｱ -NULL ｶ -NULL ｻ +Ｃ１ +ｱ +ｶ +ｻ SELECT * FROM `Ｔ１b` RIGHT JOIN `Ｔ１a` ON (`Ｔ１a`.`Ｃ１` = `Ｔ１b`.`Ｃ１`); Ｃ１ Ｃ１ ｱ ｱ @@ -112,31 +106,31 @@ SELECT * FROM `Ｔ２a` INNER JOIN `Ｔ２b`; か あ さ あ SELECT * FROM `Ｔ２a` JOIN `Ｔ２b` USING (`Ｃ１`); -Ｃ１ Ｃ１ -あ あ +Ｃ１ +あ SELECT * FROM `Ｔ２a` INNER JOIN `Ｔ２b` USING (`Ｃ１`); -Ｃ１ Ｃ１ -あ あ +Ｃ１ +あ SELECT * FROM `Ｔ２a` CROSS JOIN `Ｔ２b`; Ｃ１ Ｃ１ あ あ か あ さ あ SELECT * FROM `Ｔ２a` LEFT JOIN `Ｔ２b` USING (`Ｃ１`); -Ｃ１ Ｃ１ -あ あ -か NULL -さ NULL +Ｃ１ +あ +か +さ SELECT * FROM `Ｔ２a` LEFT JOIN `Ｔ２b` ON (`Ｔ２a`.`Ｃ１` = `Ｔ２b`.`Ｃ１`); Ｃ１ Ｃ１ あ あ か NULL さ NULL SELECT * FROM `Ｔ２b` RIGHT JOIN `Ｔ２a` USING (`Ｃ１`); -Ｃ１ Ｃ１ -あ あ -NULL か -NULL さ +Ｃ１ +あ +か +さ SELECT * FROM `Ｔ２b` RIGHT JOIN `Ｔ２a` ON (`Ｔ２a`.`Ｃ１` = `Ｔ２b`.`Ｃ１`); Ｃ１ Ｃ１ あ あ @@ -153,31 +147,31 @@ SELECT * FROM `Ｔ３a` INNER JOIN `Ｔ３b`; 龖 龔 龗 龔 SELECT * FROM `Ｔ３a` JOIN `Ｔ３b` USING (`Ｃ１`); -Ｃ１ Ｃ１ -龔 龔 +Ｃ１ +龔 SELECT * FROM `Ｔ３a` INNER JOIN `Ｔ３b` USING (`Ｃ１`); -Ｃ１ Ｃ１ -龔 龔 +Ｃ１ +龔 SELECT * FROM `Ｔ３a` CROSS JOIN `Ｔ３b`; Ｃ１ Ｃ１ 龔 龔 龖 龔 龗 龔 SELECT * FROM `Ｔ３a` LEFT JOIN `Ｔ３b` USING (`Ｃ１`); -Ｃ１ Ｃ１ -龔 龔 -龖 NULL -龗 NULL +Ｃ１ +龔 +龖 +龗 SELECT * FROM `Ｔ３a` LEFT JOIN `Ｔ３b` ON (`Ｔ３a`.`Ｃ１` = `Ｔ３b`.`Ｃ１`); Ｃ１ Ｃ１ 龔 龔 龖 NULL 龗 NULL SELECT * FROM `Ｔ３b` RIGHT JOIN `Ｔ３a` USING (`Ｃ１`); -Ｃ１ Ｃ１ -龔 龔 -NULL 龖 -NULL 龗 +Ｃ１ +龔 +龖 +龗 SELECT * FROM `Ｔ３b` RIGHT JOIN `Ｔ３a` ON (`Ｔ３a`.`Ｃ１` = `Ｔ３b`.`Ｃ１`); Ｃ１ Ｃ１ 龔 龔 @@ -194,31 +188,31 @@ SELECT * FROM `Ｔ４a` INNER JOIN `Ｔ４b`; ｶ ｱ ｻ ｱ SELECT * FROM `Ｔ４a` JOIN `Ｔ４b` USING (`Ｃ１`); -Ｃ１ Ｃ１ -ｱ ｱ +Ｃ１ +ｱ SELECT * FROM `Ｔ４a` INNER JOIN `Ｔ４b` USING (`Ｃ１`); -Ｃ１ Ｃ１ -ｱ ｱ +Ｃ１ +ｱ SELECT * FROM `Ｔ４a` CROSS JOIN `Ｔ４b`; Ｃ１ Ｃ１ ｱ ｱ ｶ ｱ ｻ ｱ SELECT * FROM `Ｔ４a` LEFT JOIN `Ｔ４b` USING (`Ｃ１`); -Ｃ１ Ｃ１ -ｱ ｱ -ｶ NULL -ｻ NULL +Ｃ１ +ｱ +ｶ +ｻ SELECT * FROM `Ｔ４a` LEFT JOIN `Ｔ４b` ON (`Ｔ４a`.`Ｃ１` = `Ｔ４b`.`Ｃ１`); Ｃ１ Ｃ１ ｱ ｱ ｶ NULL ｻ NULL SELECT * FROM `Ｔ４b` RIGHT JOIN `Ｔ４a` USING (`Ｃ１`); -Ｃ１ Ｃ１ -ｱ ｱ -NULL ｶ -NULL ｻ +Ｃ１ +ｱ +ｶ +ｻ SELECT * FROM `Ｔ４b` RIGHT JOIN `Ｔ４a` ON (`Ｔ４a`.`Ｃ１` = `Ｔ４b`.`Ｃ１`); Ｃ１ Ｃ１ ｱ ｱ @@ -235,31 +229,31 @@ SELECT * FROM `Ｔ５a` INNER JOIN `Ｔ５b`; か あ さ あ SELECT * FROM `Ｔ５a` JOIN `Ｔ５b` USING (`Ｃ１`); -Ｃ１ Ｃ１ -あ あ +Ｃ１ +あ SELECT * FROM `Ｔ５a` INNER JOIN `Ｔ５b` USING (`Ｃ１`); -Ｃ１ Ｃ１ -あ あ +Ｃ１ +あ SELECT * FROM `Ｔ５a` CROSS JOIN `Ｔ５b`; Ｃ１ Ｃ１ あ あ か あ さ あ SELECT * FROM `Ｔ５a` LEFT JOIN `Ｔ５b` USING (`Ｃ１`); -Ｃ１ Ｃ１ -あ あ -か NULL -さ NULL +Ｃ１ +あ +か +さ SELECT * FROM `Ｔ５a` LEFT JOIN `Ｔ５b` ON (`Ｔ５a`.`Ｃ１` = `Ｔ５b`.`Ｃ１`); Ｃ１ Ｃ１ あ あ か NULL さ NULL SELECT * FROM `Ｔ５b` RIGHT JOIN `Ｔ５a` USING (`Ｃ１`); -Ｃ１ Ｃ１ -あ あ -NULL か -NULL さ +Ｃ１ +あ +か +さ SELECT * FROM `Ｔ５b` RIGHT JOIN `Ｔ５a` ON (`Ｔ５a`.`Ｃ１` = `Ｔ５b`.`Ｃ１`); Ｃ１ Ｃ１ あ あ @@ -276,31 +270,31 @@ SELECT * FROM `Ｔ６a` INNER JOIN `Ｔ６b`; 龖 龔 龗 龔 SELECT * FROM `Ｔ６a` JOIN `Ｔ６b` USING (`Ｃ１`); -Ｃ１ Ｃ１ -龔 龔 +Ｃ１ +龔 SELECT * FROM `Ｔ６a` INNER JOIN `Ｔ６b` USING (`Ｃ１`); -Ｃ１ Ｃ１ -龔 龔 +Ｃ１ +龔 SELECT * FROM `Ｔ６a` CROSS JOIN `Ｔ６b`; Ｃ１ Ｃ１ 龔 龔 龖 龔 龗 龔 SELECT * FROM `Ｔ６a` LEFT JOIN `Ｔ６b` USING (`Ｃ１`); -Ｃ１ Ｃ１ -龔 龔 -龖 NULL -龗 NULL +Ｃ１ +龔 +龖 +龗 SELECT * FROM `Ｔ６a` LEFT JOIN `Ｔ６b` ON (`Ｔ６a`.`Ｃ１` = `Ｔ６b`.`Ｃ１`); Ｃ１ Ｃ１ 龔 龔 龖 NULL 龗 NULL SELECT * FROM `Ｔ６b` RIGHT JOIN `Ｔ６a` USING (`Ｃ１`); -Ｃ１ Ｃ１ -龔 龔 -NULL 龖 -NULL 龗 +Ｃ１ +龔 +龖 +龗 SELECT * FROM `Ｔ６b` RIGHT JOIN `Ｔ６a` ON (`Ｔ６a`.`Ｃ１` = `Ｔ６b`.`Ｃ１`); Ｃ１ Ｃ１ 龔 龔 @@ -317,31 +311,31 @@ SELECT * FROM `Ｔ７a` INNER JOIN `Ｔ７b`; ｶ ｱ ｻ ｱ SELECT * FROM `Ｔ７a` JOIN `Ｔ７b` USING (`Ｃ１`); -Ｃ１ Ｃ１ -ｱ ｱ +Ｃ１ +ｱ SELECT * FROM `Ｔ７a` INNER JOIN `Ｔ７b` USING (`Ｃ１`); -Ｃ１ Ｃ１ -ｱ ｱ +Ｃ１ +ｱ SELECT * FROM `Ｔ７a` CROSS JOIN `Ｔ７b`; Ｃ１ Ｃ１ ｱ ｱ ｶ ｱ ｻ ｱ SELECT * FROM `Ｔ７a` LEFT JOIN `Ｔ７b` USING (`Ｃ１`); -Ｃ１ Ｃ１ -ｱ ｱ -ｶ NULL -ｻ NULL +Ｃ１ +ｱ +ｶ +ｻ SELECT * FROM `Ｔ７a` LEFT JOIN `Ｔ７b` ON (`Ｔ７a`.`Ｃ１` = `Ｔ７b`.`Ｃ１`); Ｃ１ Ｃ１ ｱ ｱ ｶ NULL ｻ NULL SELECT * FROM `Ｔ７b` RIGHT JOIN `Ｔ７a` USING (`Ｃ１`); -Ｃ１ Ｃ１ -ｱ ｱ -NULL ｶ -NULL ｻ +Ｃ１ +ｱ +ｶ +ｻ SELECT * FROM `Ｔ７b` RIGHT JOIN `Ｔ７a` ON (`Ｔ７a`.`Ｃ１` = `Ｔ７b`.`Ｃ１`); Ｃ１ Ｃ１ ｱ ｱ @@ -358,31 +352,31 @@ SELECT * FROM `Ｔ８a` INNER JOIN `Ｔ８b`; か あ さ あ SELECT * FROM `Ｔ８a` JOIN `Ｔ８b` USING (`Ｃ１`); -Ｃ１ Ｃ１ -あ あ +Ｃ１ +あ SELECT * FROM `Ｔ８a` INNER JOIN `Ｔ８b` USING (`Ｃ１`); -Ｃ１ Ｃ１ -あ あ +Ｃ１ +あ SELECT * FROM `Ｔ８a` CROSS JOIN `Ｔ８b`; Ｃ１ Ｃ１ あ あ か あ さ あ SELECT * FROM `Ｔ８a` LEFT JOIN `Ｔ８b` USING (`Ｃ１`); -Ｃ１ Ｃ１ -あ あ -か NULL -さ NULL +Ｃ１ +あ +か +さ SELECT * FROM `Ｔ８a` LEFT JOIN `Ｔ８b` ON (`Ｔ８a`.`Ｃ１` = `Ｔ８b`.`Ｃ１`); Ｃ１ Ｃ１ あ あ か NULL さ NULL SELECT * FROM `Ｔ８b` RIGHT JOIN `Ｔ８a` USING (`Ｃ１`); -Ｃ１ Ｃ１ -あ あ -NULL か -NULL さ +Ｃ１ +あ +か +さ SELECT * FROM `Ｔ８b` RIGHT JOIN `Ｔ８a` ON (`Ｔ８a`.`Ｃ１` = `Ｔ８b`.`Ｃ１`); Ｃ１ Ｃ１ あ あ @@ -399,159 +393,36 @@ SELECT * FROM `Ｔ９a` INNER JOIN `Ｔ９b`; 龖 龔 龗 龔 SELECT * FROM `Ｔ９a` JOIN `Ｔ９b` USING (`Ｃ１`); -Ｃ１ Ｃ１ -龔 龔 +Ｃ１ +龔 SELECT * FROM `Ｔ９a` INNER JOIN `Ｔ９b` USING (`Ｃ１`); -Ｃ１ Ｃ１ -龔 龔 +Ｃ１ +龔 SELECT * FROM `Ｔ９a` CROSS JOIN `Ｔ９b`; Ｃ１ Ｃ１ 龔 龔 龖 龔 龗 龔 SELECT * FROM `Ｔ９a` LEFT JOIN `Ｔ９b` USING (`Ｃ１`); -Ｃ１ Ｃ１ -龔 龔 -龖 NULL -龗 NULL +Ｃ１ +龔 +龖 +龗 SELECT * FROM `Ｔ９a` LEFT JOIN `Ｔ９b` ON (`Ｔ９a`.`Ｃ１` = `Ｔ９b`.`Ｃ１`); Ｃ１ Ｃ１ 龔 龔 龖 NULL 龗 NULL SELECT * FROM `Ｔ９b` RIGHT JOIN `Ｔ９a` USING (`Ｃ１`); -Ｃ１ Ｃ１ -龔 龔 -NULL 龖 -NULL 龗 +Ｃ１ +龔 +龖 +龗 SELECT * FROM `Ｔ９b` RIGHT JOIN `Ｔ９a` ON (`Ｔ９a`.`Ｃ１` = `Ｔ９b`.`Ｃ１`); Ｃ１ Ｃ１ 龔 龔 NULL 龖 NULL 龗 -SELECT * FROM `Ｔ１０a` JOIN `Ｔ１０b`; -Ｃ１ Ｃ１ -ｱ ｱ -ｶ ｱ -ｻ ｱ -SELECT * FROM `Ｔ１０a` INNER JOIN `Ｔ１０b`; -Ｃ１ Ｃ１ -ｱ ｱ -ｶ ｱ -ｻ ｱ -SELECT * FROM `Ｔ１０a` JOIN `Ｔ１０b` USING (`Ｃ１`); -Ｃ１ Ｃ１ -ｱ ｱ -SELECT * FROM `Ｔ１０a` INNER JOIN `Ｔ１０b` USING (`Ｃ１`); -Ｃ１ Ｃ１ -ｱ ｱ -SELECT * FROM `Ｔ１０a` CROSS JOIN `Ｔ１０b`; -Ｃ１ Ｃ１ -ｱ ｱ -ｶ ｱ -ｻ ｱ -SELECT * FROM `Ｔ１０a` LEFT JOIN `Ｔ１０b` USING (`Ｃ１`); -Ｃ１ Ｃ１ -ｱ ｱ -ｶ NULL -ｻ NULL -SELECT * FROM `Ｔ１０a` LEFT JOIN `Ｔ１０b` ON (`Ｔ１０a`.`Ｃ１` = `Ｔ１０b`.`Ｃ１`); -Ｃ１ Ｃ１ -ｱ ｱ -ｶ NULL -ｻ NULL -SELECT * FROM `Ｔ１０b` RIGHT JOIN `Ｔ１０a` USING (`Ｃ１`); -Ｃ１ Ｃ１ -ｱ ｱ -NULL ｶ -NULL ｻ -SELECT * FROM `Ｔ１０b` RIGHT JOIN `Ｔ１０a` ON (`Ｔ１０a`.`Ｃ１` = `Ｔ１０b`.`Ｃ１`); -Ｃ１ Ｃ１ -ｱ ｱ -NULL ｶ -NULL ｻ -SELECT * FROM `Ｔ１１a` JOIN `Ｔ１１b`; -Ｃ１ Ｃ１ -あ あ -か あ -さ あ -SELECT * FROM `Ｔ１１a` INNER JOIN `Ｔ１１b`; -Ｃ１ Ｃ１ -あ あ -か あ -さ あ -SELECT * FROM `Ｔ１１a` JOIN `Ｔ１１b` USING (`Ｃ１`); -Ｃ１ Ｃ１ -あ あ -SELECT * FROM `Ｔ１１a` INNER JOIN `Ｔ１１b` USING (`Ｃ１`); -Ｃ１ Ｃ１ -あ あ -SELECT * FROM `Ｔ１１a` CROSS JOIN `Ｔ１１b`; -Ｃ１ Ｃ１ -あ あ -か あ -さ あ -SELECT * FROM `Ｔ１１a` LEFT JOIN `Ｔ１１b` USING (`Ｃ１`); -Ｃ１ Ｃ１ -あ あ -か NULL -さ NULL -SELECT * FROM `Ｔ１１a` LEFT JOIN `Ｔ１１b` ON (`Ｔ１１a`.`Ｃ１` = `Ｔ１１b`.`Ｃ１`); -Ｃ１ Ｃ１ -あ あ -か NULL -さ NULL -SELECT * FROM `Ｔ１１b` RIGHT JOIN `Ｔ１１a` USING (`Ｃ１`); -Ｃ１ Ｃ１ -あ あ -NULL か -NULL さ -SELECT * FROM `Ｔ１１b` RIGHT JOIN `Ｔ１１a` ON (`Ｔ１１a`.`Ｃ１` = `Ｔ１１b`.`Ｃ１`); -Ｃ１ Ｃ１ -あ あ -NULL か -NULL さ -SELECT * FROM `Ｔ１２a` JOIN `Ｔ１２b`; -Ｃ１ Ｃ１ -龔 龔 -龖 龔 -龗 龔 -SELECT * FROM `Ｔ１２a` INNER JOIN `Ｔ１２b`; -Ｃ１ Ｃ１ -龔 龔 -龖 龔 -龗 龔 -SELECT * FROM `Ｔ１２a` JOIN `Ｔ１２b` USING (`Ｃ１`); -Ｃ１ Ｃ１ -龔 龔 -SELECT * FROM `Ｔ１２a` INNER JOIN `Ｔ１２b` USING (`Ｃ１`); -Ｃ１ Ｃ１ -龔 龔 -SELECT * FROM `Ｔ１２a` CROSS JOIN `Ｔ１２b`; -Ｃ１ Ｃ１ -龔 龔 -龖 龔 -龗 龔 -SELECT * FROM `Ｔ１２a` LEFT JOIN `Ｔ１２b` USING (`Ｃ１`); -Ｃ１ Ｃ１ -龔 龔 -龖 NULL -龗 NULL -SELECT * FROM `Ｔ１２a` LEFT JOIN `Ｔ１２b` ON (`Ｔ１２a`.`Ｃ１` = `Ｔ１２b`.`Ｃ１`); -Ｃ１ Ｃ１ -龔 龔 -龖 NULL -龗 NULL -SELECT * FROM `Ｔ１２b` RIGHT JOIN `Ｔ１２a` USING (`Ｃ１`); -Ｃ１ Ｃ１ -龔 龔 -NULL 龖 -NULL 龗 -SELECT * FROM `Ｔ１２b` RIGHT JOIN `Ｔ１２a` ON (`Ｔ１２a`.`Ｃ１` = `Ｔ１２b`.`Ｃ１`); -Ｃ１ Ｃ１ -龔 龔 -NULL 龖 -NULL 龗 DROP TABLE `Ｔ１a`; DROP TABLE `Ｔ１b`; DROP TABLE `Ｔ２a`; @@ -570,9 +441,3 @@ DROP TABLE `Ｔ８a`; DROP TABLE `Ｔ８b`; DROP TABLE `Ｔ９a`; DROP TABLE `Ｔ９b`; -DROP TABLE `Ｔ１０a`; -DROP TABLE `Ｔ１０b`; -DROP TABLE `Ｔ１１a`; -DROP TABLE `Ｔ１１b`; -DROP TABLE `Ｔ１２a`; -DROP TABLE `Ｔ１２b`; diff --git a/mysql-test/suite/jp/r/jp_left_sjis.result b/mysql-test/suite/jp/r/jp_left_sjis.result index ae5564186ab..037fb05289e 100644 --- a/mysql-test/suite/jp/r/jp_left_sjis.result +++ b/mysql-test/suite/jp/r/jp_left_sjis.result @@ -7,9 +7,6 @@ drop table if exists `sU`; 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(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = innodb; @@ -18,12 +15,9 @@ CREATE TABLE `sR` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engin CREATE TABLE `sS` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sT` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sU` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; -CREATE TABLE `sV` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sW` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sX` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPO` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPP` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPQ` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; +CREATE TABLE `sV` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sW` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sX` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; INSERT INTO `sP` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `sQ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `sR` VALUES ('\\\\\'),('\\\\'),('\\\'),('\\'),('\'),(''); @@ -33,9 +27,6 @@ INSERT INTO `sU` VALUES ('\\\\\'),('\\\\'),('\\\'),('\\'),('\') INSERT INTO `sV` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `sW` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `sX` VALUES ('\\\\\'),('\\\\'),('\\\'),('\\'),('\'),(''); -INSERT INTO `sPO` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `sPP` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `sPQ` VALUES ('\\\\\'),('\\\\'),('\\\'),('\\'),('\'),(''); SELECT `bP`, LEFT(`bP`,0) FROM `sP`; bP LEFT(`bP`,0) @@ -468,150 +459,6 @@ SELECT `bP`, LEFT(`bP`,5) FROM `sX`; \\ \\ \ \ -SELECT `bP`, LEFT(`bP`,0) FROM `sPO`; -bP LEFT(`bP`,0) - - - - - - -SELECT `bP`, LEFT(`bP`,1) FROM `sPO`; -bP LEFT(`bP`,1) - - - - - - -SELECT `bP`, LEFT(`bP`,2) FROM `sPO`; -bP LEFT(`bP`,2) - - - - - - -SELECT `bP`, LEFT(`bP`,3) FROM `sPO`; -bP LEFT(`bP`,3) - - - - - - -SELECT `bP`, LEFT(`bP`,4) FROM `sPO`; -bP LEFT(`bP`,4) - - - - - - -SELECT `bP`, LEFT(`bP`,5) FROM `sPO`; -bP LEFT(`bP`,5) - - - - - - -SELECT `bP`, LEFT(`bP`,0) FROM `sPP`; -bP LEFT(`bP`,0) - - - - - - -SELECT `bP`, LEFT(`bP`,1) FROM `sPP`; -bP LEFT(`bP`,1) - - - - - - -SELECT `bP`, LEFT(`bP`,2) FROM `sPP`; -bP LEFT(`bP`,2) - - - - - - -SELECT `bP`, LEFT(`bP`,3) FROM `sPP`; -bP LEFT(`bP`,3) - - - - - - -SELECT `bP`, LEFT(`bP`,4) FROM `sPP`; -bP LEFT(`bP`,4) - - - - - - -SELECT `bP`, LEFT(`bP`,5) FROM `sPP`; -bP LEFT(`bP`,5) - - - - - - -SELECT `bP`, LEFT(`bP`,0) FROM `sPQ`; -bP LEFT(`bP`,0) -\\\\\ -\\\\ -\\\ -\\ -\ - -SELECT `bP`, LEFT(`bP`,1) FROM `sPQ`; -bP LEFT(`bP`,1) -\\\\\ \ -\\\\ \ -\\\ \ -\\ \ -\ \ - -SELECT `bP`, LEFT(`bP`,2) FROM `sPQ`; -bP LEFT(`bP`,2) -\\\\\ \\ -\\\\ \\ -\\\ \\ -\\ \\ -\ \ - -SELECT `bP`, LEFT(`bP`,3) FROM `sPQ`; -bP LEFT(`bP`,3) -\\\\\ \\\ -\\\\ \\\ -\\\ \\\ -\\ \\ -\ \ - -SELECT `bP`, LEFT(`bP`,4) FROM `sPQ`; -bP LEFT(`bP`,4) -\\\\\ \\\\ -\\\\ \\\\ -\\\ \\\ -\\ \\ -\ \ - -SELECT `bP`, LEFT(`bP`,5) FROM `sPQ`; -bP LEFT(`bP`,5) -\\\\\ \\\\\ -\\\\ \\\\ -\\\ \\\ -\\ \\ -\ \ - DROP TABLE `sP`; DROP TABLE `sQ`; DROP TABLE `sR`; @@ -621,6 +468,3 @@ DROP TABLE `sU`; DROP TABLE `sV`; DROP TABLE `sW`; DROP TABLE `sX`; -DROP TABLE `sPO`; -DROP TABLE `sPP`; -DROP TABLE `sPQ`; diff --git a/mysql-test/suite/jp/r/jp_left_ucs2.result b/mysql-test/suite/jp/r/jp_left_ucs2.result index 349883e9064..ca77bf7f16c 100644 --- a/mysql-test/suite/jp/r/jp_left_ucs2.result +++ b/mysql-test/suite/jp/r/jp_left_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 `ԣ` (`ã` char(5), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engin 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 `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(' INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(''),(''),(''); SELECT `ã`, LEFT(`ã`,0) FROM `ԣ`; ã LEFT(`ã`,0) @@ -469,150 +460,6 @@ SELECT `ã`, LEFT(`ã`,5) FROM `ԣ`; -SELECT `ã`, LEFT(`ã`,0) FROM `ԣ`; -ã LEFT(`ã`,0) - - - - - - -SELECT `ã`, LEFT(`ã`,1) FROM `ԣ`; -ã LEFT(`ã`,1) - - - - - - -SELECT `ã`, LEFT(`ã`,2) FROM `ԣ`; -ã LEFT(`ã`,2) - - - - - - -SELECT `ã`, LEFT(`ã`,3) FROM `ԣ`; -ã LEFT(`ã`,3) - - - - - - -SELECT `ã`, LEFT(`ã`,4) FROM `ԣ`; -ã LEFT(`ã`,4) - - - - - - -SELECT `ã`, LEFT(`ã`,5) FROM `ԣ`; -ã LEFT(`ã`,5) - - - - - - -SELECT `ã`, LEFT(`ã`,0) FROM `ԣ`; -ã LEFT(`ã`,0) - - - - - - -SELECT `ã`, LEFT(`ã`,1) FROM `ԣ`; -ã LEFT(`ã`,1) - - - - - - -SELECT `ã`, LEFT(`ã`,2) FROM `ԣ`; -ã LEFT(`ã`,2) - - - - - - -SELECT `ã`, LEFT(`ã`,3) FROM `ԣ`; -ã LEFT(`ã`,3) - - - - - - -SELECT `ã`, LEFT(`ã`,4) FROM `ԣ`; -ã LEFT(`ã`,4) - - - - - - -SELECT `ã`, LEFT(`ã`,5) FROM `ԣ`; -ã LEFT(`ã`,5) - - - - - - -SELECT `ã`, LEFT(`ã`,0) FROM `ԣ`; -ã LEFT(`ã`,0) -ݏޏߏ -ݏޏ -ݏ - - - -SELECT `ã`, LEFT(`ã`,1) FROM `ԣ`; -ã LEFT(`ã`,1) -ݏޏߏ -ݏޏ -ݏ - - - -SELECT `ã`, LEFT(`ã`,2) FROM `ԣ`; -ã LEFT(`ã`,2) -ݏޏߏ -ݏޏ -ݏ - - - -SELECT `ã`, LEFT(`ã`,3) FROM `ԣ`; -ã LEFT(`ã`,3) -ݏޏߏ ݏ -ݏޏ ݏ -ݏ ݏ - - - -SELECT `ã`, LEFT(`ã`,4) FROM `ԣ`; -ã LEFT(`ã`,4) -ݏޏߏ ݏޏ -ݏޏ ݏޏ -ݏ ݏ - - - -SELECT `ã`, LEFT(`ã`,5) FROM `ԣ`; -ã LEFT(`ã`,5) -ݏޏߏ ݏޏߏ -ݏޏ ݏޏ -ݏ ݏ - - - DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -622,6 +469,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/r/jp_left_ujis.result b/mysql-test/suite/jp/r/jp_left_ujis.result index bd3efc67eec..50483f858ce 100644 --- a/mysql-test/suite/jp/r/jp_left_ujis.result +++ b/mysql-test/suite/jp/r/jp_left_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 `ԣ` (`ã` char(5), INDEX(`ã`)) DEFAULT CHARSET = ujis engin 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 `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(' INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(''),(''),(''); SELECT `ã`, LEFT(`ã`,0) FROM `ԣ`; ã LEFT(`ã`,0) @@ -468,150 +459,6 @@ SELECT `ã`, LEFT(`ã`,5) FROM `ԣ`; -SELECT `ã`, LEFT(`ã`,0) FROM `ԣ`; -ã LEFT(`ã`,0) - - - - - - -SELECT `ã`, LEFT(`ã`,1) FROM `ԣ`; -ã LEFT(`ã`,1) - - - - - - -SELECT `ã`, LEFT(`ã`,2) FROM `ԣ`; -ã LEFT(`ã`,2) - - - - - - -SELECT `ã`, LEFT(`ã`,3) FROM `ԣ`; -ã LEFT(`ã`,3) - - - - - - -SELECT `ã`, LEFT(`ã`,4) FROM `ԣ`; -ã LEFT(`ã`,4) - - - - - - -SELECT `ã`, LEFT(`ã`,5) FROM `ԣ`; -ã LEFT(`ã`,5) - - - - - - -SELECT `ã`, LEFT(`ã`,0) FROM `ԣ`; -ã LEFT(`ã`,0) - - - - - - -SELECT `ã`, LEFT(`ã`,1) FROM `ԣ`; -ã LEFT(`ã`,1) - - - - - - -SELECT `ã`, LEFT(`ã`,2) FROM `ԣ`; -ã LEFT(`ã`,2) - - - - - - -SELECT `ã`, LEFT(`ã`,3) FROM `ԣ`; -ã LEFT(`ã`,3) - - - - - - -SELECT `ã`, LEFT(`ã`,4) FROM `ԣ`; -ã LEFT(`ã`,4) - - - - - - -SELECT `ã`, LEFT(`ã`,5) FROM `ԣ`; -ã LEFT(`ã`,5) - - - - - - -SELECT `ã`, LEFT(`ã`,0) FROM `ԣ`; -ã LEFT(`ã`,0) -ݏޏߏ -ݏޏ -ݏ - - - -SELECT `ã`, LEFT(`ã`,1) FROM `ԣ`; -ã LEFT(`ã`,1) -ݏޏߏ -ݏޏ -ݏ - - - -SELECT `ã`, LEFT(`ã`,2) FROM `ԣ`; -ã LEFT(`ã`,2) -ݏޏߏ -ݏޏ -ݏ - - - -SELECT `ã`, LEFT(`ã`,3) FROM `ԣ`; -ã LEFT(`ã`,3) -ݏޏߏ ݏ -ݏޏ ݏ -ݏ ݏ - - - -SELECT `ã`, LEFT(`ã`,4) FROM `ԣ`; -ã LEFT(`ã`,4) -ݏޏߏ ݏޏ -ݏޏ ݏޏ -ݏ ݏ - - - -SELECT `ã`, LEFT(`ã`,5) FROM `ԣ`; -ã LEFT(`ã`,5) -ݏޏߏ ݏޏߏ -ݏޏ ݏޏ -ݏ ݏ - - - DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -621,6 +468,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/r/jp_left_utf8.result b/mysql-test/suite/jp/r/jp_left_utf8.result index 62cca976fe0..cfc1d8532e2 100644 --- a/mysql-test/suite/jp/r/jp_left_utf8.result +++ b/mysql-test/suite/jp/r/jp_left_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 `Ｃ１`, LEFT(`Ｃ１`,0) FROM `Ｔ１`; Ｃ１ LEFT(`Ｃ１`,0) @@ -468,150 +459,6 @@ SELECT `Ｃ１`, LEFT(`Ｃ１`,5) FROM `Ｔ９`; 龔龖 龔龖 龔 龔 -SELECT `Ｃ１`, LEFT(`Ｃ１`,0) FROM `Ｔ１０`; -Ｃ１ LEFT(`Ｃ１`,0) -ｱｲｳｴｵ -ｱｲｳｴ -ｱｲｳ -ｱｲ -ｱ - -SELECT `Ｃ１`, LEFT(`Ｃ１`,1) FROM `Ｔ１０`; -Ｃ１ LEFT(`Ｃ１`,1) -ｱｲｳｴｵ ｱ -ｱｲｳｴ ｱ -ｱｲｳ ｱ -ｱｲ ｱ -ｱ ｱ - -SELECT `Ｃ１`, LEFT(`Ｃ１`,2) FROM `Ｔ１０`; -Ｃ１ LEFT(`Ｃ１`,2) -ｱｲｳｴｵ ｱｲ -ｱｲｳｴ ｱｲ -ｱｲｳ ｱｲ -ｱｲ ｱｲ -ｱ ｱ - -SELECT `Ｃ１`, LEFT(`Ｃ１`,3) FROM `Ｔ１０`; -Ｃ１ LEFT(`Ｃ１`,3) -ｱｲｳｴｵ ｱｲｳ -ｱｲｳｴ ｱｲｳ -ｱｲｳ ｱｲｳ -ｱｲ ｱｲ -ｱ ｱ - -SELECT `Ｃ１`, LEFT(`Ｃ１`,4) FROM `Ｔ１０`; -Ｃ１ LEFT(`Ｃ１`,4) -ｱｲｳｴｵ ｱｲｳｴ -ｱｲｳｴ ｱｲｳｴ -ｱｲｳ ｱｲｳ -ｱｲ ｱｲ -ｱ ｱ - -SELECT `Ｃ１`, LEFT(`Ｃ１`,5) FROM `Ｔ１０`; -Ｃ１ LEFT(`Ｃ１`,5) -ｱｲｳｴｵ ｱｲｳｴｵ -ｱｲｳｴ ｱｲｳｴ -ｱｲｳ ｱｲｳ -ｱｲ ｱｲ -ｱ ｱ - -SELECT `Ｃ１`, LEFT(`Ｃ１`,0) FROM `Ｔ１１`; -Ｃ１ LEFT(`Ｃ１`,0) -あいうえお -あいうえ -あいう -あい -あ - -SELECT `Ｃ１`, LEFT(`Ｃ１`,1) FROM `Ｔ１１`; -Ｃ１ LEFT(`Ｃ１`,1) -あいうえお あ -あいうえ あ -あいう あ -あい あ -あ あ - -SELECT `Ｃ１`, LEFT(`Ｃ１`,2) FROM `Ｔ１１`; -Ｃ１ LEFT(`Ｃ１`,2) -あいうえお あい -あいうえ あい -あいう あい -あい あい -あ あ - -SELECT `Ｃ１`, LEFT(`Ｃ１`,3) FROM `Ｔ１１`; -Ｃ１ LEFT(`Ｃ１`,3) -あいうえお あいう -あいうえ あいう -あいう あいう -あい あい -あ あ - -SELECT `Ｃ１`, LEFT(`Ｃ１`,4) FROM `Ｔ１１`; -Ｃ１ LEFT(`Ｃ１`,4) -あいうえお あいうえ -あいうえ あいうえ -あいう あいう -あい あい -あ あ - -SELECT `Ｃ１`, LEFT(`Ｃ１`,5) FROM `Ｔ１１`; -Ｃ１ LEFT(`Ｃ１`,5) -あいうえお あいうえお -あいうえ あいうえ -あいう あいう -あい あい -あ あ - -SELECT `Ｃ１`, LEFT(`Ｃ１`,0) FROM `Ｔ１２`; -Ｃ１ LEFT(`Ｃ１`,0) -龔龖龗龞龡 -龔龖龗龞 -龔龖龗 -龔龖 -龔 - -SELECT `Ｃ１`, LEFT(`Ｃ１`,1) FROM `Ｔ１２`; -Ｃ１ LEFT(`Ｃ１`,1) -龔龖龗龞龡 龔 -龔龖龗龞 龔 -龔龖龗 龔 -龔龖 龔 -龔 龔 - -SELECT `Ｃ１`, LEFT(`Ｃ１`,2) FROM `Ｔ１２`; -Ｃ１ LEFT(`Ｃ１`,2) -龔龖龗龞龡 龔龖 -龔龖龗龞 龔龖 -龔龖龗 龔龖 -龔龖 龔龖 -龔 龔 - -SELECT `Ｃ１`, LEFT(`Ｃ１`,3) FROM `Ｔ１２`; -Ｃ１ LEFT(`Ｃ１`,3) -龔龖龗龞龡 龔龖龗 -龔龖龗龞 龔龖龗 -龔龖龗 龔龖龗 -龔龖 龔龖 -龔 龔 - -SELECT `Ｃ１`, LEFT(`Ｃ１`,4) FROM `Ｔ１２`; -Ｃ１ LEFT(`Ｃ１`,4) -龔龖龗龞龡 龔龖龗龞 -龔龖龗龞 龔龖龗龞 -龔龖龗 龔龖龗 -龔龖 龔龖 -龔 龔 - -SELECT `Ｃ１`, LEFT(`Ｃ１`,5) FROM `Ｔ１２`; -Ｃ１ LEFT(`Ｃ１`,5) -龔龖龗龞龡 龔龖龗龞龡 -龔龖龗龞 龔龖龗龞 -龔龖龗 龔龖龗 -龔龖 龔龖 -龔 龔 - DROP TABLE `Ｔ１`; DROP TABLE `Ｔ２`; DROP TABLE `Ｔ３`; @@ -621,6 +468,3 @@ DROP TABLE `Ｔ６`; DROP TABLE `Ｔ７`; DROP TABLE `Ｔ８`; DROP TABLE `Ｔ９`; -DROP TABLE `Ｔ１０`; -DROP TABLE `Ｔ１１`; -DROP TABLE `Ｔ１２`; diff --git a/mysql-test/suite/jp/r/jp_length_sjis.result b/mysql-test/suite/jp/r/jp_length_sjis.result index 51055e09233..5de256962c9 100644 --- a/mysql-test/suite/jp/r/jp_length_sjis.result +++ b/mysql-test/suite/jp/r/jp_length_sjis.result @@ -7,9 +7,6 @@ drop table if exists `sU`; 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(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = innodb; @@ -18,12 +15,9 @@ CREATE TABLE `sR` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engin CREATE TABLE `sS` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sT` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sU` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; -CREATE TABLE `sV` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sW` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sX` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPO` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPP` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPQ` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; +CREATE TABLE `sV` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sW` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sX` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; INSERT INTO `sP` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `sQ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `sR` VALUES ('\\\\\'),('\\\\'),('\\\'),('\\'),('\'),(''); @@ -33,9 +27,6 @@ INSERT INTO `sU` VALUES ('\\\\\'),('\\\\'),('\\\'),('\\'),('\') INSERT INTO `sV` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `sW` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `sX` VALUES ('\\\\\'),('\\\\'),('\\\'),('\\'),('\'),(''); -INSERT INTO `sPO` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `sPP` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `sPQ` VALUES ('\\\\\'),('\\\\'),('\\\'),('\\'),('\'),(''); SELECT `bP`, LENGTH(`bP`) FROM `sP`; bP LENGTH(`bP`) 0 @@ -108,30 +99,6 @@ SELECT `bP`, LENGTH(`bP`) FROM `sX`; \\ 4 \ 2 0 -SELECT `bP`, LENGTH(`bP`) FROM `sPO`; -bP LENGTH(`bP`) - 5 - 4 - 3 - 2 - 1 - 0 -SELECT `bP`, LENGTH(`bP`) FROM `sPP`; -bP LENGTH(`bP`) - 10 - 8 - 6 - 4 - 2 - 0 -SELECT `bP`, LENGTH(`bP`) FROM `sPQ`; -bP LENGTH(`bP`) -\\\\\ 10 -\\\\ 8 -\\\ 6 -\\ 4 -\ 2 - 0 DROP TABLE `sP`; DROP TABLE `sQ`; DROP TABLE `sR`; @@ -141,6 +108,3 @@ DROP TABLE `sU`; DROP TABLE `sV`; DROP TABLE `sW`; DROP TABLE `sX`; -DROP TABLE `sPO`; -DROP TABLE `sPP`; -DROP TABLE `sPQ`; diff --git a/mysql-test/suite/jp/r/jp_length_ucs2.result b/mysql-test/suite/jp/r/jp_length_ucs2.result index 569e012f7d3..6c5cb3a74ba 100644 --- a/mysql-test/suite/jp/r/jp_length_ucs2.result +++ b/mysql-test/suite/jp/r/jp_length_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 `ԣ` (`ã` char(5), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engin 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 `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(' INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(''),(''),(''); SELECT `ã`, LENGTH(`ã`) FROM `ԣ`; ã LENGTH(`ã`) 0 @@ -109,30 +100,6 @@ SELECT `ã`, LENGTH(`ã`) FROM `ԣ`; 4 2 0 -SELECT `ã`, LENGTH(`ã`) FROM `ԣ`; -ã LENGTH(`ã`) - 10 - 8 - 6 - 4 - 2 - 0 -SELECT `ã`, LENGTH(`ã`) FROM `ԣ`; -ã LENGTH(`ã`) - 10 - 8 - 6 - 4 - 2 - 0 -SELECT `ã`, LENGTH(`ã`) FROM `ԣ`; -ã LENGTH(`ã`) -ݏޏߏ 10 -ݏޏ 8 -ݏ 6 - 4 - 2 - 0 DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -142,6 +109,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/r/jp_length_ujis.result b/mysql-test/suite/jp/r/jp_length_ujis.result index 288cc06a2ef..3b3d3d33eff 100644 --- a/mysql-test/suite/jp/r/jp_length_ujis.result +++ b/mysql-test/suite/jp/r/jp_length_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 `ԣ` (`ã` char(5), INDEX(`ã`)) DEFAULT CHARSET = ujis engin 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 `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(' INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(''),(''),(''); SELECT `ã`, LENGTH(`ã`) FROM `ԣ`; ã LENGTH(`ã`) 0 @@ -108,30 +99,6 @@ SELECT `ã`, LENGTH(`ã`) FROM `ԣ`; 6 3 0 -SELECT `ã`, LENGTH(`ã`) FROM `ԣ`; -ã LENGTH(`ã`) - 10 - 8 - 6 - 4 - 2 - 0 -SELECT `ã`, LENGTH(`ã`) FROM `ԣ`; -ã LENGTH(`ã`) - 10 - 8 - 6 - 4 - 2 - 0 -SELECT `ã`, LENGTH(`ã`) FROM `ԣ`; -ã LENGTH(`ã`) -ݏޏߏ 15 -ݏޏ 12 -ݏ 9 - 6 - 3 - 0 DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -141,6 +108,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/r/jp_length_utf8.result b/mysql-test/suite/jp/r/jp_length_utf8.result index 11b4c523053..6d4d4e439e9 100644 --- a/mysql-test/suite/jp/r/jp_length_utf8.result +++ b/mysql-test/suite/jp/r/jp_length_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 `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ１`; Ｃ１ LENGTH(`Ｃ１`) 0 @@ -108,30 +99,6 @@ SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ９`; 龔龖 6 龔 3 0 -SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ１０`; -Ｃ１ LENGTH(`Ｃ１`) -ｱｲｳｴｵ 15 -ｱｲｳｴ 12 -ｱｲｳ 9 -ｱｲ 6 -ｱ 3 - 0 -SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ１１`; -Ｃ１ LENGTH(`Ｃ１`) -あいうえお 15 -あいうえ 12 -あいう 9 -あい 6 -あ 3 - 0 -SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ１２`; -Ｃ１ LENGTH(`Ｃ１`) -龔龖龗龞龡 15 -龔龖龗龞 12 -龔龖龗 9 -龔龖 6 -龔 3 - 0 DROP TABLE `Ｔ１`; DROP TABLE `Ｔ２`; DROP TABLE `Ｔ３`; @@ -141,6 +108,3 @@ DROP TABLE `Ｔ６`; DROP TABLE `Ｔ７`; DROP TABLE `Ｔ８`; DROP TABLE `Ｔ９`; -DROP TABLE `Ｔ１０`; -DROP TABLE `Ｔ１１`; -DROP TABLE `Ｔ１２`; diff --git a/mysql-test/suite/jp/r/jp_like_sjis.result b/mysql-test/suite/jp/r/jp_like_sjis.result index a8145fb08f0..0d9cfff5557 100644 --- a/mysql-test/suite/jp/r/jp_like_sjis.result +++ b/mysql-test/suite/jp/r/jp_like_sjis.result @@ -7,9 +7,6 @@ drop table if exists `sU`; 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), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = innodb; @@ -18,12 +15,9 @@ CREATE TABLE `sR` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engi CREATE TABLE `sS` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sT` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sU` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; -CREATE TABLE `sV` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sW` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sX` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPO` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPP` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPQ` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; +CREATE TABLE `sV` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sW` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sX` (`bP` char(20), INDEX(`bP`)) 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 `sU`; 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 * FROM `sP` WHERE `bP` LIKE ' %'; bP !"#$%&'()*+,-./ @@ -258,56 +249,6 @@ SELECT * FROM `sX` WHERE `bP` LIKE '%\\\\\\\\\\\\\\\\\\\ SELECT * FROM `sX` WHERE `bP` LIKE '%\\\\\\\\\\\\\\\\\\\\'; bP \\\\\\\\\\\\\\\\\\\\ -SELECT * FROM `sPO` WHERE `bP` LIKE ' %'; -bP - !"#$%&'()*+,-./ - -SELECT * FROM `sPO` WHERE `bP` LIKE '% %'; -bP - !"#$%&'()*+,-./ - -SELECT * FROM `sPO` WHERE `bP` LIKE '% '; -bP -SELECT * FROM `sPO` WHERE `bP` LIKE '%'; -bP - -SELECT * FROM `sPO` WHERE `bP` LIKE '%%'; -bP - -SELECT * FROM `sPO` WHERE `bP` LIKE '%'; -bP - -SELECT * FROM `sPO` WHERE `bP` LIKE '%'; -bP - -SELECT * FROM `sPP` WHERE `bP` LIKE '@%'; -bP -@@ABCDEFGHIJKLMNOPQR -SELECT * FROM `sPP` WHERE `bP` LIKE '%@%'; -bP -@@ABCDEFGHIJKLMNOPQR -EEEEEEEEEE@ -SELECT * FROM `sPP` WHERE `bP` LIKE '%@'; -bP -EEEEEEEEEE@ -SELECT * FROM `sPP` WHERE `bP` LIKE '%'; -bP -ƂǂȂɂʂ˂̂͂ςЂт҂ӂԂՂւׂ -SELECT * FROM `sPP` WHERE `bP` LIKE '%%'; -bP -E -SELECT * FROM `sPP` WHERE `bP` LIKE '%'; -bP -ڂۂ܂݂ނ߂ -SELECT * FROM `sPQ` WHERE `bP` LIKE '\%'; -bP -\\\\\\\\\\\\\\\\\\\\ -SELECT * FROM `sPQ` WHERE `bP` LIKE '%\%'; -bP -\\\\\\\\\\\\\\\\\\\\ -SELECT * FROM `sPQ` WHERE `bP` LIKE '%\'; -bP -\\\\\\\\\\\\\\\\\\\\ DROP TABLE `sP`; DROP TABLE `sQ`; DROP TABLE `sR`; @@ -317,6 +258,3 @@ DROP TABLE `sU`; DROP TABLE `sV`; DROP TABLE `sW`; DROP TABLE `sX`; -DROP TABLE `sPO`; -DROP TABLE `sPP`; -DROP TABLE `sPQ`; diff --git a/mysql-test/suite/jp/r/jp_like_ucs2.result b/mysql-test/suite/jp/r/jp_like_ucs2.result index 229ef12a118..5b0f5171b94 100644 --- a/mysql-test/suite/jp/r/jp_like_ucs2.result +++ b/mysql-test/suite/jp/r/jp_like_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 `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engi CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = myisam; CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = myisam; CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = myisam; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = bdb; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = bdb; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = bdb; +CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = MEMORY; INSERT INTO `ԣ` VALUES ('PQRSTUVWXYZ[\\]^_') ,(' ') @@ -100,31 +94,6 @@ INSERT INTO `ԣ` VALUES ,('') ,('ÏďŏƏ') ,('ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ'); -INSERT INTO `ԣ` VALUES -('PQRSTUVWXYZ[\\]^_') -,(' ') -,('') -,('ÎĎŎƎǎȎɎʎˎ͎̎Ύ') -,('ЎюҎӎԎՎ֎؎َڎێݎގ'); -INSERT INTO `ԣ` VALUES -('') -,('¡áġšơ') -,('ȡɡʡˡ̡͡ΡϡСѡҡӡԡա֡סء١ڡ') -,('') -,('Ȥɤʤˤ̤ͤΤϤФѤҤӤԤդ֤פؤ٤ڤ') -,('ܤݤޤߤ') -,('') -,('') -,('СТУФХЦЧШЩЪЫЬЭЮЯабвг') -,(''); -INSERT INTO `ԣ` VALUES -('Ïġ') -,('ÏďŏƏ') -,('ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ') -,('ݏޏߏᏰ⏰㏰䏰台揰珰菰鏰ꏰ돰쏰폰') -,('') -,('ÏďŏƏ') -,('ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ'); SELECT * FROM `ԣ` WHERE `ã` LIKE ' %'; ã @@ -335,76 +304,6 @@ SELECT * FROM `ԣ` WHERE `ã` LIKE '% SELECT * FROM `ԣ` WHERE `ã` LIKE '%ÏďŏƏ'; ã ÏďŏƏ -SELECT * FROM `ԣ` WHERE `ã` LIKE ' %'; -ã - -SELECT * FROM `ԣ` WHERE `ã` LIKE '% %'; -ã - -SELECT * FROM `ԣ` WHERE `ã` LIKE '% '; -ã -SELECT * FROM `ԣ` WHERE `ã` LIKE '%'; -ã -ÎĎŎƎǎȎɎʎˎ͎̎Ύ -SELECT * FROM `ԣ` WHERE `ã` LIKE '%%'; -ã -ЎюҎӎԎՎ֎؎َڎێݎގ -SELECT * FROM `ԣ` WHERE `ã` LIKE '%'; -ã - -SELECT * FROM `ԣ` WHERE `ã` LIKE '%'; -ã - -SELECT * FROM `ԣ` WHERE `ã` LIKE '%%'; -ã - -SELECT * FROM `ԣ` WHERE `ã` LIKE '%'; -ã - -SELECT * FROM `ԣ` WHERE `ã` LIKE '%'; -ã - -SELECT * FROM `ԣ` WHERE `ã` LIKE '%%'; -ã - -SELECT * FROM `ԣ` WHERE `ã` LIKE '%'; -ã -SELECT * FROM `ԣ` WHERE `ã` LIKE '%'; -ã -Ȥɤʤˤ̤ͤΤϤФѤҤӤԤդ֤פؤ٤ڤ -SELECT * FROM `ԣ` WHERE `ã` LIKE '%%'; -ã - -SELECT * FROM `ԣ` WHERE `ã` LIKE '%'; -ã -ܤݤޤߤ -SELECT * FROM `ԣ` WHERE `ã` LIKE '%'; -ã - -SELECT * FROM `ԣ` WHERE `ã` LIKE '%%'; -ã - -SELECT * FROM `ԣ` WHERE `ã` LIKE '%'; -ã - -SELECT * FROM `ԣ` WHERE `ã` LIKE '%'; -ã -ÏďŏƏ -SELECT * FROM `ԣ` WHERE `ã` LIKE '%%'; -ã -ÏďŏƏ -SELECT * FROM `ԣ` WHERE `ã` LIKE '%'; -ã -ÏďŏƏ -SELECT * FROM `ԣ` WHERE `ã` LIKE 'ÏďŏƏ%'; -ã -ÏďŏƏ -SELECT * FROM `ԣ` WHERE `ã` LIKE '%ÏďŏƏ%'; -ã -ÏďŏƏ -SELECT * FROM `ԣ` WHERE `ã` LIKE '%ÏďŏƏ'; -ã -ÏďŏƏ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -414,6 +313,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/r/jp_like_ujis.result b/mysql-test/suite/jp/r/jp_like_ujis.result index 5d623df0384..a0cf0264dfb 100644 --- a/mysql-test/suite/jp/r/jp_like_ujis.result +++ b/mysql-test/suite/jp/r/jp_like_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), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = innodb; @@ -18,12 +15,9 @@ CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engi CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = myisam; CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = myisam; CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = myisam; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = bdb; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = bdb; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = bdb; +CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) 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 * FROM `ԣ` WHERE `ã` LIKE ' %'; ã !"#$%&'()*+,-./ @@ -258,56 +249,6 @@ SELECT * FROM `ԣ` WHERE `ã` LIKE '% SELECT * FROM `ԣ` WHERE `ã` LIKE '%ÏďŏƏ'; ã ÏďŏƏ -SELECT * FROM `ԣ` WHERE `ã` LIKE ' %'; -ã - !"#$%&'()*+,-./ - -SELECT * FROM `ԣ` WHERE `ã` LIKE '% %'; -ã - !"#$%&'()*+,-./ - -SELECT * FROM `ԣ` WHERE `ã` LIKE '% '; -ã -SELECT * FROM `ԣ` WHERE `ã` LIKE '%'; -ã -ÎĎŎƎǎȎɎʎˎ͎̎Ύ -SELECT * FROM `ԣ` WHERE `ã` LIKE '%%'; -ã -ЎюҎӎԎՎ֎؎َڎێݎގ -SELECT * FROM `ԣ` WHERE `ã` LIKE '%'; -ã - -SELECT * FROM `ԣ` WHERE `ã` LIKE '%'; -ã - -SELECT * FROM `ԣ` WHERE `ã` LIKE '%'; -ã - -SELECT * FROM `ԣ` WHERE `ã` LIKE '%%'; -ã - - -SELECT * FROM `ԣ` WHERE `ã` LIKE '%'; -ã - -SELECT * FROM `ԣ` WHERE `ã` LIKE '%'; -ã -Ȥɤʤˤ̤ͤΤϤФѤҤӤԤդ֤פؤ٤ڤ -SELECT * FROM `ԣ` WHERE `ã` LIKE '%%'; -ã - -SELECT * FROM `ԣ` WHERE `ã` LIKE '%'; -ã -ܤݤޤߤ -SELECT * FROM `ԣ` WHERE `ã` LIKE '%'; -ã -ÏďŏƏ -SELECT * FROM `ԣ` WHERE `ã` LIKE '%%'; -ã -ÏďŏƏ -SELECT * FROM `ԣ` WHERE `ã` LIKE '%'; -ã -ÏďŏƏ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -317,6 +258,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/r/jp_like_utf8.result b/mysql-test/suite/jp/r/jp_like_utf8.result index bf48da79951..2ac95ba4d6a 100644 --- a/mysql-test/suite/jp/r/jp_like_utf8.result +++ b/mysql-test/suite/jp/r/jp_like_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), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = innodb; @@ -18,12 +15,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf CREATE TABLE `Ｔ４` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam; CREATE TABLE `Ｔ５` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam; CREATE TABLE `Ｔ６` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam; -CREATE TABLE `Ｔ７` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ８` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ９` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ１０` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb; -CREATE TABLE `Ｔ１１` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb; -CREATE TABLE `Ｔ１２` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb; +CREATE TABLE `Ｔ７` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ８` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ９` (`Ｃ１` char(20), INDEX(`Ｃ１`)) 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 * FROM `Ｔ１` WHERE `Ｃ１` LIKE ' %'; Ｃ１ !"#$%&'()*+,-./ @@ -258,53 +249,6 @@ SELECT * FROM `Ｔ９` WHERE `Ｃ１` LIKE '%鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿 SELECT * FROM `Ｔ９` WHERE `Ｃ１` LIKE '%鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖'; Ｃ１ 鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖 -SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE ' %'; -Ｃ１ - !"#$%&'()*+,-./ - ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ -SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE '% %'; -Ｃ１ - !"#$%&'()*+,-./ - ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ -SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE '% '; -Ｃ１ -SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE 'ﾀ%'; -Ｃ１ -ﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏ -SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE '%ﾗﾘ%'; -Ｃ１ -ﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ -SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE '%ｿ'; -Ｃ１ -ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ -SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE ' %'; -Ｃ１ - 、。，．・：；？！゛゜´｀¨＾￣＿ヽ -SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '% %'; -Ｃ１ - 、。，．・：；？！゛゜´｀¨＾￣＿ヽ -・・ʼn♯♭♪†‡¶・・・・◯・・・・ -SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '% '; -Ｃ１ -・・ʼn♯♭♪†‡¶・・・・◯・・・・ -SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE 'と%'; -Ｃ１ -とどなにぬねのはばぱひびぴふぶぷへべぺほ -SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '%あ%'; -Ｃ１ -・ぁあぃいぅうぇえぉおかがきぎくぐけげこ -SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '%わ'; -Ｃ１ -ぼぽまみむめもゃやゅゆょよらりるれろゎわ -SELECT * FROM `Ｔ１２` WHERE `Ｃ１` LIKE '鼫%'; -Ｃ１ -鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖 -SELECT * FROM `Ｔ１２` WHERE `Ｃ１` LIKE '%鼺%'; -Ｃ１ -鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖 -SELECT * FROM `Ｔ１２` WHERE `Ｃ１` LIKE '%齖'; -Ｃ１ -鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖 DROP TABLE `Ｔ１`; DROP TABLE `Ｔ２`; DROP TABLE `Ｔ３`; @@ -314,6 +258,3 @@ DROP TABLE `Ｔ６`; DROP TABLE `Ｔ７`; DROP TABLE `Ｔ８`; DROP TABLE `Ｔ９`; -DROP TABLE `Ｔ１０`; -DROP TABLE `Ｔ１１`; -DROP TABLE `Ｔ１２`; diff --git a/mysql-test/suite/jp/r/jp_locate_sjis.result b/mysql-test/suite/jp/r/jp_locate_sjis.result index b2455401db8..623d1388673 100644 --- a/mysql-test/suite/jp/r/jp_locate_sjis.result +++ b/mysql-test/suite/jp/r/jp_locate_sjis.result @@ -7,7 +7,6 @@ drop table if exists `sU`; drop table if exists `sV`; drop table if exists `sW`; drop table if exists `sX`; -drop table if exists `sPO`; SET NAMES sjis; SET character_set_database = sjis; CREATE TABLE `sP` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = innodb; @@ -16,12 +15,9 @@ CREATE TABLE `sR` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engin CREATE TABLE `sS` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sT` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sU` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; -CREATE TABLE `sV` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sW` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sX` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPO` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPP` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPQ` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; +CREATE TABLE `sV` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sW` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sX` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; INSERT INTO `sP` VALUES (''); INSERT INTO `sQ` VALUES (''); INSERT INTO `sR` VALUES ('\\\\\'); @@ -31,9 +27,6 @@ INSERT INTO `sU` VALUES ('\\\\\'); INSERT INTO `sV` VALUES (''); INSERT INTO `sW` VALUES (''); INSERT INTO `sX` VALUES ('\\\\\'); -INSERT INTO `sPO` VALUES (''); -INSERT INTO `sPP` VALUES (''); -INSERT INTO `sPQ` VALUES ('\\\\\'); SELECT LOCATE('',`bP`) from `sP`; LOCATE('',`bP`) 1 @@ -196,60 +189,6 @@ LOCATE('\',`bP`) SELECT LOCATE('\',`bP`) from `sX`; LOCATE('\',`bP`) 0 -SELECT LOCATE('',`bP`) from `sPO`; -LOCATE('',`bP`) -1 -SELECT LOCATE('',`bP`) from `sPO`; -LOCATE('',`bP`) -2 -SELECT LOCATE('',`bP`) from `sPO`; -LOCATE('',`bP`) -3 -SELECT LOCATE('',`bP`) from `sPO`; -LOCATE('',`bP`) -4 -SELECT LOCATE('',`bP`) from `sPO`; -LOCATE('',`bP`) -5 -SELECT LOCATE('',`bP`) from `sPO`; -LOCATE('',`bP`) -0 -SELECT LOCATE('',`bP`) from `sPP`; -LOCATE('',`bP`) -1 -SELECT LOCATE('',`bP`) from `sPP`; -LOCATE('',`bP`) -2 -SELECT LOCATE('',`bP`) from `sPP`; -LOCATE('',`bP`) -3 -SELECT LOCATE('',`bP`) from `sPP`; -LOCATE('',`bP`) -4 -SELECT LOCATE('',`bP`) from `sPP`; -LOCATE('',`bP`) -5 -SELECT LOCATE('',`bP`) from `sPP`; -LOCATE('',`bP`) -0 -SELECT LOCATE('\',`bP`) from `sPQ`; -LOCATE('\',`bP`) -1 -SELECT LOCATE('\',`bP`) from `sPQ`; -LOCATE('\',`bP`) -2 -SELECT LOCATE('\',`bP`) from `sPQ`; -LOCATE('\',`bP`) -3 -SELECT LOCATE('\',`bP`) from `sPQ`; -LOCATE('\',`bP`) -4 -SELECT LOCATE('\',`bP`) from `sPQ`; -LOCATE('\',`bP`) -5 -SELECT LOCATE('\',`bP`) from `sPQ`; -LOCATE('\',`bP`) -0 DROP TABLE `sP`; DROP TABLE `sQ`; DROP TABLE `sR`; @@ -259,6 +198,3 @@ DROP TABLE `sU`; DROP TABLE `sV`; DROP TABLE `sW`; DROP TABLE `sX`; -DROP TABLE `sPO`; -DROP TABLE `sPP`; -DROP TABLE `sPQ`; diff --git a/mysql-test/suite/jp/r/jp_locate_ucs2.result b/mysql-test/suite/jp/r/jp_locate_ucs2.result index 37b219b3335..357f1c235b5 100644 --- a/mysql-test/suite/jp/r/jp_locate_ucs2.result +++ b/mysql-test/suite/jp/r/jp_locate_ucs2.result @@ -7,7 +7,6 @@ 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; @@ -17,12 +16,9 @@ CREATE TABLE `ԣ` (`ã` char(5), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engin 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 ('ݏޏߏ'); @@ -32,9 +28,6 @@ INSERT INTO `ԣ` VALUES ('ݏޏߏ'); INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES ('ݏޏߏ'); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'); SELECT LOCATE('',`ã`) from `ԣ`; LOCATE('',`ã`) 1 @@ -197,60 +190,6 @@ LOCATE('',`ã`) SELECT LOCATE('',`ã`) from `ԣ`; LOCATE('',`ã`) 0 -SELECT LOCATE('',`ã`) from `ԣ`; -LOCATE('',`ã`) -1 -SELECT LOCATE('',`ã`) from `ԣ`; -LOCATE('',`ã`) -2 -SELECT LOCATE('',`ã`) from `ԣ`; -LOCATE('',`ã`) -3 -SELECT LOCATE('',`ã`) from `ԣ`; -LOCATE('',`ã`) -4 -SELECT LOCATE('',`ã`) from `ԣ`; -LOCATE('',`ã`) -5 -SELECT LOCATE('',`ã`) from `ԣ`; -LOCATE('',`ã`) -0 -SELECT LOCATE('',`ã`) from `ԣ`; -LOCATE('',`ã`) -1 -SELECT LOCATE('',`ã`) from `ԣ`; -LOCATE('',`ã`) -2 -SELECT LOCATE('',`ã`) from `ԣ`; -LOCATE('',`ã`) -3 -SELECT LOCATE('',`ã`) from `ԣ`; -LOCATE('',`ã`) -4 -SELECT LOCATE('',`ã`) from `ԣ`; -LOCATE('',`ã`) -5 -SELECT LOCATE('',`ã`) from `ԣ`; -LOCATE('',`ã`) -0 -SELECT LOCATE('',`ã`) from `ԣ`; -LOCATE('',`ã`) -1 -SELECT LOCATE('',`ã`) from `ԣ`; -LOCATE('',`ã`) -2 -SELECT LOCATE('',`ã`) from `ԣ`; -LOCATE('',`ã`) -3 -SELECT LOCATE('',`ã`) from `ԣ`; -LOCATE('',`ã`) -4 -SELECT LOCATE('',`ã`) from `ԣ`; -LOCATE('',`ã`) -5 -SELECT LOCATE('',`ã`) from `ԣ`; -LOCATE('',`ã`) -0 DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -260,6 +199,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/r/jp_locate_ujis.result b/mysql-test/suite/jp/r/jp_locate_ujis.result index d139fa9203c..45560d2f331 100644 --- a/mysql-test/suite/jp/r/jp_locate_ujis.result +++ b/mysql-test/suite/jp/r/jp_locate_ujis.result @@ -7,7 +7,6 @@ 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; @@ -16,12 +15,9 @@ CREATE TABLE `ԣ` (`ã` char(5), INDEX(`ã`)) DEFAULT CHARSET = ujis engin 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 ('ݏޏߏ'); @@ -31,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 LOCATE('',`ã`) from `ԣ`; LOCATE('',`ã`) 1 @@ -196,60 +189,6 @@ LOCATE('',`ã`) SELECT LOCATE('',`ã`) from `ԣ`; LOCATE('',`ã`) 0 -SELECT LOCATE('',`ã`) from `ԣ`; -LOCATE('',`ã`) -1 -SELECT LOCATE('',`ã`) from `ԣ`; -LOCATE('',`ã`) -2 -SELECT LOCATE('',`ã`) from `ԣ`; -LOCATE('',`ã`) -3 -SELECT LOCATE('',`ã`) from `ԣ`; -LOCATE('',`ã`) -4 -SELECT LOCATE('',`ã`) from `ԣ`; -LOCATE('',`ã`) -5 -SELECT LOCATE('',`ã`) from `ԣ`; -LOCATE('',`ã`) -0 -SELECT LOCATE('',`ã`) from `ԣ`; -LOCATE('',`ã`) -1 -SELECT LOCATE('',`ã`) from `ԣ`; -LOCATE('',`ã`) -2 -SELECT LOCATE('',`ã`) from `ԣ`; -LOCATE('',`ã`) -3 -SELECT LOCATE('',`ã`) from `ԣ`; -LOCATE('',`ã`) -4 -SELECT LOCATE('',`ã`) from `ԣ`; -LOCATE('',`ã`) -5 -SELECT LOCATE('',`ã`) from `ԣ`; -LOCATE('',`ã`) -0 -SELECT LOCATE('',`ã`) from `ԣ`; -LOCATE('',`ã`) -1 -SELECT LOCATE('',`ã`) from `ԣ`; -LOCATE('',`ã`) -2 -SELECT LOCATE('',`ã`) from `ԣ`; -LOCATE('',`ã`) -3 -SELECT LOCATE('',`ã`) from `ԣ`; -LOCATE('',`ã`) -4 -SELECT LOCATE('',`ã`) from `ԣ`; -LOCATE('',`ã`) -5 -SELECT LOCATE('',`ã`) from `ԣ`; -LOCATE('',`ã`) -0 DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -259,6 +198,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/r/jp_locate_utf8.result b/mysql-test/suite/jp/r/jp_locate_utf8.result index a1ce9e8d2dc..162d03e6056 100644 --- a/mysql-test/suite/jp/r/jp_locate_utf8.result +++ b/mysql-test/suite/jp/r/jp_locate_utf8.result @@ -7,7 +7,6 @@ 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; @@ -16,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 ('龔龖龗龞龡'); @@ -31,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 LOCATE('ｱ',`Ｃ１`) from `Ｔ１`; LOCATE('ｱ',`Ｃ１`) 1 @@ -196,60 +189,6 @@ LOCATE('龡',`Ｃ１`) SELECT LOCATE('丂',`Ｃ１`) from `Ｔ９`; LOCATE('丂',`Ｃ１`) 0 -SELECT LOCATE('ｱ',`Ｃ１`) from `Ｔ１０`; -LOCATE('ｱ',`Ｃ１`) -1 -SELECT LOCATE('ｲ',`Ｃ１`) from `Ｔ１０`; -LOCATE('ｲ',`Ｃ１`) -2 -SELECT LOCATE('ｳ',`Ｃ１`) from `Ｔ１０`; -LOCATE('ｳ',`Ｃ１`) -3 -SELECT LOCATE('ｴ',`Ｃ１`) from `Ｔ１０`; -LOCATE('ｴ',`Ｃ１`) -4 -SELECT LOCATE('ｵ',`Ｃ１`) from `Ｔ１０`; -LOCATE('ｵ',`Ｃ１`) -5 -SELECT LOCATE('ﾝ',`Ｃ１`) from `Ｔ１０`; -LOCATE('ﾝ',`Ｃ１`) -0 -SELECT LOCATE('あ',`Ｃ１`) from `Ｔ１１`; -LOCATE('あ',`Ｃ１`) -1 -SELECT LOCATE('い',`Ｃ１`) from `Ｔ１１`; -LOCATE('い',`Ｃ１`) -2 -SELECT LOCATE('う',`Ｃ１`) from `Ｔ１１`; -LOCATE('う',`Ｃ１`) -3 -SELECT LOCATE('え',`Ｃ１`) from `Ｔ１１`; -LOCATE('え',`Ｃ１`) -4 -SELECT LOCATE('お',`Ｃ１`) from `Ｔ１１`; -LOCATE('お',`Ｃ１`) -5 -SELECT LOCATE('ん',`Ｃ１`) from `Ｔ１１`; -LOCATE('ん',`Ｃ１`) -0 -SELECT LOCATE('龔',`Ｃ１`) from `Ｔ１２`; -LOCATE('龔',`Ｃ１`) -1 -SELECT LOCATE('龖',`Ｃ１`) from `Ｔ１２`; -LOCATE('龖',`Ｃ１`) -2 -SELECT LOCATE('龗',`Ｃ１`) from `Ｔ１２`; -LOCATE('龗',`Ｃ１`) -3 -SELECT LOCATE('龞',`Ｃ１`) from `Ｔ１２`; -LOCATE('龞',`Ｃ１`) -4 -SELECT LOCATE('龡',`Ｃ１`) from `Ｔ１２`; -LOCATE('龡',`Ｃ１`) -5 -SELECT LOCATE('丂',`Ｃ１`) from `Ｔ１２`; -LOCATE('丂',`Ｃ１`) -0 DROP TABLE `Ｔ１`; DROP TABLE `Ｔ２`; DROP TABLE `Ｔ３`; @@ -259,6 +198,3 @@ DROP TABLE `Ｔ６`; DROP TABLE `Ｔ７`; DROP TABLE `Ｔ８`; DROP TABLE `Ｔ９`; -DROP TABLE `Ｔ１０`; -DROP TABLE `Ｔ１１`; -DROP TABLE `Ｔ１２`; diff --git a/mysql-test/suite/jp/r/jp_lpad_sjis.result b/mysql-test/suite/jp/r/jp_lpad_sjis.result index b45427ebf3d..46cbde52192 100644 --- a/mysql-test/suite/jp/r/jp_lpad_sjis.result +++ b/mysql-test/suite/jp/r/jp_lpad_sjis.result @@ -7,9 +7,6 @@ drop table if exists `sU`; 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(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = innodb; @@ -18,12 +15,9 @@ CREATE TABLE `sR` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engin CREATE TABLE `sS` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sT` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sU` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; -CREATE TABLE `sV` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sW` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sX` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPO` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPP` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPQ` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; +CREATE TABLE `sV` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sW` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sX` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; INSERT INTO `sP` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `sQ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `sR` VALUES ('\\\\\'),('\\\\'),('\\\'),('\\'),('\'),(''); @@ -33,9 +27,6 @@ INSERT INTO `sU` VALUES ('\\\\\'),('\\\\'),('\\\'),('\\'),('\') INSERT INTO `sV` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `sW` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `sX` VALUES ('\\\\\'),('\\\\'),('\\\'),('\\'),('\'),(''); -INSERT INTO `sPO` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `sPP` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `sPQ` VALUES ('\\\\\'),('\\\\'),('\\\'),('\\'),('\'),(''); SELECT `bP`, LPAD(`bP`,5,'') FROM `sP`; bP LPAD(`bP`,5,'') @@ -108,30 +99,6 @@ SELECT `bP`, LPAD(`bP`,5,'\' ) FROM `sX`; \\ \\\\\ \ \\\\\ \\\\\ -SELECT `bP`, LPAD(`bP`,5,'') FROM `sPO`; -bP LPAD(`bP`,5,'') - - - - - - -SELECT `bP`, LPAD(`bP`,5,'w') FROM `sPP`; -bP LPAD(`bP`,5,'w') - - w - ww - www - wwww - wwwww -SELECT `bP`, LPAD(`bP`,5,'\' ) FROM `sPQ`; -bP LPAD(`bP`,5,'\' ) -\\\\\ \\\\\ -\\\\ \\\\\ -\\\ \\\\\ -\\ \\\\\ -\ \\\\\ - \\\\\ DROP TABLE `sP`; DROP TABLE `sQ`; DROP TABLE `sR`; @@ -141,6 +108,3 @@ DROP TABLE `sU`; DROP TABLE `sV`; DROP TABLE `sW`; DROP TABLE `sX`; -DROP TABLE `sPO`; -DROP TABLE `sPP`; -DROP TABLE `sPQ`; diff --git a/mysql-test/suite/jp/r/jp_lpad_ucs2.result b/mysql-test/suite/jp/r/jp_lpad_ucs2.result index 951c5508a8f..f5ba98db3f3 100644 --- a/mysql-test/suite/jp/r/jp_lpad_ucs2.result +++ b/mysql-test/suite/jp/r/jp_lpad_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 `ԣ` (`ã` char(5), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engin 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 `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(' INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(''),(''),(''); SELECT `ã`, LPAD(`ã`,5,'') FROM `ԣ`; ã LPAD(`ã`,5,'') @@ -109,30 +100,6 @@ SELECT `ã`, LPAD(`ã`,5,'' ) FROM `ԣ`; -SELECT `ã`, LPAD(`ã`,5,'') FROM `ԣ`; -ã LPAD(`ã`,5,'') - - - - - - -SELECT `ã`, LPAD(`ã`,5,'') FROM `ԣ`; -ã LPAD(`ã`,5,'') - - ؤ - أؤ - أأؤ - أأأؤ - أأأأ -SELECT `ã`, LPAD(`ã`,5,'' ) FROM `ԣ`; -ã LPAD(`ã`,5,'' ) -ݏޏߏ ݏޏߏ -ݏޏ ݏޏ -ݏ ݏ - - - DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -142,6 +109,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/r/jp_lpad_ujis.result b/mysql-test/suite/jp/r/jp_lpad_ujis.result index 945e513d066..c95f0e2f261 100644 --- a/mysql-test/suite/jp/r/jp_lpad_ujis.result +++ b/mysql-test/suite/jp/r/jp_lpad_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 `ԣ` (`ã` char(5), INDEX(`ã`)) DEFAULT CHARSET = ujis engin 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 `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(' INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(''),(''),(''); SELECT `ã`, LPAD(`ã`,5,'') FROM `ԣ`; ã LPAD(`ã`,5,'') @@ -108,30 +99,6 @@ SELECT `ã`, LPAD(`ã`,5,'' ) FROM `ԣ`; -SELECT `ã`, LPAD(`ã`,5,'') FROM `ԣ`; -ã LPAD(`ã`,5,'') - - - - - - -SELECT `ã`, LPAD(`ã`,5,'') FROM `ԣ`; -ã LPAD(`ã`,5,'') - - ؤ - أؤ - أأؤ - أأأؤ - أأأأ -SELECT `ã`, LPAD(`ã`,5,'' ) FROM `ԣ`; -ã LPAD(`ã`,5,'' ) -ݏޏߏ ݏޏߏ -ݏޏ ݏޏ -ݏ ݏ - - - DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -141,6 +108,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/r/jp_lpad_utf8.result b/mysql-test/suite/jp/r/jp_lpad_utf8.result index 8a3bae0153e..150dfe61b13 100644 --- a/mysql-test/suite/jp/r/jp_lpad_utf8.result +++ b/mysql-test/suite/jp/r/jp_lpad_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 `Ｃ１`, LPAD(`Ｃ１`,5,'｡') FROM `Ｔ１`; Ｃ１ LPAD(`Ｃ１`,5,'｡') ｡｡｡｡｡ @@ -108,30 +99,6 @@ SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'丄' ) FROM `Ｔ９`; 龔龖 丄丄丄龔龖 龔 丄丄丄丄龔 丄丄丄丄丄 -SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'｡') FROM `Ｔ１０`; -Ｃ１ LPAD(`Ｃ１`,5,'｡') -ｱｲｳｴｵ ｱｲｳｴｵ -ｱｲｳｴ ｡ｱｲｳｴ -ｱｲｳ ｡｡ｱｲｳ -ｱｲ ｡｡｡ｱｲ -ｱ ｡｡｡｡ｱ - ｡｡｡｡｡ -SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'Ｘ') FROM `Ｔ１１`; -Ｃ１ LPAD(`Ｃ１`,5,'Ｘ') -あいうえお あいうえお -あいうえ Ｘあいうえ -あいう ＸＸあいう -あい ＸＸＸあい -あ ＸＸＸＸあ - ＸＸＸＸＸ -SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'丄' ) FROM `Ｔ１２`; -Ｃ１ LPAD(`Ｃ１`,5,'丄' ) -龔龖龗龞龡 龔龖龗龞龡 -龔龖龗龞 丄龔龖龗龞 -龔龖龗 丄丄龔龖龗 -龔龖 丄丄丄龔龖 -龔 丄丄丄丄龔 - 丄丄丄丄丄 DROP TABLE `Ｔ１`; DROP TABLE `Ｔ２`; DROP TABLE `Ｔ３`; @@ -141,6 +108,3 @@ DROP TABLE `Ｔ６`; DROP TABLE `Ｔ７`; DROP TABLE `Ｔ８`; DROP TABLE `Ｔ９`; -DROP TABLE `Ｔ１０`; -DROP TABLE `Ｔ１１`; -DROP TABLE `Ｔ１２`; diff --git a/mysql-test/suite/jp/r/jp_ltrim_sjis.result b/mysql-test/suite/jp/r/jp_ltrim_sjis.result index 23032d65c56..7a7902afe2d 100644 --- a/mysql-test/suite/jp/r/jp_ltrim_sjis.result +++ b/mysql-test/suite/jp/r/jp_ltrim_sjis.result @@ -7,7 +7,6 @@ drop table if exists `sU`; drop table if exists `sV`; drop table if exists `sW`; drop table if exists `sX`; -drop table if exists `sPO`; SET NAMES sjis; SET character_set_database = sjis; CREATE TABLE `sP` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = innodb; @@ -16,12 +15,9 @@ CREATE TABLE `sR` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engin CREATE TABLE `sS` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sT` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sU` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; -CREATE TABLE `sV` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sW` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sX` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPO` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPP` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPQ` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; +CREATE TABLE `sV` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sW` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sX` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; INSERT INTO `sP` VALUES (''); INSERT INTO `sP` VALUES (' '); INSERT INTO `sP` VALUES (' '); @@ -85,27 +81,6 @@ INSERT INTO `sX` VALUES (' \\\\\'); INSERT INTO `sX` VALUES ('@\\\\\'); INSERT INTO `sX` VALUES ('@@\\\\\'); INSERT INTO `sX` VALUES ('@@@\\\\\'); -INSERT INTO `sPO` VALUES (''); -INSERT INTO `sPO` VALUES (' '); -INSERT INTO `sPO` VALUES (' '); -INSERT INTO `sPO` VALUES (' '); -INSERT INTO `sPO` VALUES ('@'); -INSERT INTO `sPO` VALUES ('@@'); -INSERT INTO `sPO` VALUES ('@@@'); -INSERT INTO `sPP` VALUES (''); -INSERT INTO `sPP` VALUES (' '); -INSERT INTO `sPP` VALUES (' '); -INSERT INTO `sPP` VALUES (' '); -INSERT INTO `sPP` VALUES ('@'); -INSERT INTO `sPP` VALUES ('@@'); -INSERT INTO `sPP` VALUES ('@@@'); -INSERT INTO `sPQ` VALUES ('\\\\\'); -INSERT INTO `sPQ` VALUES (' \\\\\'); -INSERT INTO `sPQ` VALUES (' \\\\\'); -INSERT INTO `sPQ` VALUES (' \\\\\'); -INSERT INTO `sPQ` VALUES ('@\\\\\'); -INSERT INTO `sPQ` VALUES ('@@\\\\\'); -INSERT INTO `sPQ` VALUES ('@@@\\\\\'); SELECT LTRIM(`bP`) from `sP`; LTRIM(`bP`) @@ -187,33 +162,6 @@ LTRIM(`bP`) @\\\\\ @@\\\\\ @@@\\\\\ -SELECT LTRIM(`bP`) from `sPO`; -LTRIM(`bP`) - - - - -@ -@@ -@@@ -SELECT LTRIM(`bP`) from `sPP`; -LTRIM(`bP`) - - - - -@ -@@ -@@@ -SELECT LTRIM(`bP`) from `sPQ`; -LTRIM(`bP`) -\\\\\ -\\\\\ -\\\\\ -\\\\\ -@\\\\\ -@@\\\\\ -@@@\\\\\ DROP TABLE `sP`; DROP TABLE `sQ`; DROP TABLE `sR`; @@ -223,6 +171,3 @@ DROP TABLE `sU`; DROP TABLE `sV`; DROP TABLE `sW`; DROP TABLE `sX`; -DROP TABLE `sPO`; -DROP TABLE `sPP`; -DROP TABLE `sPQ`; diff --git a/mysql-test/suite/jp/r/jp_ltrim_ucs2.result b/mysql-test/suite/jp/r/jp_ltrim_ucs2.result index 533cf95a976..c46e917c933 100644 --- a/mysql-test/suite/jp/r/jp_ltrim_ucs2.result +++ b/mysql-test/suite/jp/r/jp_ltrim_ucs2.result @@ -7,7 +7,6 @@ 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; @@ -17,12 +16,9 @@ CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engin CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = myisam; CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = myisam; CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = myisam; -CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = bdb; -CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = bdb; -CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = bdb; +CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = MEMORY; INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES (' '); INSERT INTO `ԣ` VALUES (' '); @@ -86,27 +82,6 @@ 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 ('ݏޏߏ'); -INSERT INTO `ԣ` VALUES (' ݏޏߏ'); -INSERT INTO `ԣ` VALUES (' ݏޏߏ'); -INSERT INTO `ԣ` VALUES (' ݏޏߏ'); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'); SELECT LTRIM(`ã`) from `ԣ`; LTRIM(`ã`) @@ -188,33 +163,6 @@ LTRIM(`ã`) ݏޏߏ ݏޏߏ ݏޏߏ -SELECT LTRIM(`ã`) from `ԣ`; -LTRIM(`ã`) - - - - - - - -SELECT LTRIM(`ã`) from `ԣ`; -LTRIM(`ã`) - - - - - - - -SELECT LTRIM(`ã`) from `ԣ`; -LTRIM(`ã`) -ݏޏߏ -ݏޏߏ -ݏޏߏ -ݏޏߏ -ݏޏߏ -ݏޏߏ -ݏޏߏ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -224,6 +172,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/r/jp_ltrim_ujis.result b/mysql-test/suite/jp/r/jp_ltrim_ujis.result index 1c95f28907f..f12444f284b 100644 --- a/mysql-test/suite/jp/r/jp_ltrim_ujis.result +++ b/mysql-test/suite/jp/r/jp_ltrim_ujis.result @@ -7,7 +7,6 @@ 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(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = innodb; @@ -16,12 +15,9 @@ CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engin CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = myisam; CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = myisam; CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = myisam; -CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = bdb; -CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = bdb; -CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = bdb; +CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = MEMORY; INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES (' '); INSERT INTO `ԣ` VALUES (' '); @@ -85,27 +81,6 @@ 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 ('ݏޏߏ'); -INSERT INTO `ԣ` VALUES (' ݏޏߏ'); -INSERT INTO `ԣ` VALUES (' ݏޏߏ'); -INSERT INTO `ԣ` VALUES (' ݏޏߏ'); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'); SELECT LTRIM(`ã`) from `ԣ`; LTRIM(`ã`) @@ -187,33 +162,6 @@ LTRIM(`ã`) ݏޏߏ ݏޏߏ ݏޏߏ -SELECT LTRIM(`ã`) from `ԣ`; -LTRIM(`ã`) - - - - - - - -SELECT LTRIM(`ã`) from `ԣ`; -LTRIM(`ã`) - - - - - - - -SELECT LTRIM(`ã`) from `ԣ`; -LTRIM(`ã`) -ݏޏߏ -ݏޏߏ -ݏޏߏ -ݏޏߏ -ݏޏߏ -ݏޏߏ -ݏޏߏ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -223,6 +171,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/r/jp_ltrim_utf8.result b/mysql-test/suite/jp/r/jp_ltrim_utf8.result index c6fae7233f1..9ca8d61b050 100644 --- a/mysql-test/suite/jp/r/jp_ltrim_utf8.result +++ b/mysql-test/suite/jp/r/jp_ltrim_utf8.result @@ -7,7 +7,6 @@ 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(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = innodb; @@ -16,12 +15,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 CREATE TABLE `Ｔ４` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam; CREATE TABLE `Ｔ５` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam; CREATE TABLE `Ｔ６` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam; -CREATE TABLE `Ｔ７` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ８` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ９` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ１０` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb; -CREATE TABLE `Ｔ１１` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb; -CREATE TABLE `Ｔ１２` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb; +CREATE TABLE `Ｔ７` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ８` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ９` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY; INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'); INSERT INTO `Ｔ１` VALUES (' ｱｲｳｴｵ'); INSERT INTO `Ｔ１` VALUES (' ｱｲｳｴｵ'); @@ -85,27 +81,6 @@ 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 ('龔龖龗龞龡'); -INSERT INTO `Ｔ１２` VALUES (' 龔龖龗龞龡'); -INSERT INTO `Ｔ１２` VALUES (' 龔龖龗龞龡'); -INSERT INTO `Ｔ１２` VALUES (' 龔龖龗龞龡'); -INSERT INTO `Ｔ１２` VALUES (' 龔龖龗龞龡'); -INSERT INTO `Ｔ１２` VALUES (' 龔龖龗龞龡'); -INSERT INTO `Ｔ１２` VALUES (' 龔龖龗龞龡'); SELECT LTRIM(`Ｃ１`) from `Ｔ１`; LTRIM(`Ｃ１`) ｱｲｳｴｵ @@ -187,33 +162,6 @@ LTRIM(`Ｃ１`) 龔龖龗龞龡 龔龖龗龞龡 龔龖龗龞龡 -SELECT LTRIM(`Ｃ１`) from `Ｔ１０`; -LTRIM(`Ｃ１`) -ｱｲｳｴｵ -ｱｲｳｴｵ -ｱｲｳｴｵ -ｱｲｳｴｵ - ｱｲｳｴｵ - ｱｲｳｴｵ - ｱｲｳｴｵ -SELECT LTRIM(`Ｃ１`) from `Ｔ１１`; -LTRIM(`Ｃ１`) -あいうえお -あいうえお -あいうえお -あいうえお - あいうえお - あいうえお - あいうえお -SELECT LTRIM(`Ｃ１`) from `Ｔ１２`; -LTRIM(`Ｃ１`) -龔龖龗龞龡 -龔龖龗龞龡 -龔龖龗龞龡 -龔龖龗龞龡 - 龔龖龗龞龡 - 龔龖龗龞龡 - 龔龖龗龞龡 DROP TABLE `Ｔ１`; DROP TABLE `Ｔ２`; DROP TABLE `Ｔ３`; @@ -223,6 +171,3 @@ DROP TABLE `Ｔ６`; DROP TABLE `Ｔ７`; DROP TABLE `Ｔ８`; DROP TABLE `Ｔ９`; -DROP TABLE `Ｔ１０`; -DROP TABLE `Ｔ１１`; -DROP TABLE `Ｔ１２`; diff --git a/mysql-test/suite/jp/r/jp_ps_sjis.result b/mysql-test/suite/jp/r/jp_ps_sjis.result index 2397bc78c5b..0990b30338c 100644 --- a/mysql-test/suite/jp/r/jp_ps_sjis.result +++ b/mysql-test/suite/jp/r/jp_ps_sjis.result @@ -446,14 +446,14 @@ DROP TABLE t1; DROP TABLE t2; DROP TABLE t3; DROP TABLE t4; -CREATE TABLE t1(c1 char(3)) DEFAULT CHARSET = sjis ENGINE = HEAP; -CREATE TABLE t2(c1 char(3)) DEFAULT CHARSET = sjis ENGINE = HEAP; +CREATE TABLE t1(c1 char(3)) DEFAULT CHARSET = sjis ENGINE = MEMORY; +CREATE TABLE t2(c1 char(3)) DEFAULT CHARSET = sjis ENGINE = MEMORY; CREATE TABLE t3( `` char(1), `` char(1), `\` char(1) -)DEFAULT CHARSET = sjis ENGINE = HEAP; -CREATE TABLE t4(c1 char(1)) DEFAULT CHARSET = sjis ENGINE =HEAP; +)DEFAULT CHARSET = sjis ENGINE = MEMORY; +CREATE TABLE t4(c1 char(1)) DEFAULT CHARSET = sjis ENGINE =MEMORY; INSERT INTO t1 VALUES ('xxx'); INSERT INTO t2 VALUES ('\'); INSERT INTO t3 VALUES ('x','x','x'),('x','x','x'),('y','y','y'),('y','y','y'),('z','z','z'),('z','z','z'); @@ -667,230 +667,3 @@ DROP TABLE t1; DROP TABLE t2; DROP TABLE t3; DROP TABLE t4; -CREATE TABLE t1(c1 char(3)) DEFAULT CHARSET = sjis ENGINE = BDB; -CREATE TABLE t2(c1 char(3)) DEFAULT CHARSET = sjis ENGINE = BDB; -CREATE TABLE t3( -`` char(1), -`` char(1), -`\` char(1) -)DEFAULT CHARSET = sjis ENGINE = BDB; -CREATE TABLE t4(c1 char(1)) DEFAULT CHARSET = sjis ENGINE = BDB; -INSERT INTO t1 VALUES ('xxx'); -INSERT INTO t2 VALUES ('\'); -INSERT INTO t3 VALUES ('x','x','x'),('x','x','x'),('y','y','y'),('y','y','y'),('z','z','z'),('z','z','z'); -INSERT INTO t4 VALUES (''),(''),('\' ); -PREPARE stmt1 FROM 'SELECT ? FROM t3'; -PREPARE stmt2 FROM 'SELECT * FROM t3 ORDER BY ?'; -PREPARE stmt3 FROM 'SELECT COUNT(*) FROM t3 GROUP BY ?'; -PREPARE stmt4 FROM 'SELECT CHAR_LENGTH(?)'; -PREPARE stmt5 FROM 'SELECT CHARSET(?)'; -PREPARE stmt6 FROM 'SELECT INSERT(c1,1,1,?) FROM t1'; -PREPARE stmt7 FROM 'SELECT INSTR(c1,?) FROM t2'; -PREPARE stmt8 FROM 'SELECT LOCATE(?,c1) FROM t2'; -PREPARE stmt9 FROM 'SELECT LPAD(c1,10,?) FROM t1'; -PREPARE stmt10 FROM 'SELECT REPLACE(c1,?,\'x\') FROM t2'; -PREPARE stmt11 FROM 'SELECT REPLACE(c1,\'x\',?) FROM t1'; -PREPARE stmt12 FROM 'SELECT RPAD(c1,10,?) FROM t1'; -PREPARE stmt13 FROM 'UPDATE t4 SET c1=\'x\' WHERE c1=?'; -PREPARE stmt14 FROM 'UPDATE t4 SET c1=? WHERE c1=\'x\''; -SET @arg = ''; -EXECUTE stmt1 USING @arg; -? - - - - - - -EXECUTE stmt2 USING @arg; - \ -x x x -x x x -y y y -y y y -z z z -z z z -EXECUTE stmt3 USING @arg; -COUNT(*) -6 -EXECUTE stmt4 USING @arg; -CHAR_LENGTH(?) -1 -EXECUTE stmt5 USING @arg; -CHARSET(?) -sjis -EXECUTE stmt6 USING @arg; -INSERT(c1,1,1,?) -xx -EXECUTE stmt7 USING @arg; -INSTR(c1,?) -1 -EXECUTE stmt8 USING @arg; -LOCATE(?,c1) -1 -EXECUTE stmt9 USING @arg; -LPAD(c1,10,?) -xxx -EXECUTE stmt10 USING @arg; -REPLACE(c1,?,'x') -x\ -EXECUTE stmt11 USING @arg; -REPLACE(c1,'x',?) - -EXECUTE stmt12 USING @arg; -RPAD(c1,10,?) -xxx -EXECUTE stmt13 USING @arg; -SELECT * FROM t3; - \ -x x x -x x x -y y y -y y y -z z z -z z z -EXECUTE stmt14 USING @arg; -SELECT * FROM t3; - \ -x x x -x x x -y y y -y y y -z z z -z z z -SET @arg = ''; -EXECUTE stmt1 USING @arg; -? - - - - - - -EXECUTE stmt2 USING @arg; - \ -x x x -x x x -y y y -y y y -z z z -z z z -EXECUTE stmt3 USING @arg; -COUNT(*) -6 -EXECUTE stmt4 USING @arg; -CHAR_LENGTH(?) -1 -EXECUTE stmt5 USING @arg; -CHARSET(?) -sjis -EXECUTE stmt6 USING @arg; -INSERT(c1,1,1,?) -xx -EXECUTE stmt7 USING @arg; -INSTR(c1,?) -2 -EXECUTE stmt8 USING @arg; -LOCATE(?,c1) -2 -EXECUTE stmt9 USING @arg; -LPAD(c1,10,?) -xxx -EXECUTE stmt10 USING @arg; -REPLACE(c1,?,'x') -x\ -EXECUTE stmt11 USING @arg; -REPLACE(c1,'x',?) - -EXECUTE stmt12 USING @arg; -RPAD(c1,10,?) -xxx -EXECUTE stmt13 USING @arg; -SELECT * FROM t4; -c1 - -x -\ -EXECUTE stmt14 USING @arg; -SELECT * FROM t4; -c1 - - -\ -SET @arg = '\'; -EXECUTE stmt1 USING @arg; -? -\ -\ -\ -\ -\ -\ -EXECUTE stmt2 USING @arg; - \ -x x x -x x x -y y y -y y y -z z z -z z z -EXECUTE stmt3 USING @arg; -COUNT(*) -6 -EXECUTE stmt4 USING @arg; -CHAR_LENGTH(?) -1 -EXECUTE stmt5 USING @arg; -CHARSET(?) -sjis -EXECUTE stmt6 USING @arg; -INSERT(c1,1,1,?) -\xx -EXECUTE stmt7 USING @arg; -INSTR(c1,?) -3 -EXECUTE stmt8 USING @arg; -LOCATE(?,c1) -3 -EXECUTE stmt9 USING @arg; -LPAD(c1,10,?) -\\\\\\\xxx -EXECUTE stmt10 USING @arg; -REPLACE(c1,?,'x') -x -EXECUTE stmt11 USING @arg; -REPLACE(c1,'x',?) -\\\ -EXECUTE stmt12 USING @arg; -RPAD(c1,10,?) -xxx\\\\\\\ -EXECUTE stmt13 USING @arg; -SELECT * FROM t4; -c1 - - -x -EXECUTE stmt14 USING @arg; -SELECT * FROM t4; -c1 - - -\ -DEALLOCATE PREPARE stmt1; -DEALLOCATE PREPARE stmt2; -DEALLOCATE PREPARE stmt3; -DEALLOCATE PREPARE stmt4; -DEALLOCATE PREPARE stmt5; -DEALLOCATE PREPARE stmt6; -DEALLOCATE PREPARE stmt7; -DEALLOCATE PREPARE stmt8; -DEALLOCATE PREPARE stmt9; -DEALLOCATE PREPARE stmt10; -DEALLOCATE PREPARE stmt11; -DEALLOCATE PREPARE stmt12; -DEALLOCATE PREPARE stmt13; -DEALLOCATE PREPARE stmt14; -DROP TABLE t1; -DROP TABLE t2; -DROP TABLE t3; -DROP TABLE t4; diff --git a/mysql-test/suite/jp/r/jp_ps_ujis.result b/mysql-test/suite/jp/r/jp_ps_ujis.result index 9afef7f76d1..d226b0ef03b 100644 --- a/mysql-test/suite/jp/r/jp_ps_ujis.result +++ b/mysql-test/suite/jp/r/jp_ps_ujis.result @@ -446,14 +446,14 @@ DROP TABLE t1; DROP TABLE t2; DROP TABLE t3; DROP TABLE t4; -CREATE TABLE t1(c1 char(3)) DEFAULT CHARSET = ujis ENGINE = HEAP; -CREATE TABLE t2(c1 char(3)) DEFAULT CHARSET = ujis ENGINE = HEAP; +CREATE TABLE t1(c1 char(3)) DEFAULT CHARSET = ujis ENGINE = MEMORY; +CREATE TABLE t2(c1 char(3)) DEFAULT CHARSET = ujis ENGINE = MEMORY; CREATE TABLE t3( `` char(1), `` char(1), `` char(1) -)DEFAULT CHARSET = ujis ENGINE = HEAP; -CREATE TABLE t4(c1 char(1)) DEFAULT CHARSET = ujis ENGINE =HEAP; +)DEFAULT CHARSET = ujis ENGINE = MEMORY; +CREATE TABLE t4(c1 char(1)) DEFAULT CHARSET = ujis ENGINE =MEMORY; INSERT INTO t1 VALUES ('xxx'); INSERT INTO t2 VALUES (''); INSERT INTO t3 VALUES ('x','x','x'),('x','x','x'),('y','y','y'),('y','y','y'),('z','z','z'),('z','z','z'); @@ -667,230 +667,3 @@ DROP TABLE t1; DROP TABLE t2; DROP TABLE t3; DROP TABLE t4; -CREATE TABLE t1(c1 char(3)) DEFAULT CHARSET = ujis ENGINE = BDB; -CREATE TABLE t2(c1 char(3)) DEFAULT CHARSET = ujis ENGINE = BDB; -CREATE TABLE t3( -`` char(1), -`` char(1), -`` char(1) -)DEFAULT CHARSET = ujis ENGINE = BDB; -CREATE TABLE t4(c1 char(1)) DEFAULT CHARSET = ujis ENGINE = BDB; -INSERT INTO t1 VALUES ('xxx'); -INSERT INTO t2 VALUES (''); -INSERT INTO t3 VALUES ('x','x','x'),('x','x','x'),('y','y','y'),('y','y','y'),('z','z','z'),('z','z','z'); -INSERT INTO t4 VALUES (''),(''),('' ); -PREPARE stmt1 FROM 'SELECT ? FROM t3'; -PREPARE stmt2 FROM 'SELECT * FROM t3 ORDER BY ?'; -PREPARE stmt3 FROM 'SELECT COUNT(*) FROM t3 GROUP BY ?'; -PREPARE stmt4 FROM 'SELECT CHAR_LENGTH(?)'; -PREPARE stmt5 FROM 'SELECT CHARSET(?)'; -PREPARE stmt6 FROM 'SELECT INSERT(c1,1,1,?) FROM t1'; -PREPARE stmt7 FROM 'SELECT INSTR(c1,?) FROM t2'; -PREPARE stmt8 FROM 'SELECT LOCATE(?,c1) FROM t2'; -PREPARE stmt9 FROM 'SELECT LPAD(c1,9,?) FROM t1'; -PREPARE stmt10 FROM 'SELECT REPLACE(c1,?,\'x\') FROM t2'; -PREPARE stmt11 FROM 'SELECT REPLACE(c1,\'x\',?) FROM t1'; -PREPARE stmt12 FROM 'SELECT RPAD(c1,9,?) FROM t1'; -PREPARE stmt13 FROM 'UPDATE t4 SET c1=\'x\' WHERE c1=?'; -PREPARE stmt14 FROM 'UPDATE t4 SET c1=? WHERE c1=\'x\''; -SET @arg = ''; -EXECUTE stmt1 USING @arg; -? - - - - - - -EXECUTE stmt2 USING @arg; - -x x x -x x x -y y y -y y y -z z z -z z z -EXECUTE stmt3 USING @arg; -COUNT(*) -6 -EXECUTE stmt4 USING @arg; -CHAR_LENGTH(?) -1 -EXECUTE stmt5 USING @arg; -CHARSET(?) -ujis -EXECUTE stmt6 USING @arg; -INSERT(c1,1,1,?) -xx -EXECUTE stmt7 USING @arg; -INSTR(c1,?) -1 -EXECUTE stmt8 USING @arg; -LOCATE(?,c1) -1 -EXECUTE stmt9 USING @arg; -LPAD(c1,9,?) -xxx -EXECUTE stmt10 USING @arg; -REPLACE(c1,?,'x') -x -EXECUTE stmt11 USING @arg; -REPLACE(c1,'x',?) - -EXECUTE stmt12 USING @arg; -RPAD(c1,9,?) -xxx -EXECUTE stmt13 USING @arg; -SELECT * FROM t3; - -x x x -x x x -y y y -y y y -z z z -z z z -EXECUTE stmt14 USING @arg; -SELECT * FROM t3; - -x x x -x x x -y y y -y y y -z z z -z z z -SET @arg = ''; -EXECUTE stmt1 USING @arg; -? - - - - - - -EXECUTE stmt2 USING @arg; - -x x x -x x x -y y y -y y y -z z z -z z z -EXECUTE stmt3 USING @arg; -COUNT(*) -6 -EXECUTE stmt4 USING @arg; -CHAR_LENGTH(?) -1 -EXECUTE stmt5 USING @arg; -CHARSET(?) -ujis -EXECUTE stmt6 USING @arg; -INSERT(c1,1,1,?) -xx -EXECUTE stmt7 USING @arg; -INSTR(c1,?) -2 -EXECUTE stmt8 USING @arg; -LOCATE(?,c1) -2 -EXECUTE stmt9 USING @arg; -LPAD(c1,9,?) -xxx -EXECUTE stmt10 USING @arg; -REPLACE(c1,?,'x') -x -EXECUTE stmt11 USING @arg; -REPLACE(c1,'x',?) - -EXECUTE stmt12 USING @arg; -RPAD(c1,9,?) -xxx -EXECUTE stmt13 USING @arg; -SELECT * FROM t4; -c1 - -x - -EXECUTE stmt14 USING @arg; -SELECT * FROM t4; -c1 - - - -SET @arg = ''; -EXECUTE stmt1 USING @arg; -? - - - - - - -EXECUTE stmt2 USING @arg; - -x x x -x x x -y y y -y y y -z z z -z z z -EXECUTE stmt3 USING @arg; -COUNT(*) -6 -EXECUTE stmt4 USING @arg; -CHAR_LENGTH(?) -1 -EXECUTE stmt5 USING @arg; -CHARSET(?) -ujis -EXECUTE stmt6 USING @arg; -INSERT(c1,1,1,?) -xx -EXECUTE stmt7 USING @arg; -INSTR(c1,?) -3 -EXECUTE stmt8 USING @arg; -LOCATE(?,c1) -3 -EXECUTE stmt9 USING @arg; -LPAD(c1,9,?) -xxx -EXECUTE stmt10 USING @arg; -REPLACE(c1,?,'x') -x -EXECUTE stmt11 USING @arg; -REPLACE(c1,'x',?) - -EXECUTE stmt12 USING @arg; -RPAD(c1,9,?) -xxx -EXECUTE stmt13 USING @arg; -SELECT * FROM t4; -c1 - - -x -EXECUTE stmt14 USING @arg; -SELECT * FROM t4; -c1 - - - -DEALLOCATE PREPARE stmt1; -DEALLOCATE PREPARE stmt2; -DEALLOCATE PREPARE stmt3; -DEALLOCATE PREPARE stmt4; -DEALLOCATE PREPARE stmt5; -DEALLOCATE PREPARE stmt6; -DEALLOCATE PREPARE stmt7; -DEALLOCATE PREPARE stmt8; -DEALLOCATE PREPARE stmt9; -DEALLOCATE PREPARE stmt10; -DEALLOCATE PREPARE stmt11; -DEALLOCATE PREPARE stmt12; -DEALLOCATE PREPARE stmt13; -DEALLOCATE PREPARE stmt14; -DROP TABLE t1; -DROP TABLE t2; -DROP TABLE t3; -DROP TABLE t4; diff --git a/mysql-test/suite/jp/r/jp_replace_sjis.result b/mysql-test/suite/jp/r/jp_replace_sjis.result index 08e45968fdd..b8daf59540c 100644 --- a/mysql-test/suite/jp/r/jp_replace_sjis.result +++ b/mysql-test/suite/jp/r/jp_replace_sjis.result @@ -7,9 +7,6 @@ drop table if exists `sU`; 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(5)) DEFAULT CHARSET = sjis engine = innodb; @@ -18,12 +15,9 @@ CREATE TABLE `sR` (`bP` char(5)) DEFAULT CHARSET = sjis engine = innodb; CREATE TABLE `sS` (`bP` char(5)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sT` (`bP` char(5)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sU` (`bP` char(5)) DEFAULT CHARSET = sjis engine = myisam; -CREATE TABLE `sV` (`bP` char(5)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sW` (`bP` char(5)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sX` (`bP` char(5)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPO` (`bP` char(5)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPP` (`bP` char(5)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPQ` (`bP` char(5)) DEFAULT CHARSET = sjis engine = bdb; +CREATE TABLE `sV` (`bP` char(5)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sW` (`bP` char(5)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sX` (`bP` char(5)) DEFAULT CHARSET = sjis engine = MEMORY; INSERT INTO `sP` VALUES (''); INSERT INTO `sQ` VALUES (''); INSERT INTO `sR` VALUES ('\\\\\'); @@ -33,9 +27,6 @@ INSERT INTO `sU` VALUES ('\\\\\'); INSERT INTO `sV` VALUES (''); INSERT INTO `sW` VALUES (''); INSERT INTO `sX` VALUES ('\\\\\'); -INSERT INTO `sPO` VALUES (''); -INSERT INTO `sPP` VALUES (''); -INSERT INTO `sPQ` VALUES ('\\\\\'); SELECT REPLACE(`bP`,'','') FROM `sP`; REPLACE(`bP`,'','') @@ -171,51 +162,6 @@ REPLACE(`bP`,'\','\\') SELECT REPLACE(`bP`,'\','\\') FROM `sX`; REPLACE(`bP`,'\','\\') \\\\\\ -SELECT REPLACE(`bP`,'','') FROM `sPO`; -REPLACE(`bP`,'','') - -SELECT REPLACE(`bP`,'','') FROM `sPO`; -REPLACE(`bP`,'','') - -SELECT REPLACE(`bP`,'','') FROM `sPO`; -REPLACE(`bP`,'','') - -SELECT REPLACE(`bP`,'','') FROM `sPO`; -REPLACE(`bP`,'','') - -SELECT REPLACE(`bP`,'','') FROM `sPO`; -REPLACE(`bP`,'','') - -SELECT REPLACE(`bP`,'','') FROM `sPP`; -REPLACE(`bP`,'','') - -SELECT REPLACE(`bP`,'','') FROM `sPP`; -REPLACE(`bP`,'','') - -SELECT REPLACE(`bP`,'','') FROM `sPP`; -REPLACE(`bP`,'','') - -SELECT REPLACE(`bP`,'','') FROM `sPP`; -REPLACE(`bP`,'','') - -SELECT REPLACE(`bP`,'','') FROM `sPP`; -REPLACE(`bP`,'','') - -SELECT REPLACE(`bP`,'\','\\') FROM `sPQ`; -REPLACE(`bP`,'\','\\') -\\\\\\ -SELECT REPLACE(`bP`,'\','\\') FROM `sPQ`; -REPLACE(`bP`,'\','\\') -\\\\\\ -SELECT REPLACE(`bP`,'\','\\') FROM `sPQ`; -REPLACE(`bP`,'\','\\') -\\\\\\ -SELECT REPLACE(`bP`,'\','\\') FROM `sPQ`; -REPLACE(`bP`,'\','\\') -\\\\\\ -SELECT REPLACE(`bP`,'\','\\') FROM `sPQ`; -REPLACE(`bP`,'\','\\') -\\\\\\ DROP TABLE `sP`; DROP TABLE `sQ`; DROP TABLE `sR`; @@ -225,6 +171,3 @@ DROP TABLE `sU`; DROP TABLE `sV`; DROP TABLE `sW`; DROP TABLE `sX`; -DROP TABLE `sPO`; -DROP TABLE `sPP`; -DROP TABLE `sPQ`; diff --git a/mysql-test/suite/jp/r/jp_replace_ucs2.result b/mysql-test/suite/jp/r/jp_replace_ucs2.result index 2911fe69b9a..2390e88d82f 100644 --- a/mysql-test/suite/jp/r/jp_replace_ucs2.result +++ b/mysql-test/suite/jp/r/jp_replace_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 `ԣ` (`ã` char(5)) DEFAULT CHARSET = ucs2 engine = innodb; CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ucs2 engine = myisam; CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ucs2 engine = myisam; CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ucs2 engine = myisam; -CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ucs2 engine = bdb; -CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ucs2 engine = bdb; -CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ucs2 engine = bdb; +CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ucs2 engine = MEMORY; INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES ('ݏޏߏ'); @@ -34,9 +28,6 @@ INSERT INTO `ԣ` VALUES ('ݏޏߏ'); INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES ('ݏޏߏ'); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'); SELECT REPLACE(`ã`,'','') FROM `ԣ`; REPLACE(`ã`,'','') @@ -172,51 +163,6 @@ REPLACE(`ã`,'','ߏ') SELECT REPLACE(`ã`,'','') FROM `ԣ`; REPLACE(`ã`,'','') ݏޏߏ -SELECT REPLACE(`ã`,'','') FROM `ԣ`; -REPLACE(`ã`,'','') - -SELECT REPLACE(`ã`,'','') FROM `ԣ`; -REPLACE(`ã`,'','') - -SELECT REPLACE(`ã`,'','') FROM `ԣ`; -REPLACE(`ã`,'','') - -SELECT REPLACE(`ã`,'','') FROM `ԣ`; -REPLACE(`ã`,'','') - -SELECT REPLACE(`ã`,'','') FROM `ԣ`; -REPLACE(`ã`,'','') - -SELECT REPLACE(`ã`,'','') FROM `ԣ`; -REPLACE(`ã`,'','') - -SELECT REPLACE(`ã`,'','') FROM `ԣ`; -REPLACE(`ã`,'','') - -SELECT REPLACE(`ã`,'','') FROM `ԣ`; -REPLACE(`ã`,'','') - -SELECT REPLACE(`ã`,'','') FROM `ԣ`; -REPLACE(`ã`,'','') - -SELECT REPLACE(`ã`,'','') FROM `ԣ`; -REPLACE(`ã`,'','') - -SELECT REPLACE(`ã`,'','') FROM `ԣ`; -REPLACE(`ã`,'','') -ݏޏߏ -SELECT REPLACE(`ã`,'','ݏ') FROM `ԣ`; -REPLACE(`ã`,'','ݏ') -ݏݏޏߏ -SELECT REPLACE(`ã`,'','ޏ') FROM `ԣ`; -REPLACE(`ã`,'','ޏ') -ݏޏޏߏ -SELECT REPLACE(`ã`,'','ߏ') FROM `ԣ`; -REPLACE(`ã`,'','ߏ') -ݏޏߏߏ -SELECT REPLACE(`ã`,'','') FROM `ԣ`; -REPLACE(`ã`,'','') -ݏޏߏ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -226,6 +172,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/r/jp_replace_ujis.result b/mysql-test/suite/jp/r/jp_replace_ujis.result index 7f776804ee9..b3ef6c28130 100644 --- a/mysql-test/suite/jp/r/jp_replace_ujis.result +++ b/mysql-test/suite/jp/r/jp_replace_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)) DEFAULT CHARSET = ujis engine = innodb; @@ -18,12 +15,9 @@ CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ujis engine = innodb; CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ujis engine = myisam; CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ujis engine = myisam; CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ujis engine = myisam; -CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ujis engine = bdb; -CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ujis engine = bdb; -CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ujis engine = bdb; +CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ujis 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 REPLACE(`ã`,'','') FROM `ԣ`; REPLACE(`ã`,'','') @@ -171,51 +162,6 @@ REPLACE(`ã`,'','ߏ') SELECT REPLACE(`ã`,'','') FROM `ԣ`; REPLACE(`ã`,'','') ݏޏߏ -SELECT REPLACE(`ã`,'','') FROM `ԣ`; -REPLACE(`ã`,'','') - -SELECT REPLACE(`ã`,'','') FROM `ԣ`; -REPLACE(`ã`,'','') - -SELECT REPLACE(`ã`,'','') FROM `ԣ`; -REPLACE(`ã`,'','') - -SELECT REPLACE(`ã`,'','') FROM `ԣ`; -REPLACE(`ã`,'','') - -SELECT REPLACE(`ã`,'','') FROM `ԣ`; -REPLACE(`ã`,'','') - -SELECT REPLACE(`ã`,'','') FROM `ԣ`; -REPLACE(`ã`,'','') - -SELECT REPLACE(`ã`,'','') FROM `ԣ`; -REPLACE(`ã`,'','') - -SELECT REPLACE(`ã`,'','') FROM `ԣ`; -REPLACE(`ã`,'','') - -SELECT REPLACE(`ã`,'','') FROM `ԣ`; -REPLACE(`ã`,'','') - -SELECT REPLACE(`ã`,'','') FROM `ԣ`; -REPLACE(`ã`,'','') - -SELECT REPLACE(`ã`,'','') FROM `ԣ`; -REPLACE(`ã`,'','') -ݏޏߏ -SELECT REPLACE(`ã`,'','ݏ') FROM `ԣ`; -REPLACE(`ã`,'','ݏ') -ݏݏޏߏ -SELECT REPLACE(`ã`,'','ޏ') FROM `ԣ`; -REPLACE(`ã`,'','ޏ') -ݏޏޏߏ -SELECT REPLACE(`ã`,'','ߏ') FROM `ԣ`; -REPLACE(`ã`,'','ߏ') -ݏޏߏߏ -SELECT REPLACE(`ã`,'','') FROM `ԣ`; -REPLACE(`ã`,'','') -ݏޏߏ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -225,6 +171,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/r/jp_replace_utf8.result b/mysql-test/suite/jp/r/jp_replace_utf8.result index 16981fcd0d8..734e1e3d6a9 100644 --- a/mysql-test/suite/jp/r/jp_replace_utf8.result +++ b/mysql-test/suite/jp/r/jp_replace_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)) DEFAULT CHARSET = utf8 engine = innodb; @@ -18,12 +15,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = innodb; CREATE TABLE `Ｔ４` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = myisam; CREATE TABLE `Ｔ５` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = myisam; CREATE TABLE `Ｔ６` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = myisam; -CREATE TABLE `Ｔ７` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ８` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ９` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ１０` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = bdb; -CREATE TABLE `Ｔ１１` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = bdb; -CREATE TABLE `Ｔ１２` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = bdb; +CREATE TABLE `Ｔ７` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ８` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ９` (`Ｃ１` char(5)) 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 REPLACE(`Ｃ１`,'ｱ','ｱｱ') FROM `Ｔ１`; REPLACE(`Ｃ１`,'ｱ','ｱｱ') ｱｱｲｳｴｵ @@ -171,51 +162,6 @@ REPLACE(`Ｃ１`,'龞','龞龞') SELECT REPLACE(`Ｃ１`,'龡','龡龡') FROM `Ｔ９`; REPLACE(`Ｃ１`,'龡','龡龡') 龔龖龗龞龡龡 -SELECT REPLACE(`Ｃ１`,'ｱ','ｱｱ') FROM `Ｔ１０`; -REPLACE(`Ｃ１`,'ｱ','ｱｱ') -ｱｱｲｳｴｵ -SELECT REPLACE(`Ｃ１`,'ｲ','ｲｲ') FROM `Ｔ１０`; -REPLACE(`Ｃ１`,'ｲ','ｲｲ') -ｱｲｲｳｴｵ -SELECT REPLACE(`Ｃ１`,'ｳ','ｳｳ') FROM `Ｔ１０`; -REPLACE(`Ｃ１`,'ｳ','ｳｳ') -ｱｲｳｳｴｵ -SELECT REPLACE(`Ｃ１`,'ｴ','ｴｴ') FROM `Ｔ１０`; -REPLACE(`Ｃ１`,'ｴ','ｴｴ') -ｱｲｳｴｴｵ -SELECT REPLACE(`Ｃ１`,'ｵ','ｵｵ') FROM `Ｔ１０`; -REPLACE(`Ｃ１`,'ｵ','ｵｵ') -ｱｲｳｴｵｵ -SELECT REPLACE(`Ｃ１`,'あ','ああ') FROM `Ｔ１１`; -REPLACE(`Ｃ１`,'あ','ああ') -ああいうえお -SELECT REPLACE(`Ｃ１`,'い','いい') FROM `Ｔ１１`; -REPLACE(`Ｃ１`,'い','いい') -あいいうえお -SELECT REPLACE(`Ｃ１`,'う','うう') FROM `Ｔ１１`; -REPLACE(`Ｃ１`,'う','うう') -あいううえお -SELECT REPLACE(`Ｃ１`,'え','ええ') FROM `Ｔ１１`; -REPLACE(`Ｃ１`,'え','ええ') -あいうええお -SELECT REPLACE(`Ｃ１`,'お','おお') FROM `Ｔ１１`; -REPLACE(`Ｃ１`,'お','おお') -あいうえおお -SELECT REPLACE(`Ｃ１`,'龔','龔龔') FROM `Ｔ１２`; -REPLACE(`Ｃ１`,'龔','龔龔') -龔龔龖龗龞龡 -SELECT REPLACE(`Ｃ１`,'龖','龖龖') FROM `Ｔ１２`; -REPLACE(`Ｃ１`,'龖','龖龖') -龔龖龖龗龞龡 -SELECT REPLACE(`Ｃ１`,'龗','龗龗') FROM `Ｔ１２`; -REPLACE(`Ｃ１`,'龗','龗龗') -龔龖龗龗龞龡 -SELECT REPLACE(`Ｃ１`,'龞','龞龞') FROM `Ｔ１２`; -REPLACE(`Ｃ１`,'龞','龞龞') -龔龖龗龞龞龡 -SELECT REPLACE(`Ｃ１`,'龡','龡龡') FROM `Ｔ１２`; -REPLACE(`Ｃ１`,'龡','龡龡') -龔龖龗龞龡龡 DROP TABLE `Ｔ１`; DROP TABLE `Ｔ２`; DROP TABLE `Ｔ３`; @@ -225,6 +171,3 @@ DROP TABLE `Ｔ６`; DROP TABLE `Ｔ７`; DROP TABLE `Ｔ８`; DROP TABLE `Ｔ９`; -DROP TABLE `Ｔ１０`; -DROP TABLE `Ｔ１１`; -DROP TABLE `Ｔ１２`; diff --git a/mysql-test/suite/jp/r/jp_reverse_sjis.result b/mysql-test/suite/jp/r/jp_reverse_sjis.result index 76cf9d6b571..95c8cb76217 100644 --- a/mysql-test/suite/jp/r/jp_reverse_sjis.result +++ b/mysql-test/suite/jp/r/jp_reverse_sjis.result @@ -7,9 +7,6 @@ drop table if exists `sU`; 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(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = innodb; @@ -18,12 +15,9 @@ CREATE TABLE `sR` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engin CREATE TABLE `sS` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sT` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sU` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; -CREATE TABLE `sV` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sW` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sX` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPO` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPP` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPQ` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; +CREATE TABLE `sV` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sW` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sX` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; INSERT INTO `sP` VALUES (''); INSERT INTO `sQ` VALUES (''); INSERT INTO `sR` VALUES ('\\\\\'); @@ -33,9 +27,6 @@ INSERT INTO `sU` VALUES ('\\\\\'); INSERT INTO `sV` VALUES (''); INSERT INTO `sW` VALUES (''); INSERT INTO `sX` VALUES ('\\\\\'); -INSERT INTO `sPO` VALUES (''); -INSERT INTO `sPP` VALUES (''); -INSERT INTO `sPQ` VALUES ('\\\\\'); SELECT REVERSE(`bP`) FROM `sP`; REVERSE(`bP`) @@ -63,15 +54,6 @@ REVERSE(`bP`) SELECT REVERSE(`bP`) FROM `sX`; REVERSE(`bP`) \\\\\ -SELECT REVERSE(`bP`) FROM `sPO`; -REVERSE(`bP`) - -SELECT REVERSE(`bP`) FROM `sPP`; -REVERSE(`bP`) - -SELECT REVERSE(`bP`) FROM `sPQ`; -REVERSE(`bP`) -\\\\\ DROP TABLE `sP`; DROP TABLE `sQ`; DROP TABLE `sR`; @@ -81,6 +63,3 @@ DROP TABLE `sU`; DROP TABLE `sV`; DROP TABLE `sW`; DROP TABLE `sX`; -DROP TABLE `sPO`; -DROP TABLE `sPP`; -DROP TABLE `sPQ`; diff --git a/mysql-test/suite/jp/r/jp_reverse_ucs2.result b/mysql-test/suite/jp/r/jp_reverse_ucs2.result index ad9782d5048..9da7f5d7b59 100644 --- a/mysql-test/suite/jp/r/jp_reverse_ucs2.result +++ b/mysql-test/suite/jp/r/jp_reverse_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 `ԣ` (`ã` char(5), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engin 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 `ԣ` VALUES ('ݏޏߏ'); INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES ('ݏޏߏ'); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'); SELECT REVERSE(`ã`) FROM `ԣ`; REVERSE(`ã`) @@ -64,15 +55,6 @@ REVERSE(`ã`) SELECT REVERSE(`ã`) FROM `ԣ`; REVERSE(`ã`) ߏޏݏ -SELECT REVERSE(`ã`) FROM `ԣ`; -REVERSE(`ã`) - -SELECT REVERSE(`ã`) FROM `ԣ`; -REVERSE(`ã`) - -SELECT REVERSE(`ã`) FROM `ԣ`; -REVERSE(`ã`) -ߏޏݏ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -82,6 +64,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/r/jp_reverse_ujis.result b/mysql-test/suite/jp/r/jp_reverse_ujis.result index 888f7f9e054..67ba5a10b00 100644 --- a/mysql-test/suite/jp/r/jp_reverse_ujis.result +++ b/mysql-test/suite/jp/r/jp_reverse_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 `ԣ` (`ã` char(5), INDEX(`ã`)) DEFAULT CHARSET = ujis engin 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 `ԣ` VALUES ('ݏޏߏ'); INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES ('ݏޏߏ'); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'); SELECT REVERSE(`ã`) FROM `ԣ`; REVERSE(`ã`) @@ -63,15 +54,6 @@ REVERSE(`ã`) SELECT REVERSE(`ã`) FROM `ԣ`; REVERSE(`ã`) ߏޏݏ -SELECT REVERSE(`ã`) FROM `ԣ`; -REVERSE(`ã`) - -SELECT REVERSE(`ã`) FROM `ԣ`; -REVERSE(`ã`) - -SELECT REVERSE(`ã`) FROM `ԣ`; -REVERSE(`ã`) -ߏޏݏ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -81,6 +63,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/r/jp_reverse_utf8.result b/mysql-test/suite/jp/r/jp_reverse_utf8.result index 4e02cf69645..8ff7afb7e71 100644 --- a/mysql-test/suite/jp/r/jp_reverse_utf8.result +++ b/mysql-test/suite/jp/r/jp_reverse_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 REVERSE(`Ｃ１`) FROM `Ｔ１`; REVERSE(`Ｃ１`) ｵｴｳｲｱ @@ -63,15 +54,6 @@ REVERSE(`Ｃ１`) SELECT REVERSE(`Ｃ１`) FROM `Ｔ９`; REVERSE(`Ｃ１`) 龡龞龗龖龔 -SELECT REVERSE(`Ｃ１`) FROM `Ｔ１０`; -REVERSE(`Ｃ１`) -ｵｴｳｲｱ -SELECT REVERSE(`Ｃ１`) FROM `Ｔ１１`; -REVERSE(`Ｃ１`) -おえういあ -SELECT REVERSE(`Ｃ１`) FROM `Ｔ１２`; -REVERSE(`Ｃ１`) -龡龞龗龖龔 DROP TABLE `Ｔ１`; DROP TABLE `Ｔ２`; DROP TABLE `Ｔ３`; @@ -81,6 +63,3 @@ DROP TABLE `Ｔ６`; DROP TABLE `Ｔ７`; DROP TABLE `Ｔ８`; DROP TABLE `Ｔ９`; -DROP TABLE `Ｔ１０`; -DROP TABLE `Ｔ１１`; -DROP TABLE `Ｔ１２`; diff --git a/mysql-test/suite/jp/r/jp_right_sjis.result b/mysql-test/suite/jp/r/jp_right_sjis.result index 249d7bbb0bc..332f8b077dd 100644 --- a/mysql-test/suite/jp/r/jp_right_sjis.result +++ b/mysql-test/suite/jp/r/jp_right_sjis.result @@ -7,9 +7,6 @@ drop table if exists `sU`; 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(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = innodb; @@ -18,12 +15,9 @@ CREATE TABLE `sR` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engin CREATE TABLE `sS` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sT` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sU` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; -CREATE TABLE `sV` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sW` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sX` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPO` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPP` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPQ` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; +CREATE TABLE `sV` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sW` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sX` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; INSERT INTO `sP` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `sQ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `sR` VALUES ('\\\\\'),('\\\\'),('\\\'),('\\'),('\'),(''); @@ -33,9 +27,6 @@ INSERT INTO `sU` VALUES ('\\\\\'),('\\\\'),('\\\'),('\\'),('\') INSERT INTO `sV` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `sW` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `sX` VALUES ('\\\\\'),('\\\\'),('\\\'),('\\'),('\'),(''); -INSERT INTO `sPO` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `sPP` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `sPQ` VALUES ('\\\\\'),('\\\\'),('\\\'),('\\'),('\'),(''); SELECT `bP`, RIGHT(`bP`,0) FROM `sP`; bP RIGHT(`bP`,0) @@ -468,150 +459,6 @@ SELECT `bP`, RIGHT(`bP`,5) FROM `sX`; \\ \\ \ \ -SELECT `bP`, RIGHT(`bP`,0) FROM `sPO`; -bP RIGHT(`bP`,0) - - - - - - -SELECT `bP`, RIGHT(`bP`,1) FROM `sPO`; -bP RIGHT(`bP`,1) - - - - - - -SELECT `bP`, RIGHT(`bP`,2) FROM `sPO`; -bP RIGHT(`bP`,2) - - - - - - -SELECT `bP`, RIGHT(`bP`,3) FROM `sPO`; -bP RIGHT(`bP`,3) - - - - - - -SELECT `bP`, RIGHT(`bP`,4) FROM `sPO`; -bP RIGHT(`bP`,4) - - - - - - -SELECT `bP`, RIGHT(`bP`,5) FROM `sPO`; -bP RIGHT(`bP`,5) - - - - - - -SELECT `bP`, RIGHT(`bP`,0) FROM `sPP`; -bP RIGHT(`bP`,0) - - - - - - -SELECT `bP`, RIGHT(`bP`,1) FROM `sPP`; -bP RIGHT(`bP`,1) - - - - - - -SELECT `bP`, RIGHT(`bP`,2) FROM `sPP`; -bP RIGHT(`bP`,2) - - - - - - -SELECT `bP`, RIGHT(`bP`,3) FROM `sPP`; -bP RIGHT(`bP`,3) - - - - - - -SELECT `bP`, RIGHT(`bP`,4) FROM `sPP`; -bP RIGHT(`bP`,4) - - - - - - -SELECT `bP`, RIGHT(`bP`,5) FROM `sPP`; -bP RIGHT(`bP`,5) - - - - - - -SELECT `bP`, RIGHT(`bP`,0) FROM `sPQ`; -bP RIGHT(`bP`,0) -\\\\\ -\\\\ -\\\ -\\ -\ - -SELECT `bP`, RIGHT(`bP`,1) FROM `sPQ`; -bP RIGHT(`bP`,1) -\\\\\ \ -\\\\ \ -\\\ \ -\\ \ -\ \ - -SELECT `bP`, RIGHT(`bP`,2) FROM `sPQ`; -bP RIGHT(`bP`,2) -\\\\\ \\ -\\\\ \\ -\\\ \\ -\\ \\ -\ \ - -SELECT `bP`, RIGHT(`bP`,3) FROM `sPQ`; -bP RIGHT(`bP`,3) -\\\\\ \\\ -\\\\ \\\ -\\\ \\\ -\\ \\ -\ \ - -SELECT `bP`, RIGHT(`bP`,4) FROM `sPQ`; -bP RIGHT(`bP`,4) -\\\\\ \\\\ -\\\\ \\\\ -\\\ \\\ -\\ \\ -\ \ - -SELECT `bP`, RIGHT(`bP`,5) FROM `sPQ`; -bP RIGHT(`bP`,5) -\\\\\ \\\\\ -\\\\ \\\\ -\\\ \\\ -\\ \\ -\ \ - DROP TABLE `sP`; DROP TABLE `sQ`; DROP TABLE `sR`; @@ -621,6 +468,3 @@ DROP TABLE `sU`; DROP TABLE `sV`; DROP TABLE `sW`; DROP TABLE `sX`; -DROP TABLE `sPO`; -DROP TABLE `sPP`; -DROP TABLE `sPQ`; diff --git a/mysql-test/suite/jp/r/jp_right_ucs2.result b/mysql-test/suite/jp/r/jp_right_ucs2.result index a8a3fba0f92..e2e594b9340 100644 --- a/mysql-test/suite/jp/r/jp_right_ucs2.result +++ b/mysql-test/suite/jp/r/jp_right_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 `ԣ` (`ã` char(5), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engin 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 `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(' INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(''),(''),(''); SELECT `ã`, RIGHT(`ã`,0) FROM `ԣ`; ã RIGHT(`ã`,0) @@ -469,150 +460,6 @@ SELECT `ã`, RIGHT(`ã`,5) FROM `ԣ`; -SELECT `ã`, RIGHT(`ã`,0) FROM `ԣ`; -ã RIGHT(`ã`,0) - - - - - - -SELECT `ã`, RIGHT(`ã`,1) FROM `ԣ`; -ã RIGHT(`ã`,1) - - - - - - -SELECT `ã`, RIGHT(`ã`,2) FROM `ԣ`; -ã RIGHT(`ã`,2) - - - - - - -SELECT `ã`, RIGHT(`ã`,3) FROM `ԣ`; -ã RIGHT(`ã`,3) - - - - - - -SELECT `ã`, RIGHT(`ã`,4) FROM `ԣ`; -ã RIGHT(`ã`,4) - - - - - - -SELECT `ã`, RIGHT(`ã`,5) FROM `ԣ`; -ã RIGHT(`ã`,5) - - - - - - -SELECT `ã`, RIGHT(`ã`,0) FROM `ԣ`; -ã RIGHT(`ã`,0) - - - - - - -SELECT `ã`, RIGHT(`ã`,1) FROM `ԣ`; -ã RIGHT(`ã`,1) - - - - - - -SELECT `ã`, RIGHT(`ã`,2) FROM `ԣ`; -ã RIGHT(`ã`,2) - - - - - - -SELECT `ã`, RIGHT(`ã`,3) FROM `ԣ`; -ã RIGHT(`ã`,3) - - - - - - -SELECT `ã`, RIGHT(`ã`,4) FROM `ԣ`; -ã RIGHT(`ã`,4) - - - - - - -SELECT `ã`, RIGHT(`ã`,5) FROM `ԣ`; -ã RIGHT(`ã`,5) - - - - - - -SELECT `ã`, RIGHT(`ã`,0) FROM `ԣ`; -ã RIGHT(`ã`,0) -ݏޏߏ -ݏޏ -ݏ - - - -SELECT `ã`, RIGHT(`ã`,1) FROM `ԣ`; -ã RIGHT(`ã`,1) -ݏޏߏ -ݏޏ -ݏ - - - -SELECT `ã`, RIGHT(`ã`,2) FROM `ԣ`; -ã RIGHT(`ã`,2) -ݏޏߏ ߏ -ݏޏ ޏ -ݏ ݏ - - - -SELECT `ã`, RIGHT(`ã`,3) FROM `ԣ`; -ã RIGHT(`ã`,3) -ݏޏߏ ޏߏ -ݏޏ ݏޏ -ݏ ݏ - - - -SELECT `ã`, RIGHT(`ã`,4) FROM `ԣ`; -ã RIGHT(`ã`,4) -ݏޏߏ ݏޏߏ -ݏޏ ݏޏ -ݏ ݏ - - - -SELECT `ã`, RIGHT(`ã`,5) FROM `ԣ`; -ã RIGHT(`ã`,5) -ݏޏߏ ݏޏߏ -ݏޏ ݏޏ -ݏ ݏ - - - DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -622,6 +469,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/r/jp_right_ujis.result b/mysql-test/suite/jp/r/jp_right_ujis.result index bb182853d95..d5d2cda036f 100644 --- a/mysql-test/suite/jp/r/jp_right_ujis.result +++ b/mysql-test/suite/jp/r/jp_right_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 `ԣ` (`ã` char(5), INDEX(`ã`)) DEFAULT CHARSET = ujis engin 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 `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(' INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(''),(''),(''); SELECT `ã`, RIGHT(`ã`,0) FROM `ԣ`; ã RIGHT(`ã`,0) @@ -468,150 +459,6 @@ SELECT `ã`, RIGHT(`ã`,5) FROM `ԣ`; -SELECT `ã`, RIGHT(`ã`,0) FROM `ԣ`; -ã RIGHT(`ã`,0) - - - - - - -SELECT `ã`, RIGHT(`ã`,1) FROM `ԣ`; -ã RIGHT(`ã`,1) - - - - - - -SELECT `ã`, RIGHT(`ã`,2) FROM `ԣ`; -ã RIGHT(`ã`,2) - - - - - - -SELECT `ã`, RIGHT(`ã`,3) FROM `ԣ`; -ã RIGHT(`ã`,3) - - - - - - -SELECT `ã`, RIGHT(`ã`,4) FROM `ԣ`; -ã RIGHT(`ã`,4) - - - - - - -SELECT `ã`, RIGHT(`ã`,5) FROM `ԣ`; -ã RIGHT(`ã`,5) - - - - - - -SELECT `ã`, RIGHT(`ã`,0) FROM `ԣ`; -ã RIGHT(`ã`,0) - - - - - - -SELECT `ã`, RIGHT(`ã`,1) FROM `ԣ`; -ã RIGHT(`ã`,1) - - - - - - -SELECT `ã`, RIGHT(`ã`,2) FROM `ԣ`; -ã RIGHT(`ã`,2) - - - - - - -SELECT `ã`, RIGHT(`ã`,3) FROM `ԣ`; -ã RIGHT(`ã`,3) - - - - - - -SELECT `ã`, RIGHT(`ã`,4) FROM `ԣ`; -ã RIGHT(`ã`,4) - - - - - - -SELECT `ã`, RIGHT(`ã`,5) FROM `ԣ`; -ã RIGHT(`ã`,5) - - - - - - -SELECT `ã`, RIGHT(`ã`,0) FROM `ԣ`; -ã RIGHT(`ã`,0) -ݏޏߏ -ݏޏ -ݏ - - - -SELECT `ã`, RIGHT(`ã`,1) FROM `ԣ`; -ã RIGHT(`ã`,1) -ݏޏߏ -ݏޏ -ݏ - - - -SELECT `ã`, RIGHT(`ã`,2) FROM `ԣ`; -ã RIGHT(`ã`,2) -ݏޏߏ ߏ -ݏޏ ޏ -ݏ ݏ - - - -SELECT `ã`, RIGHT(`ã`,3) FROM `ԣ`; -ã RIGHT(`ã`,3) -ݏޏߏ ޏߏ -ݏޏ ݏޏ -ݏ ݏ - - - -SELECT `ã`, RIGHT(`ã`,4) FROM `ԣ`; -ã RIGHT(`ã`,4) -ݏޏߏ ݏޏߏ -ݏޏ ݏޏ -ݏ ݏ - - - -SELECT `ã`, RIGHT(`ã`,5) FROM `ԣ`; -ã RIGHT(`ã`,5) -ݏޏߏ ݏޏߏ -ݏޏ ݏޏ -ݏ ݏ - - - DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -621,6 +468,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/r/jp_right_utf8.result b/mysql-test/suite/jp/r/jp_right_utf8.result index 50ba18ce3c4..e0b5c847956 100644 --- a/mysql-test/suite/jp/r/jp_right_utf8.result +++ b/mysql-test/suite/jp/r/jp_right_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 `Ｃ１`, RIGHT(`Ｃ１`,0) FROM `Ｔ１`; Ｃ１ RIGHT(`Ｃ１`,0) @@ -468,150 +459,6 @@ SELECT `Ｃ１`, RIGHT(`Ｃ１`,5) FROM `Ｔ９`; 龔龖 龔龖 龔 龔 -SELECT `Ｃ１`, RIGHT(`Ｃ１`,0) FROM `Ｔ１０`; -Ｃ１ RIGHT(`Ｃ１`,0) -ｱｲｳｴｵ -ｱｲｳｴ -ｱｲｳ -ｱｲ -ｱ - -SELECT `Ｃ１`, RIGHT(`Ｃ１`,1) FROM `Ｔ１０`; -Ｃ１ RIGHT(`Ｃ１`,1) -ｱｲｳｴｵ ｵ -ｱｲｳｴ ｴ -ｱｲｳ ｳ -ｱｲ ｲ -ｱ ｱ - -SELECT `Ｃ１`, RIGHT(`Ｃ１`,2) FROM `Ｔ１０`; -Ｃ１ RIGHT(`Ｃ１`,2) -ｱｲｳｴｵ ｴｵ -ｱｲｳｴ ｳｴ -ｱｲｳ ｲｳ -ｱｲ ｱｲ -ｱ ｱ - -SELECT `Ｃ１`, RIGHT(`Ｃ１`,3) FROM `Ｔ１０`; -Ｃ１ RIGHT(`Ｃ１`,3) -ｱｲｳｴｵ ｳｴｵ -ｱｲｳｴ ｲｳｴ -ｱｲｳ ｱｲｳ -ｱｲ ｱｲ -ｱ ｱ - -SELECT `Ｃ１`, RIGHT(`Ｃ１`,4) FROM `Ｔ１０`; -Ｃ１ RIGHT(`Ｃ１`,4) -ｱｲｳｴｵ ｲｳｴｵ -ｱｲｳｴ ｱｲｳｴ -ｱｲｳ ｱｲｳ -ｱｲ ｱｲ -ｱ ｱ - -SELECT `Ｃ１`, RIGHT(`Ｃ１`,5) FROM `Ｔ１０`; -Ｃ１ RIGHT(`Ｃ１`,5) -ｱｲｳｴｵ ｱｲｳｴｵ -ｱｲｳｴ ｱｲｳｴ -ｱｲｳ ｱｲｳ -ｱｲ ｱｲ -ｱ ｱ - -SELECT `Ｃ１`, RIGHT(`Ｃ１`,0) FROM `Ｔ１１`; -Ｃ１ RIGHT(`Ｃ１`,0) -あいうえお -あいうえ -あいう -あい -あ - -SELECT `Ｃ１`, RIGHT(`Ｃ１`,1) FROM `Ｔ１１`; -Ｃ１ RIGHT(`Ｃ１`,1) -あいうえお お -あいうえ え -あいう う -あい い -あ あ - -SELECT `Ｃ１`, RIGHT(`Ｃ１`,2) FROM `Ｔ１１`; -Ｃ１ RIGHT(`Ｃ１`,2) -あいうえお えお -あいうえ うえ -あいう いう -あい あい -あ あ - -SELECT `Ｃ１`, RIGHT(`Ｃ１`,3) FROM `Ｔ１１`; -Ｃ１ RIGHT(`Ｃ１`,3) -あいうえお うえお -あいうえ いうえ -あいう あいう -あい あい -あ あ - -SELECT `Ｃ１`, RIGHT(`Ｃ１`,4) FROM `Ｔ１１`; -Ｃ１ RIGHT(`Ｃ１`,4) -あいうえお いうえお -あいうえ あいうえ -あいう あいう -あい あい -あ あ - -SELECT `Ｃ１`, RIGHT(`Ｃ１`,5) FROM `Ｔ１１`; -Ｃ１ RIGHT(`Ｃ１`,5) -あいうえお あいうえお -あいうえ あいうえ -あいう あいう -あい あい -あ あ - -SELECT `Ｃ１`, RIGHT(`Ｃ１`,0) FROM `Ｔ１２`; -Ｃ１ RIGHT(`Ｃ１`,0) -龔龖龗龞龡 -龔龖龗龞 -龔龖龗 -龔龖 -龔 - -SELECT `Ｃ１`, RIGHT(`Ｃ１`,1) FROM `Ｔ１２`; -Ｃ１ RIGHT(`Ｃ１`,1) -龔龖龗龞龡 龡 -龔龖龗龞 龞 -龔龖龗 龗 -龔龖 龖 -龔 龔 - -SELECT `Ｃ１`, RIGHT(`Ｃ１`,2) FROM `Ｔ１２`; -Ｃ１ RIGHT(`Ｃ１`,2) -龔龖龗龞龡 龞龡 -龔龖龗龞 龗龞 -龔龖龗 龖龗 -龔龖 龔龖 -龔 龔 - -SELECT `Ｃ１`, RIGHT(`Ｃ１`,3) FROM `Ｔ１２`; -Ｃ１ RIGHT(`Ｃ１`,3) -龔龖龗龞龡 龗龞龡 -龔龖龗龞 龖龗龞 -龔龖龗 龔龖龗 -龔龖 龔龖 -龔 龔 - -SELECT `Ｃ１`, RIGHT(`Ｃ１`,4) FROM `Ｔ１２`; -Ｃ１ RIGHT(`Ｃ１`,4) -龔龖龗龞龡 龖龗龞龡 -龔龖龗龞 龔龖龗龞 -龔龖龗 龔龖龗 -龔龖 龔龖 -龔 龔 - -SELECT `Ｃ１`, RIGHT(`Ｃ１`,5) FROM `Ｔ１２`; -Ｃ１ RIGHT(`Ｃ１`,5) -龔龖龗龞龡 龔龖龗龞龡 -龔龖龗龞 龔龖龗龞 -龔龖龗 龔龖龗 -龔龖 龔龖 -龔 龔 - DROP TABLE `Ｔ１`; DROP TABLE `Ｔ２`; DROP TABLE `Ｔ３`; @@ -621,6 +468,3 @@ DROP TABLE `Ｔ６`; DROP TABLE `Ｔ７`; DROP TABLE `Ｔ８`; DROP TABLE `Ｔ９`; -DROP TABLE `Ｔ１０`; -DROP TABLE `Ｔ１１`; -DROP TABLE `Ｔ１２`; diff --git a/mysql-test/suite/jp/r/jp_rpad_sjis.result b/mysql-test/suite/jp/r/jp_rpad_sjis.result index 9c61c200672..906bbc4680d 100644 --- a/mysql-test/suite/jp/r/jp_rpad_sjis.result +++ b/mysql-test/suite/jp/r/jp_rpad_sjis.result @@ -7,9 +7,6 @@ drop table if exists `sU`; 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(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = innodb; @@ -18,12 +15,9 @@ CREATE TABLE `sR` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engin CREATE TABLE `sS` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sT` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sU` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; -CREATE TABLE `sV` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sW` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sX` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPO` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPP` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPQ` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; +CREATE TABLE `sV` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sW` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sX` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; INSERT INTO `sP` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `sQ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `sR` VALUES ('\\\\\'),('\\\\'),('\\\'),('\\'),('\'),(''); @@ -33,9 +27,6 @@ INSERT INTO `sU` VALUES ('\\\\\'),('\\\\'),('\\\'),('\\'),('\') INSERT INTO `sV` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `sW` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `sX` VALUES ('\\\\\'),('\\\\'),('\\\'),('\\'),('\'),(''); -INSERT INTO `sPO` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `sPP` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `sPQ` VALUES ('\\\\\'),('\\\\'),('\\\'),('\\'),('\'),(''); SELECT `bP`, RPAD(`bP`,5,'') FROM `sP`; bP RPAD(`bP`,5,'') @@ -108,30 +99,6 @@ SELECT `bP`, RPAD(`bP`,5,'\' ) FROM `sX`; \\ \\\\\ \ \\\\\ \\\\\ -SELECT `bP`, RPAD(`bP`,5,'') FROM `sPO`; -bP RPAD(`bP`,5,'') - - - - - - -SELECT `bP`, RPAD(`bP`,5,'w') FROM `sPP`; -bP RPAD(`bP`,5,'w') - - w - ww - www - wwww - wwwww -SELECT `bP`, RPAD(`bP`,5,'\' ) FROM `sPQ`; -bP RPAD(`bP`,5,'\' ) -\\\\\ \\\\\ -\\\\ \\\\\ -\\\ \\\\\ -\\ \\\\\ -\ \\\\\ - \\\\\ DROP TABLE `sP`; DROP TABLE `sQ`; DROP TABLE `sR`; @@ -141,6 +108,3 @@ DROP TABLE `sU`; DROP TABLE `sV`; DROP TABLE `sW`; DROP TABLE `sX`; -DROP TABLE `sPO`; -DROP TABLE `sPP`; -DROP TABLE `sPQ`; diff --git a/mysql-test/suite/jp/r/jp_rpad_ucs2.result b/mysql-test/suite/jp/r/jp_rpad_ucs2.result index b9df4cf6783..c3cbd1540ae 100644 --- a/mysql-test/suite/jp/r/jp_rpad_ucs2.result +++ b/mysql-test/suite/jp/r/jp_rpad_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 `ԣ` (`ã` char(5), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engin 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 `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(' INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(''),(''),(''); SELECT `ã`, RPAD(`ã`,5,'') FROM `ԣ`; ã RPAD(`ã`,5,'') @@ -109,30 +100,6 @@ SELECT `ã`, RPAD(`ã`,5,'' ) FROM `ԣ`; ݏ -SELECT `ã`, RPAD(`ã`,5,'') FROM `ԣ`; -ã RPAD(`ã`,5,'') - - - - - - -SELECT `ã`, RPAD(`ã`,5,'') FROM `ԣ`; -ã RPAD(`ã`,5,'') - - - أ - أأ - أأأ - أأأأ -SELECT `ã`, RPAD(`ã`,5,'' ) FROM `ԣ`; -ã RPAD(`ã`,5,'' ) -ݏޏߏ ݏޏߏ -ݏޏ ݏޏߏ -ݏ ݏޏ - ݏ - - DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -142,6 +109,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/r/jp_rpad_ujis.result b/mysql-test/suite/jp/r/jp_rpad_ujis.result index 3183b4f5fcd..38beef83591 100644 --- a/mysql-test/suite/jp/r/jp_rpad_ujis.result +++ b/mysql-test/suite/jp/r/jp_rpad_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 `ԣ` (`ã` char(5), INDEX(`ã`)) DEFAULT CHARSET = ujis engin 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 `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(' INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(''),(''),(''); SELECT `ã`, RPAD(`ã`,5,'') FROM `ԣ`; ã RPAD(`ã`,5,'') @@ -108,30 +99,6 @@ SELECT `ã`, RPAD(`ã`,5,'' ) FROM `ԣ`; ݏ -SELECT `ã`, RPAD(`ã`,5,'') FROM `ԣ`; -ã RPAD(`ã`,5,'') - - - - - - -SELECT `ã`, RPAD(`ã`,5,'') FROM `ԣ`; -ã RPAD(`ã`,5,'') - - - أ - أأ - أأأ - أأأأ -SELECT `ã`, RPAD(`ã`,5,'' ) FROM `ԣ`; -ã RPAD(`ã`,5,'' ) -ݏޏߏ ݏޏߏ -ݏޏ ݏޏߏ -ݏ ݏޏ - ݏ - - DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -141,6 +108,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/r/jp_rpad_utf8.result b/mysql-test/suite/jp/r/jp_rpad_utf8.result index c482a058bd8..c2d65a3c953 100644 --- a/mysql-test/suite/jp/r/jp_rpad_utf8.result +++ b/mysql-test/suite/jp/r/jp_rpad_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 `Ｃ１`, RPAD(`Ｃ１`,5,'｡') FROM `Ｔ１`; Ｃ１ RPAD(`Ｃ１`,5,'｡') ｡｡｡｡｡ @@ -108,30 +99,6 @@ SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'丄' ) FROM `Ｔ９`; 龔龖 龔龖丄丄丄 龔 龔丄丄丄丄 丄丄丄丄丄 -SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'｡') FROM `Ｔ１０`; -Ｃ１ RPAD(`Ｃ１`,5,'｡') -ｱｲｳｴｵ ｱｲｳｴｵ -ｱｲｳｴ ｱｲｳｴ｡ -ｱｲｳ ｱｲｳ｡｡ -ｱｲ ｱｲ｡｡｡ -ｱ ｱ｡｡｡｡ - ｡｡｡｡｡ -SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'Ｘ') FROM `Ｔ１１`; -Ｃ１ RPAD(`Ｃ１`,5,'Ｘ') -あいうえお あいうえお -あいうえ あいうえＸ -あいう あいうＸＸ -あい あいＸＸＸ -あ あＸＸＸＸ - ＸＸＸＸＸ -SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'丄' ) FROM `Ｔ１２`; -Ｃ１ RPAD(`Ｃ１`,5,'丄' ) -龔龖龗龞龡 龔龖龗龞龡 -龔龖龗龞 龔龖龗龞丄 -龔龖龗 龔龖龗丄丄 -龔龖 龔龖丄丄丄 -龔 龔丄丄丄丄 - 丄丄丄丄丄 DROP TABLE `Ｔ１`; DROP TABLE `Ｔ２`; DROP TABLE `Ｔ３`; @@ -141,6 +108,3 @@ DROP TABLE `Ｔ６`; DROP TABLE `Ｔ７`; DROP TABLE `Ｔ８`; DROP TABLE `Ｔ９`; -DROP TABLE `Ｔ１０`; -DROP TABLE `Ｔ１１`; -DROP TABLE `Ｔ１２`; diff --git a/mysql-test/suite/jp/r/jp_rtrim_sjis.result b/mysql-test/suite/jp/r/jp_rtrim_sjis.result index 01ab173c982..fc5b490abc9 100644 --- a/mysql-test/suite/jp/r/jp_rtrim_sjis.result +++ b/mysql-test/suite/jp/r/jp_rtrim_sjis.result @@ -7,7 +7,6 @@ drop table if exists `sU`; drop table if exists `sV`; drop table if exists `sW`; drop table if exists `sX`; -drop table if exists `sPO`; SET NAMES sjis; SET character_set_database = sjis; CREATE TABLE `sP` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = innodb; @@ -16,12 +15,9 @@ CREATE TABLE `sR` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engin CREATE TABLE `sS` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sT` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sU` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; -CREATE TABLE `sV` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sW` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sX` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPO` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPP` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPQ` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; +CREATE TABLE `sV` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sW` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sX` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; INSERT INTO `sP` VALUES (''); INSERT INTO `sP` VALUES (' '); INSERT INTO `sP` VALUES (' '); @@ -85,27 +81,6 @@ INSERT INTO `sX` VALUES ('\\\\\ '); INSERT INTO `sX` VALUES ('\\\\\@'); INSERT INTO `sX` VALUES ('\\\\\@@'); INSERT INTO `sX` VALUES ('\\\\\@@@'); -INSERT INTO `sPO` VALUES (''); -INSERT INTO `sPO` VALUES (' '); -INSERT INTO `sPO` VALUES (' '); -INSERT INTO `sPO` VALUES (' '); -INSERT INTO `sPO` VALUES ('@'); -INSERT INTO `sPO` VALUES ('@@'); -INSERT INTO `sPO` VALUES ('@@@'); -INSERT INTO `sPP` VALUES (''); -INSERT INTO `sPP` VALUES (' '); -INSERT INTO `sPP` VALUES (' '); -INSERT INTO `sPP` VALUES (' '); -INSERT INTO `sPP` VALUES ('@'); -INSERT INTO `sPP` VALUES ('@@'); -INSERT INTO `sPP` VALUES ('@@@'); -INSERT INTO `sPQ` VALUES ('\\\\\'); -INSERT INTO `sPQ` VALUES ('\\\\\ '); -INSERT INTO `sPQ` VALUES ('\\\\\ '); -INSERT INTO `sPQ` VALUES ('\\\\\ '); -INSERT INTO `sPQ` VALUES ('\\\\\@'); -INSERT INTO `sPQ` VALUES ('\\\\\@@'); -INSERT INTO `sPQ` VALUES ('\\\\\@@@'); SELECT RTRIM(`bP`) from `sP`; RTRIM(`bP`) @@ -187,33 +162,6 @@ RTRIM(`bP`) \\\\\@ \\\\\@@ \\\\\@@@ -SELECT RTRIM(`bP`) from `sPO`; -RTRIM(`bP`) - - - - -@ -@@ -@@@ -SELECT RTRIM(`bP`) from `sPP`; -RTRIM(`bP`) - - - - -@ -@@ -@@@ -SELECT RTRIM(`bP`) from `sPQ`; -RTRIM(`bP`) -\\\\\ -\\\\\ -\\\\\ -\\\\\ -\\\\\@ -\\\\\@@ -\\\\\@@@ DROP TABLE `sP`; DROP TABLE `sQ`; DROP TABLE `sR`; @@ -223,6 +171,3 @@ DROP TABLE `sU`; DROP TABLE `sV`; DROP TABLE `sW`; DROP TABLE `sX`; -DROP TABLE `sPO`; -DROP TABLE `sPP`; -DROP TABLE `sPQ`; diff --git a/mysql-test/suite/jp/r/jp_rtrim_ucs2.result b/mysql-test/suite/jp/r/jp_rtrim_ucs2.result index 905f5bef08f..417396350b5 100644 --- a/mysql-test/suite/jp/r/jp_rtrim_ucs2.result +++ b/mysql-test/suite/jp/r/jp_rtrim_ucs2.result @@ -7,7 +7,6 @@ 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; @@ -17,12 +16,9 @@ CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engin CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = myisam; CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = myisam; CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = myisam; -CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = bdb; -CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = bdb; -CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = bdb; +CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = MEMORY; INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES (' '); INSERT INTO `ԣ` VALUES (' '); @@ -86,27 +82,6 @@ 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 ('ݏޏߏ'); -INSERT INTO `ԣ` VALUES ('ݏޏߏ '); -INSERT INTO `ԣ` VALUES ('ݏޏߏ '); -INSERT INTO `ԣ` VALUES ('ݏޏߏ '); -INSERT INTO `ԣ` VALUES ('ݏޏߏࡡ'); -INSERT INTO `ԣ` VALUES ('ݏޏߏࡡ'); -INSERT INTO `ԣ` VALUES ('ݏޏߏࡡ'); SELECT RTRIM(`ã`) from `ԣ`; RTRIM(`ã`) @@ -188,33 +163,6 @@ RTRIM(`ã`) ݏޏߏࡡ ݏޏߏࡡ ݏޏߏࡡ -SELECT RTRIM(`ã`) from `ԣ`; -RTRIM(`ã`) - - - - - - - -SELECT RTRIM(`ã`) from `ԣ`; -RTRIM(`ã`) - - - - - - - -SELECT RTRIM(`ã`) from `ԣ`; -RTRIM(`ã`) -ݏޏߏ -ݏޏߏ -ݏޏߏ -ݏޏߏ -ݏޏߏࡡ -ݏޏߏࡡ -ݏޏߏࡡ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -224,6 +172,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/r/jp_rtrim_ujis.result b/mysql-test/suite/jp/r/jp_rtrim_ujis.result index 84b141c16dc..d922cab93ef 100644 --- a/mysql-test/suite/jp/r/jp_rtrim_ujis.result +++ b/mysql-test/suite/jp/r/jp_rtrim_ujis.result @@ -7,7 +7,6 @@ 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(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = innodb; @@ -16,12 +15,9 @@ CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engin CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = myisam; CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = myisam; CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = myisam; -CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = bdb; -CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = bdb; -CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = bdb; +CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = MEMORY; INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES (' '); INSERT INTO `ԣ` VALUES (' '); @@ -85,27 +81,6 @@ 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 ('ݏޏߏ'); -INSERT INTO `ԣ` VALUES ('ݏޏߏ '); -INSERT INTO `ԣ` VALUES ('ݏޏߏ '); -INSERT INTO `ԣ` VALUES ('ݏޏߏ '); -INSERT INTO `ԣ` VALUES ('ݏޏߏࡡ'); -INSERT INTO `ԣ` VALUES ('ݏޏߏࡡ'); -INSERT INTO `ԣ` VALUES ('ݏޏߏࡡ'); SELECT RTRIM(`ã`) from `ԣ`; RTRIM(`ã`) @@ -187,33 +162,6 @@ RTRIM(`ã`) ݏޏߏࡡ ݏޏߏࡡ ݏޏߏࡡ -SELECT RTRIM(`ã`) from `ԣ`; -RTRIM(`ã`) - - - - - - - -SELECT RTRIM(`ã`) from `ԣ`; -RTRIM(`ã`) - - - - - - - -SELECT RTRIM(`ã`) from `ԣ`; -RTRIM(`ã`) -ݏޏߏ -ݏޏߏ -ݏޏߏ -ݏޏߏ -ݏޏߏࡡ -ݏޏߏࡡ -ݏޏߏࡡ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -223,6 +171,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/r/jp_rtrim_utf8.result b/mysql-test/suite/jp/r/jp_rtrim_utf8.result index 09d719f3386..d793f895793 100644 --- a/mysql-test/suite/jp/r/jp_rtrim_utf8.result +++ b/mysql-test/suite/jp/r/jp_rtrim_utf8.result @@ -7,7 +7,6 @@ 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(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = innodb; @@ -16,12 +15,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 CREATE TABLE `Ｔ４` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam; CREATE TABLE `Ｔ５` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam; CREATE TABLE `Ｔ６` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam; -CREATE TABLE `Ｔ７` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ８` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ９` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ１０` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb; -CREATE TABLE `Ｔ１１` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb; -CREATE TABLE `Ｔ１２` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb; +CREATE TABLE `Ｔ７` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ８` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ９` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY; INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'); INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ '); INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ '); @@ -85,27 +81,6 @@ 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 ('龔龖龗龞龡'); -INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡 '); -INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡 '); -INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡 '); -INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡 '); -INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡 '); -INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡 '); SELECT RTRIM(`Ｃ１`) from `Ｔ１`; RTRIM(`Ｃ１`) ｱｲｳｴｵ @@ -187,33 +162,6 @@ RTRIM(`Ｃ１`) 龔龖龗龞龡 龔龖龗龞龡 龔龖龗龞龡 -SELECT RTRIM(`Ｃ１`) from `Ｔ１０`; -RTRIM(`Ｃ１`) -ｱｲｳｴｵ -ｱｲｳｴｵ -ｱｲｳｴｵ -ｱｲｳｴｵ -ｱｲｳｴｵ -ｱｲｳｴｵ -ｱｲｳｴｵ -SELECT RTRIM(`Ｃ１`) from `Ｔ１１`; -RTRIM(`Ｃ１`) -あいうえお -あいうえお -あいうえお -あいうえお -あいうえお -あいうえお -あいうえお -SELECT RTRIM(`Ｃ１`) from `Ｔ１２`; -RTRIM(`Ｃ１`) -龔龖龗龞龡 -龔龖龗龞龡 -龔龖龗龞龡 -龔龖龗龞龡 -龔龖龗龞龡 -龔龖龗龞龡 -龔龖龗龞龡 DROP TABLE `Ｔ１`; DROP TABLE `Ｔ２`; DROP TABLE `Ｔ３`; @@ -223,6 +171,3 @@ DROP TABLE `Ｔ６`; DROP TABLE `Ｔ７`; DROP TABLE `Ｔ８`; DROP TABLE `Ｔ９`; -DROP TABLE `Ｔ１０`; -DROP TABLE `Ｔ１１`; -DROP TABLE `Ｔ１２`; diff --git a/mysql-test/suite/jp/r/jp_select_sjis.result b/mysql-test/suite/jp/r/jp_select_sjis.result index d48d08d745f..38c1cf06448 100644 --- a/mysql-test/suite/jp/r/jp_select_sjis.result +++ b/mysql-test/suite/jp/r/jp_select_sjis.result @@ -7,9 +7,6 @@ drop table if exists `sU`; 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), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = innodb; @@ -18,12 +15,9 @@ CREATE TABLE `sR` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engi CREATE TABLE `sS` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sT` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sU` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; -CREATE TABLE `sV` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sW` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sX` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPO` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPP` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPQ` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; +CREATE TABLE `sV` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sW` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sX` (`bP` char(20), INDEX(`bP`)) 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 `sU`; 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 * FROM `sP`; bP !"#$%&'()*+,-./ @@ -285,89 +276,6 @@ SELECT * FROM `sW`; SELECT * FROM `sX`; bP \\\\\\\\\\\\\\\\\\\\ -SELECT * FROM `sPO`; -bP - !"#$%&'()*+,-./ -0123456789:;<=>? -@ABCDEFGHIJKLMNO -PQRSTUVWXYZ[\]^_ -abcdefghijklmno -pqrstuvwxyz{|}~ - - - - -SELECT * FROM `sPP`; -bP -@@ABCDEFGHIJKLMNOPQR -STUVWXYZ[\]^_`abcdef -ghijklmnopqrstuvwxyz -{]}~ -EEEEE -EEEEEE -EEEEEEEEEEEE -EEȁɁʁˁ́́EEEEEEEEEEE -ځہ܁݁ށ߁EEEEE -EEEEEEEEEE@ -EEEEEEEEEEEEEEEEOPQR -STUVWXEEEEEEE`abcdef -ghijklmnopqrstuvwxyE -EEEEE -EEEEEEEEE -E -ÂĂ -ƂǂȂɂʂ˂̂͂ςЂт҂ӂԂՂւׂ -ڂۂ܂݂ނ߂ -EEEEEEEEEEEEEEEE -E@ABCDEFGHIJKLMNOPQR -STUVWXYZ[\]^_`abcdef -ghijklmnopqrstuvwxyz -{|}~ -EEEEEEEEEEEEE -E -EEEEEEEEÃă -ƃǃȃɃʃ˃̃̓σЃу҃ӃԃՃցEEE -EEEEEEEEEEEEEEEEEEEE -EEEEEEEEEEEEEEEEEEEE -EEEEEEEEEEEEEEEEEEEE -E@ABCDEFGHIJKLMNOPQR -STUVWXYZ[\]^_`EEEEEE -EEEEEEEEEpqrstuvwxyz -{|}~ -EEEEEEEEEEEEEEEEEE -E -EEEEEEE -EEEEEEEEEEEEEEEEEEEE -EEEEEEEEEEEEEEEEEEEE -EEEEEEEEEEEEEEEEEEEE -E -ÈĈ -ƈLjȈɈʈˈ͈̈ΈψЈш҈ӈԈՈֈ؈ -ڈۈ܈݈ވ߈ -EEEEE -E@ABCDEFGHIJKLMNOPQR -STUVWXYZ[\]^_`abcdef -ghijklmnopqrEEEEEEEE -EEEEEEEEEEEEEEEEEEEE -EEEEEEEEEEEEEEEEEEEE -E -ØĘ -ƘǘȘɘʘ˘̘͘ΘϘИјҘӘԘ֘טؘ -ژۘܘݘޘߘ -EEEEE -E@ABCDEFGHIJKLMNOPQR -STUVWXYZ[\]^_`abcdef -ghijklmnopqrstuvwxyz -{|}~ -ꞁEEEEE -E꤁EEEEEEEEEEEEE -EEEEEEEEEEEEEEEEEEEE -EEEEEEEEEEEEEEEEEEEE -EEEEEEEEEEEEEEEEEEEE -EEEEEEEEEEEEEEEEEEEE -SELECT * FROM `sPQ`; -bP -\\\\\\\\\\\\\\\\\\\\ drop table `sP`; drop table `sQ`; drop table `sR`; @@ -377,6 +285,3 @@ drop table `sU`; drop table `sV`; drop table `sW`; drop table `sX`; -drop table `sPO`; -drop table `sPP`; -drop table `sPQ`; diff --git a/mysql-test/suite/jp/r/jp_select_ucs2.result b/mysql-test/suite/jp/r/jp_select_ucs2.result index 39d057ed107..a02cc2ead77 100644 --- a/mysql-test/suite/jp/r/jp_select_ucs2.result +++ b/mysql-test/suite/jp/r/jp_select_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; @@ -22,9 +19,6 @@ CREATE TABLE `ԣ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ucs2 engine = myi CREATE TABLE `ԣ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ucs2 engine = heap; CREATE TABLE `ԣ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ucs2 engine = heap; CREATE TABLE `ԣ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ucs2 engine = bdb; -CREATE TABLE `ԣ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ucs2 engine = bdb; -CREATE TABLE `ԣ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ucs2 engine = bdb; INSERT INTO `ԣ` VALUES ('PQRSTUVWXYZ[\\]^_') ,(' ') @@ -91,28 +85,6 @@ INSERT INTO `ԣ` VALUES ,('') ,('ÏďŏƏ') ,('ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ'); -INSERT INTO `ԣ` VALUES -('PQRSTUVWXYZ[\\]^_') -,(' ') -,('') -,('ÎĎŎƎǎȎɎʎˎ͎̎Ύ') -,('ЎюҎӎԎՎ֎؎َڎێݎގ'); -INSERT INTO `ԣ` VALUES -('¡áġšơ') -,('ȡɡʡˡ̡͡ΡϡСѡҡӡԡա֡סء١ڡ') -,('') -,('') -,('') -,('СТУФХЦЧШЩЪЫЬЭЮЯабвг') -,(''); -INSERT INTO `ԣ` VALUES -('Ïġ') -,('ÏďŏƏ') -,('ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ') -,('ݏޏߏᏰ⏰㏰䏰台揰珰菰鏰ꏰ돰쏰폰') -,('') -,('ÏďŏƏ') -,('ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ'); SELECT * FROM `ԣ`; c1 @@ -188,31 +160,6 @@ c1 ÏďŏƏ ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ -SELECT * FROM `ԣ`; -c1 -PQRSTUVWXYZ[\]^_ - - -ÎĎŎƎǎȎɎʎˎ͎̎Ύ -ЎюҎӎԎՎ֎؎َڎێݎގ -SELECT * FROM `ԣ`; -c1 -\¡áġšơ -ȡɡʡˡ̡͡ΡϡСѡҡӡԡա֡סء١ڡ - - - -СТУФХЦЧШЩЪЫЬЭЮЯабвг - -SELECT * FROM `ԣ`; -c1 -~Ïġ -ÏďŏƏ -ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ -ݏޏߏᏰ⏰㏰䏰台揰珰菰鏰ꏰ돰쏰폰 - -ÏďŏƏ -ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ drop table `ԣ`; drop table `ԣ`; drop table `ԣ`; @@ -222,6 +169,3 @@ drop table `ԣ`; drop table `ԣ`; drop table `ԣ`; drop table `ԣ`; -drop table `ԣ`; -drop table `ԣ`; -drop table `ԣ`; diff --git a/mysql-test/suite/jp/r/jp_select_ujis.result b/mysql-test/suite/jp/r/jp_select_ujis.result index 3eea73c8083..b8dbe2f6732 100644 --- a/mysql-test/suite/jp/r/jp_select_ujis.result +++ b/mysql-test/suite/jp/r/jp_select_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 `ԣ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = innodb; @@ -18,12 +15,9 @@ CREATE TABLE `ԣ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = inn CREATE TABLE `ԣ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = myisam; CREATE TABLE `ԣ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = myisam; CREATE TABLE `ԣ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = myisam; -CREATE TABLE `ԣ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = bdb; -CREATE TABLE `ԣ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = bdb; -CREATE TABLE `ԣ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = bdb; +CREATE TABLE `ԣ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣ` (c1 char(20), INDEX(c1)) 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 * FROM `ԣ`; c1 !"#$%&'()*+,-./ @@ -402,128 +393,6 @@ c1 ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ ݏޏߏ㡦 -SELECT * FROM `ԣ`; -c1 - !"#$%&'()*+,-./ -0123456789:;<=>? -@ABCDEFGHIJKLMNO -PQRSTUVWXYZ[\]^_ -abcdefghijklmno -pqrstuvwxyz{|}~ - - -ÎĎŎƎǎȎɎʎˎ͎̎Ύ -ЎюҎӎԎՎ֎؎َڎێݎގ -SELECT * FROM `ԣ`; -c1 - -¡áġšơ -ȡɡʡˡ̡͡ΡϡСѡҡӡԡա֡סء١ڡ -ܡޡߡ - - - -ʢˢ̢͢ϢС -ܢݢޢߢꡦ - - -£ãģţƣ -ȣɣʣˣ̣ͣΣϣУѣңӣԣգ֣ףأ٣ڡ - - - -¤äĤŤƤ -Ȥɤʤˤ̤ͤΤϤФѤҤӤԤդ֤פؤ٤ڤ -ܤݤޤߤ - - -¥åĥťƥ -ȥɥʥ˥̥ͥΥϥХѥҥӥԥե֥ץإ٥ڥ -ܥݥޥߥ - - -¦æĦŦƦ -Ȧɦʦ˦̦ͦΦϦЦѦҦӦԦզ֦צء - - - - - -ѧҧӧԧէ֧קا٧ڧ -ܧݧާߧ - - - - - - - -°ðİŰư -Ȱɰʰ˰̰ͰΰϰаѰҰӰհְװذٰڰ -ܰݰް߰ - -ϡϢϣϤϥϦϧϨϩϪϫϬϭϮϯϰϱϲϳ -ϴϵ϶ϷϸϹϺϻϼϽϾϿ -ӡ - - -СТУФХЦЧШЩЪЫЬЭЮЯабвг -дежзийклмноп - - - - - - - - - - - - - -SELECT * FROM `ԣ`; -c1 - -Ïġ - -돢쏢폢 - - - - -Ꮶ⏦㏦䏦塦硦鏦ꡦ졦 - - -ÏďŏƏ -ȏɏʏˏ̏͏Ρ - - - -ÏďŏƏ -ȏɏʏˏ̏͏ΏϏС - - - -ÏďŏƏ -ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ -ݏޏߏᏪ⏪㏪䏪只揪珪菪鏪ꏪ돪쏪폪 - - -áŏƏ -ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ -ݏޏߏᏫ⏫㏫䏫叫揫珫菫鏫ꏫ돫쏫폫 - - -ÏďŏƏ -ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ -ݏޏߏᏰ⏰㏰䏰台揰珰菰鏰ꏰ돰쏰폰 - - -ÏďŏƏ -ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ -ݏޏߏ㡦 - drop table `ԣ`; drop table `ԣ`; drop table `ԣ`; @@ -533,6 +402,3 @@ drop table `ԣ`; drop table `ԣ`; drop table `ԣ`; drop table `ԣ`; -drop table `ԣ`; -drop table `ԣ`; -drop table `ԣ`; diff --git a/mysql-test/suite/jp/r/jp_select_utf8.result b/mysql-test/suite/jp/r/jp_select_utf8.result index 43704ad2f6e..bc7b23cd51c 100644 --- a/mysql-test/suite/jp/r/jp_select_utf8.result +++ b/mysql-test/suite/jp/r/jp_select_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 `Ｔ１` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = innodb; @@ -18,12 +15,9 @@ CREATE TABLE `Ｔ３` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = i CREATE TABLE `Ｔ４` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = myisam; CREATE TABLE `Ｔ５` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = myisam; CREATE TABLE `Ｔ６` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = myisam; -CREATE TABLE `Ｔ７` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ８` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ９` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ１０` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = bdb; -CREATE TABLE `Ｔ１１` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = bdb; -CREATE TABLE `Ｔ１２` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = bdb; +CREATE TABLE `Ｔ７` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ８` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ９` (c1 char(20), INDEX(c1)) 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 * FROM `Ｔ１`; c1 !"#$%&'()*+,-./ @@ -402,128 +393,6 @@ c1 齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒 龔龖龗龞龡龢龣龥・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・ -SELECT * FROM `Ｔ１０`; -c1 - !"#$%&'()*+,-./ -0123456789:;<=>? -@ABCDEFGHIJKLMNO -PQRSTUVWXYZ[\]^_ -abcdefghijklmno -pqrstuvwxyz{|}~ - ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ -ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ -ﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏ -ﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ -SELECT * FROM `Ｔ１１`; -c1 - 、。，．・：；？！゛゜´｀¨＾￣＿ヽ -ヾゝゞ〃仝々〆〇ー―‐／＼〜‖｜…‥‘’ -“”（）〔〕［］｛｝〈〉《》「」『』【】 -＋‐±×÷＝≠＜＞≦≧∞∴♂♀°′″℃￥ -＄¢£％＃＆＊＠§☆★○●◎◇・・・・・ -・◆□■△▲▽▼※〒→←↑↓〓・・・・・ -・・・・・・∈∋⊆⊇⊂⊃∪∩・・・・・・ -・・∧∨¬⇒⇔∀∃・・・・・・・・・・・ -∠⊥⌒∂∇≡≒≪≫√∽∝∵∫∬・・・・・ -・・ʼn♯♭♪†‡¶・・・・◯・・・・ -・・・・・・・・・・・・・・・・０１２３ -４５６７８９・・・・・・・ＡＢＣＤＥＦＧ -ＨＩＪＫＬＭＮＯＰＱＲＳＴＵＶＷＸＹＺ・ -・・・・・ａｂｃｄｅｆｇｈｉｊｋｌｍｎｏ -ｐｑｒｓｔｕｖｗｘｙｚ・・・・・・・・・ -・ぁあぃいぅうぇえぉおかがきぎくぐけげこ -ごさざしじすずせぜそぞただちぢっつづてで -とどなにぬねのはばぱひびぴふぶぷへべぺほ -ぼぽまみむめもゃやゅゆょよらりるれろゎわ -ゐゑをん・・・・・・・・・・・・・・・・ -・ァアィイゥウェエォオカガキギクグケゲコ -ゴサザシジスズセゼソゾタダチヂッツヅテデ -トドナニヌネノハバパヒビピフブプヘベペホ -ボポマミムメモャヤュユョヨラリルレロヮワ -ヰヱヲンヴヵヶ・・・・・・・・・・・・・ -・ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤ -ΥΦΧΨΩ・・・・・・・・αβγδεζη -θικλμνξοπρστυφχψω・・・ -・・・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ -・АБВГДЕЁЖЗИЙКЛМНОПРС -ТУФХЦЧШЩЪЫЬЭЮЯ・・・・・・ -・・・・・・・・・абвгдеёжзий -клмнопрстуфхцчшщъыьэ -юя・・・・・・・・・・・・・・・・・・ -・─│┌┐┘└├┬┤┴┼━┃┏┓┛┗┣┳ -┫┻╋┠┯┨┷┿┝┰┥┸╂・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ -・亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵 -梓圧斡扱宛姐虻飴絢綾鮎或粟袷安庵按暗案闇 -鞍杏以伊位依偉囲夷委威尉惟意慰易椅為畏異 -移維緯胃萎衣謂違遺医井亥域育郁磯一壱溢逸 -稲茨芋鰯允印咽員因姻引飲淫胤蔭・・・・・ -・蓮連錬呂魯櫓炉賂路露労婁廊弄朗楼榔浪漏 -牢狼篭老聾蝋郎六麓禄肋録論倭和話歪賄脇惑 -枠鷲亙亘鰐詫藁蕨椀湾碗腕・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ -・弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞 -亟亠亢亰亳亶从仍仄仆仂仗仞仭仟价伉佚估佛 -佝佗佇佶侈侏侘佻佩佰侑佯來侖儘俔俟俎俘俛 -俑俚俐俤俥倚倨倔倪倥倅伜俶倡倩倬俾俯們倆 -偃假會偕偐偈做偖偬偸傀傚傅傴傲・・・・・ -・鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻 -鶸鶺鷆鷏鷂鷙鷓鷸鷦鷭鷯鷽鸚鸛鸞鹵鹹鹽麁麈 -麋麌麒麕麑麝麥麩麸麪麭靡黌黎黏黐黔黜點黝 -黠黥黨黯黴黶黷黹黻黼黽鼇鼈皷鼕鼡鼬鼾齊齒 -齔齣齟齠齡齦齧齬齪齷齲齶龕龜龠・・・・・ -・堯槇遙瑤凜熙・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ -SELECT * FROM `Ｔ１２`; -c1 -・・・・・・・・・・・・・・・˘ˇ¸˙˝ -・˛˚～΄΅・・・・・・・・¡¦¿・・・ -・・・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・ºª©®™ -¤№・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ -・・・・・ΆΈΉΊΪ・Ό・ΎΫ・Ώ・・・ -・άέήίϊΐόςύϋΰώ・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・ЂЃЄЅІЇ -ЈЉЊЋЌЎЏ・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ -・・ђѓєѕіїјљњћќўџ・・・・・ -・ÆĐ・Ħ・IJ・ŁĿ・ŊØŒ・ŦÞ・・・ -・・・・・・・・・・・・・æđðħıijĸ -łŀʼnŋøœßŧþ・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ -・ÁÀÄÂĂǍĀĄÅÃĆĈČÇĊĎÉÈË -ÊĚĖĒĘ・ĜĞĢĠĤÍÌÏÎǏİĪĮĨ -ĴĶĹĽĻŃŇŅÑÓÒÖÔǑŐŌÕŔŘŖ -ŚŜŠŞŤŢÚÙÜÛŬǓŰŪŲŮŨǗǛǙ -ǕŴÝŸŶŹŽŻ・・・・・・・・・・・・ -・áàäâăǎāąåãćĉčçċďéèë -êěėēęǵĝğ・ġĥíìïîǐ・īįĩ -ĵķĺľļńňņñóòöôǒőōõŕřŗ -śŝšşťţúùüûŭǔűūųůũǘǜǚ -ǖŵýÿŷźžż・・・・・・・・・・・・ -・丂丄丅丌丒丟丣两丨丫丮丯丰丵乀乁乄乇乑 -乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠 -仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众 -伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘 -佟佣佪佬佮佱佷佸佹佺佽佾侁侂侄・・・・・ -・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪 -鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖 -齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒 -龔龖龗龞龡龢龣龥・・・・・・・・・・・・ -・・・・・・・・・・・・・・・・・・・・ drop table `Ｔ１`; drop table `Ｔ２`; drop table `Ｔ３`; @@ -533,6 +402,3 @@ drop table `Ｔ６`; drop table `Ｔ７`; drop table `Ｔ８`; drop table `Ｔ９`; -drop table `Ｔ１０`; -drop table `Ｔ１１`; -drop table `Ｔ１２`; diff --git a/mysql-test/suite/jp/r/jp_subquery_sjis.result b/mysql-test/suite/jp/r/jp_subquery_sjis.result index b94de3630af..d1dd688e938 100644 --- a/mysql-test/suite/jp/r/jp_subquery_sjis.result +++ b/mysql-test/suite/jp/r/jp_subquery_sjis.result @@ -7,9 +7,6 @@ drop table if exists `sU`; 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 `sPa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = innodb; @@ -24,18 +21,12 @@ CREATE TABLE `sTa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine CREATE TABLE `sTb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sUa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sUb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = myisam; -CREATE TABLE `sVa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sVb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sWa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sWb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sXa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sXb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPOa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPOb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPPa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPPb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPQa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPQb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap; +CREATE TABLE `sVa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sVb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sWa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sWb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sXa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sXb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY; INSERT INTO `sPa` VALUES (''),(''),(''); INSERT INTO `sPb` VALUES (''); INSERT INTO `sQa` VALUES (''),(''),(''); @@ -54,12 +45,6 @@ INSERT INTO `sWa` VALUES (''),(''),(''); INSERT INTO `sWb` VALUES (''); INSERT INTO `sXa` VALUES ('\'),('\'),('\'); INSERT INTO `sXb` VALUES ('\'); -INSERT INTO `sPOa` VALUES (''),(''),(''); -INSERT INTO `sPOb` VALUES (''); -INSERT INTO `sPPa` VALUES (''),(''),(''); -INSERT INTO `sPPb` VALUES (''); -INSERT INTO `sPQa` VALUES ('\'),('\'),('\'); -INSERT INTO `sPQb` VALUES ('\'); SELECT `bP` FROM `sPa` WHERE `bP` IN (SELECT `bP` FROM `sPb`); bP @@ -150,36 +135,6 @@ SELECT `bP` FROM `sXa` WHERE NOT EXISTS (SELECT `bP` FROM `sXb` WHERE ` bP \ \ -SELECT `bP` FROM `sPOa` WHERE `bP` IN (SELECT `bP` FROM `sPOb`); -bP - -SELECT `bP` FROM `sPOa` WHERE EXISTS (SELECT `bP` FROM `sPOb` WHERE `sPOa`.`bP` = `sPOb`.`bP`); -bP - -SELECT `bP` FROM `sPOa` WHERE NOT EXISTS (SELECT `bP` FROM `sPOb` WHERE `sPOa`.`bP` = `sPOb`.`bP`); -bP - - -SELECT `bP` FROM `sPPa` WHERE `bP` IN (SELECT `bP` FROM `sPPb`); -bP - -SELECT `bP` FROM `sPPa` WHERE EXISTS (SELECT `bP` FROM `sPPb` WHERE `sPPa`.`bP` = `sPPb`.`bP`); -bP - -SELECT `bP` FROM `sPPa` WHERE NOT EXISTS (SELECT `bP` FROM `sPPb` WHERE `sPPa`.`bP` = `sPPb`.`bP`); -bP - - -SELECT `bP` FROM `sPQa` WHERE `bP` IN (SELECT `bP` FROM `sPQb`); -bP -\ -SELECT `bP` FROM `sPQa` WHERE EXISTS (SELECT `bP` FROM `sPQb` WHERE `sPQa`.`bP` = `sPQb`.`bP`); -bP -\ -SELECT `bP` FROM `sPQa` WHERE NOT EXISTS (SELECT `bP` FROM `sPQb` WHERE `sPQa`.`bP` = `sPQb`.`bP`); -bP -\ -\ DROP TABLE `sPa`; DROP TABLE `sPb`; DROP TABLE `sQa`; @@ -198,9 +153,3 @@ DROP TABLE `sWa`; DROP TABLE `sWb`; DROP TABLE `sXa`; DROP TABLE `sXb`; -DROP TABLE `sPOa`; -DROP TABLE `sPOb`; -DROP TABLE `sPPa`; -DROP TABLE `sPPb`; -DROP TABLE `sPQa`; -DROP TABLE `sPQb`; diff --git a/mysql-test/suite/jp/r/jp_subquery_ucs2.result b/mysql-test/suite/jp/r/jp_subquery_ucs2.result index 023100ecce3..1cafa1ae83b 100644 --- a/mysql-test/suite/jp/r/jp_subquery_ucs2.result +++ b/mysql-test/suite/jp/r/jp_subquery_ucs2.result @@ -1,15 +1,21 @@ -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 `ԣ`; -drop table if exists `ԣ`; -drop table if exists `ԣ`; -drop table if exists `ԣ`; -drop table if exists `ԣ`; -drop table if exists `ԣ`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; SET NAMES ujis; SET character_set_database = ucs2; SET collation_connection = ucs2_general_ci; @@ -25,18 +31,12 @@ CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = myisam; CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = myisam; CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = myisam; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = heap; +CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY; INSERT INTO `ԣa` VALUES (''),(''),(''); INSERT INTO `ԣb` VALUES (''); INSERT INTO `ԣa` VALUES (''),(''),(''); @@ -55,12 +55,6 @@ INSERT INTO `ԣa` VALUES (''),(''),(''); INSERT INTO `ԣb` VALUES (''); INSERT INTO `ԣa` VALUES (''),(''),(''); INSERT INTO `ԣb` VALUES (''); -INSERT INTO `ԣa` VALUES (''),(''),(''); -INSERT INTO `ԣb` VALUES (''); -INSERT INTO `ԣa` VALUES (''),(''),(''); -INSERT INTO `ԣb` VALUES (''); -INSERT INTO `ԣa` VALUES (''),(''),(''); -INSERT INTO `ԣb` VALUES (''); SELECT `ã` FROM `ԣa` WHERE `ã` IN (SELECT `ã` FROM `ԣb`); ã @@ -151,36 +145,6 @@ SELECT `ã` FROM `ԣa` WHERE NOT EXISTS (SELECT `ã` FROM `ԣb` WHERE ` ã -SELECT `ã` FROM `ԣa` WHERE `ã` IN (SELECT `ã` FROM `ԣb`); -ã - -SELECT `ã` FROM `ԣa` WHERE EXISTS (SELECT `ã` FROM `ԣb` WHERE `ԣa`.`ã` = `ԣb`.`ã`); -ã - -SELECT `ã` FROM `ԣa` WHERE NOT EXISTS (SELECT `ã` FROM `ԣb` WHERE `ԣa`.`ã` = `ԣb`.`ã`); -ã - - -SELECT `ã` FROM `ԣa` WHERE `ã` IN (SELECT `ã` FROM `ԣb`); -ã - -SELECT `ã` FROM `ԣa` WHERE EXISTS (SELECT `ã` FROM `ԣb` WHERE `ԣa`.`ã` = `ԣb`.`ã`); -ã - -SELECT `ã` FROM `ԣa` WHERE NOT EXISTS (SELECT `ã` FROM `ԣb` WHERE `ԣa`.`ã` = `ԣb`.`ã`); -ã - - -SELECT `ã` FROM `ԣa` WHERE `ã` IN (SELECT `ã` FROM `ԣb`); -ã - -SELECT `ã` FROM `ԣa` WHERE EXISTS (SELECT `ã` FROM `ԣb` WHERE `ԣa`.`ã` = `ԣb`.`ã`); -ã - -SELECT `ã` FROM `ԣa` WHERE NOT EXISTS (SELECT `ã` FROM `ԣb` WHERE `ԣa`.`ã` = `ԣb`.`ã`); -ã - - DROP TABLE `ԣa`; DROP TABLE `ԣb`; DROP TABLE `ԣa`; @@ -199,9 +163,3 @@ DROP TABLE `ԣa`; DROP TABLE `ԣb`; DROP TABLE `ԣa`; DROP TABLE `ԣb`; -DROP TABLE `ԣa`; -DROP TABLE `ԣb`; -DROP TABLE `ԣa`; -DROP TABLE `ԣb`; -DROP TABLE `ԣa`; -DROP TABLE `ԣb`; diff --git a/mysql-test/suite/jp/r/jp_subquery_ujis.result b/mysql-test/suite/jp/r/jp_subquery_ujis.result index 0b6aa03970f..530f7e1ad9f 100644 --- a/mysql-test/suite/jp/r/jp_subquery_ujis.result +++ b/mysql-test/suite/jp/r/jp_subquery_ujis.result @@ -1,15 +1,21 @@ -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 `ԣ`; -drop table if exists `ԣ`; -drop table if exists `ԣ`; -drop table if exists `ԣ`; -drop table if exists `ԣ`; -drop table if exists `ԣ`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; SET NAMES ujis; SET character_set_database = ujis; CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb; @@ -24,18 +30,12 @@ CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = myisam; CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = myisam; CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = myisam; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap; +CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = MEMORY; INSERT INTO `ԣa` VALUES (''),(''),(''); INSERT INTO `ԣb` VALUES (''); INSERT INTO `ԣa` VALUES (''),(''),(''); @@ -54,12 +54,6 @@ INSERT INTO `ԣa` VALUES (''),(''),(''); INSERT INTO `ԣb` VALUES (''); INSERT INTO `ԣa` VALUES (''),(''),(''); INSERT INTO `ԣb` VALUES (''); -INSERT INTO `ԣa` VALUES (''),(''),(''); -INSERT INTO `ԣb` VALUES (''); -INSERT INTO `ԣa` VALUES (''),(''),(''); -INSERT INTO `ԣb` VALUES (''); -INSERT INTO `ԣa` VALUES (''),(''),(''); -INSERT INTO `ԣb` VALUES (''); SELECT `ã` FROM `ԣa` WHERE `ã` IN (SELECT `ã` FROM `ԣb`); ã @@ -150,36 +144,6 @@ SELECT `ã` FROM `ԣa` WHERE NOT EXISTS (SELECT `ã` FROM `ԣb` WHERE ` ã -SELECT `ã` FROM `ԣa` WHERE `ã` IN (SELECT `ã` FROM `ԣb`); -ã - -SELECT `ã` FROM `ԣa` WHERE EXISTS (SELECT `ã` FROM `ԣb` WHERE `ԣa`.`ã` = `ԣb`.`ã`); -ã - -SELECT `ã` FROM `ԣa` WHERE NOT EXISTS (SELECT `ã` FROM `ԣb` WHERE `ԣa`.`ã` = `ԣb`.`ã`); -ã - - -SELECT `ã` FROM `ԣa` WHERE `ã` IN (SELECT `ã` FROM `ԣb`); -ã - -SELECT `ã` FROM `ԣa` WHERE EXISTS (SELECT `ã` FROM `ԣb` WHERE `ԣa`.`ã` = `ԣb`.`ã`); -ã - -SELECT `ã` FROM `ԣa` WHERE NOT EXISTS (SELECT `ã` FROM `ԣb` WHERE `ԣa`.`ã` = `ԣb`.`ã`); -ã - - -SELECT `ã` FROM `ԣa` WHERE `ã` IN (SELECT `ã` FROM `ԣb`); -ã - -SELECT `ã` FROM `ԣa` WHERE EXISTS (SELECT `ã` FROM `ԣb` WHERE `ԣa`.`ã` = `ԣb`.`ã`); -ã - -SELECT `ã` FROM `ԣa` WHERE NOT EXISTS (SELECT `ã` FROM `ԣb` WHERE `ԣa`.`ã` = `ԣb`.`ã`); -ã - - DROP TABLE `ԣa`; DROP TABLE `ԣb`; DROP TABLE `ԣa`; @@ -198,9 +162,3 @@ DROP TABLE `ԣa`; DROP TABLE `ԣb`; DROP TABLE `ԣa`; DROP TABLE `ԣb`; -DROP TABLE `ԣa`; -DROP TABLE `ԣb`; -DROP TABLE `ԣa`; -DROP TABLE `ԣb`; -DROP TABLE `ԣa`; -DROP TABLE `ԣb`; diff --git a/mysql-test/suite/jp/r/jp_subquery_utf8.result b/mysql-test/suite/jp/r/jp_subquery_utf8.result index ce56e660a65..d82cfbaca9d 100644 --- a/mysql-test/suite/jp/r/jp_subquery_utf8.result +++ b/mysql-test/suite/jp/r/jp_subquery_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 `Ｔ１a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb; @@ -24,18 +21,12 @@ CREATE TABLE `Ｔ５a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 eng CREATE TABLE `Ｔ５b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = myisam; CREATE TABLE `Ｔ６a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = myisam; CREATE TABLE `Ｔ６b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = myisam; -CREATE TABLE `Ｔ７a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ７b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ８a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ８b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ９a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ９b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ１０a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ１０b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ１１a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ１１b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ１２a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ１２b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap; +CREATE TABLE `Ｔ７a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ７b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ８a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ８b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ９a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ９b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MEMORY; INSERT INTO `Ｔ１a` VALUES ('ｱ'),('ｶ'),('ｻ'); INSERT INTO `Ｔ１b` VALUES ('ｱ'); INSERT INTO `Ｔ２a` VALUES ('あ'),('か'),('さ'); @@ -54,12 +45,6 @@ INSERT INTO `Ｔ８a` VALUES ('あ'),('か'),('さ'); INSERT INTO `Ｔ８b` VALUES ('あ'); INSERT INTO `Ｔ９a` VALUES ('龔'),('龖'),('龗'); INSERT INTO `Ｔ９b` VALUES ('龔'); -INSERT INTO `Ｔ１０a` VALUES ('ｱ'),('ｶ'),('ｻ'); -INSERT INTO `Ｔ１０b` VALUES ('ｱ'); -INSERT INTO `Ｔ１１a` VALUES ('あ'),('か'),('さ'); -INSERT INTO `Ｔ１１b` VALUES ('あ'); -INSERT INTO `Ｔ１２a` VALUES ('龔'),('龖'),('龗'); -INSERT INTO `Ｔ１２b` VALUES ('龔'); SELECT `Ｃ１` FROM `Ｔ１a` WHERE `Ｃ１` IN (SELECT `Ｃ１` FROM `Ｔ１b`); Ｃ１ ｱ @@ -150,36 +135,6 @@ SELECT `Ｃ１` FROM `Ｔ９a` WHERE NOT EXISTS (SELECT `Ｃ１` FROM `Ｔ９b` Ｃ１ 龖 龗 -SELECT `Ｃ１` FROM `Ｔ１０a` WHERE `Ｃ１` IN (SELECT `Ｃ１` FROM `Ｔ１０b`); -Ｃ１ -ｱ -SELECT `Ｃ１` FROM `Ｔ１０a` WHERE EXISTS (SELECT `Ｃ１` FROM `Ｔ１０b` WHERE `Ｔ１０a`.`Ｃ１` = `Ｔ１０b`.`Ｃ１`); -Ｃ１ -ｱ -SELECT `Ｃ１` FROM `Ｔ１０a` WHERE NOT EXISTS (SELECT `Ｃ１` FROM `Ｔ１０b` WHERE `Ｔ１０a`.`Ｃ１` = `Ｔ１０b`.`Ｃ１`); -Ｃ１ -ｶ -ｻ -SELECT `Ｃ１` FROM `Ｔ１１a` WHERE `Ｃ１` IN (SELECT `Ｃ１` FROM `Ｔ１１b`); -Ｃ１ -あ -SELECT `Ｃ１` FROM `Ｔ１１a` WHERE EXISTS (SELECT `Ｃ１` FROM `Ｔ１１b` WHERE `Ｔ１１a`.`Ｃ１` = `Ｔ１１b`.`Ｃ１`); -Ｃ１ -あ -SELECT `Ｃ１` FROM `Ｔ１１a` WHERE NOT EXISTS (SELECT `Ｃ１` FROM `Ｔ１１b` WHERE `Ｔ１１a`.`Ｃ１` = `Ｔ１１b`.`Ｃ１`); -Ｃ１ -か -さ -SELECT `Ｃ１` FROM `Ｔ１２a` WHERE `Ｃ１` IN (SELECT `Ｃ１` FROM `Ｔ１２b`); -Ｃ１ -龔 -SELECT `Ｃ１` FROM `Ｔ１２a` WHERE EXISTS (SELECT `Ｃ１` FROM `Ｔ１２b` WHERE `Ｔ１２a`.`Ｃ１` = `Ｔ１２b`.`Ｃ１`); -Ｃ１ -龔 -SELECT `Ｃ１` FROM `Ｔ１２a` WHERE NOT EXISTS (SELECT `Ｃ１` FROM `Ｔ１２b` WHERE `Ｔ１２a`.`Ｃ１` = `Ｔ１２b`.`Ｃ１`); -Ｃ１ -龖 -龗 DROP TABLE `Ｔ１a`; DROP TABLE `Ｔ１b`; DROP TABLE `Ｔ２a`; @@ -198,9 +153,3 @@ DROP TABLE `Ｔ８a`; DROP TABLE `Ｔ８b`; DROP TABLE `Ｔ９a`; DROP TABLE `Ｔ９b`; -DROP TABLE `Ｔ１０a`; -DROP TABLE `Ｔ１０b`; -DROP TABLE `Ｔ１１a`; -DROP TABLE `Ｔ１１b`; -DROP TABLE `Ｔ１２a`; -DROP TABLE `Ｔ１２b`; diff --git a/mysql-test/suite/jp/r/jp_substring_sjis.result b/mysql-test/suite/jp/r/jp_substring_sjis.result index 3fe5bf44b86..a8e98cc62f5 100644 --- a/mysql-test/suite/jp/r/jp_substring_sjis.result +++ b/mysql-test/suite/jp/r/jp_substring_sjis.result @@ -7,9 +7,6 @@ drop table if exists `sU`; 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(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = innodb; @@ -18,12 +15,9 @@ CREATE TABLE `sR` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engin CREATE TABLE `sS` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sT` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sU` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; -CREATE TABLE `sV` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sW` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sX` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPO` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPP` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPQ` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; +CREATE TABLE `sV` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sW` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sX` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; INSERT INTO `sP` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `sQ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `sR` VALUES ('\\\\\'),('\\\\'),('\\\'),('\\'),('\'),(''); @@ -33,9 +27,6 @@ INSERT INTO `sU` VALUES ('\\\\\'),('\\\\'),('\\\'),('\\'),('\') INSERT INTO `sV` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `sW` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `sX` VALUES ('\\\\\'),('\\\\'),('\\\'),('\\'),('\'),(''); -INSERT INTO `sPO` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `sPP` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `sPQ` VALUES ('\\\\\'),('\\\\'),('\\\'),('\\'),('\'),(''); SELECT `bP`, SUBSTRING(`bP`,0) FROM `sP`; bP SUBSTRING(`bP`,0) @@ -2052,678 +2043,6 @@ SELECT `bP`, SUBSTRING(`bP` FROM 1 FOR 6) FROM `sX`; \\ \\ \ \ -SELECT `bP`, SUBSTRING(`bP`,0) FROM `sPO`; -bP SUBSTRING(`bP`,0) - - - - - - -SELECT `bP`, SUBSTRING(`bP`,1) FROM `sPO`; -bP SUBSTRING(`bP`,1) - - - - - - -SELECT `bP`, SUBSTRING(`bP`,2) FROM `sPO`; -bP SUBSTRING(`bP`,2) - - - - - - -SELECT `bP`, SUBSTRING(`bP`,3) FROM `sPO`; -bP SUBSTRING(`bP`,3) - - - - - - -SELECT `bP`, SUBSTRING(`bP`,4) FROM `sPO`; -bP SUBSTRING(`bP`,4) - - - - - - -SELECT `bP`, SUBSTRING(`bP`,5) FROM `sPO`; -bP SUBSTRING(`bP`,5) - - - - - - -SELECT `bP`, SUBSTRING(`bP`,6) FROM `sPO`; -bP SUBSTRING(`bP`,6) - - - - - - -SELECT `bP`, SUBSTRING(`bP` FROM 0) FROM `sPO`; -bP SUBSTRING(`bP` FROM 0) - - - - - - -SELECT `bP`, SUBSTRING(`bP` FROM 1) FROM `sPO`; -bP SUBSTRING(`bP` FROM 1) - - - - - - -SELECT `bP`, SUBSTRING(`bP` FROM 2) FROM `sPO`; -bP SUBSTRING(`bP` FROM 2) - - - - - - -SELECT `bP`, SUBSTRING(`bP` FROM 3) FROM `sPO`; -bP SUBSTRING(`bP` FROM 3) - - - - - - -SELECT `bP`, SUBSTRING(`bP` FROM 4) FROM `sPO`; -bP SUBSTRING(`bP` FROM 4) - - - - - - -SELECT `bP`, SUBSTRING(`bP` FROM 5) FROM `sPO`; -bP SUBSTRING(`bP` FROM 5) - - - - - - -SELECT `bP`, SUBSTRING(`bP` FROM 6) FROM `sPO`; -bP SUBSTRING(`bP` FROM 6) - - - - - - -SELECT `bP`, SUBSTRING(`bP`,1,0) FROM `sPO`; -bP SUBSTRING(`bP`,1,0) - - - - - - -SELECT `bP`, SUBSTRING(`bP`,1,1) FROM `sPO`; -bP SUBSTRING(`bP`,1,1) - - - - - - -SELECT `bP`, SUBSTRING(`bP`,1,2) FROM `sPO`; -bP SUBSTRING(`bP`,1,2) - - - - - - -SELECT `bP`, SUBSTRING(`bP`,1,3) FROM `sPO`; -bP SUBSTRING(`bP`,1,3) - - - - - - -SELECT `bP`, SUBSTRING(`bP`,1,4) FROM `sPO`; -bP SUBSTRING(`bP`,1,4) - - - - - - -SELECT `bP`, SUBSTRING(`bP`,1,5) FROM `sPO`; -bP SUBSTRING(`bP`,1,5) - - - - - - -SELECT `bP`, SUBSTRING(`bP`,1,6) FROM `sPO`; -bP SUBSTRING(`bP`,1,6) - - - - - - -SELECT `bP`, SUBSTRING(`bP` FROM 1 FOR 0) FROM `sPO`; -bP SUBSTRING(`bP` FROM 1 FOR 0) - - - - - - -SELECT `bP`, SUBSTRING(`bP` FROM 1 FOR 1) FROM `sPO`; -bP SUBSTRING(`bP` FROM 1 FOR 1) - - - - - - -SELECT `bP`, SUBSTRING(`bP` FROM 1 FOR 2) FROM `sPO`; -bP SUBSTRING(`bP` FROM 1 FOR 2) - - - - - - -SELECT `bP`, SUBSTRING(`bP` FROM 1 FOR 3) FROM `sPO`; -bP SUBSTRING(`bP` FROM 1 FOR 3) - - - - - - -SELECT `bP`, SUBSTRING(`bP` FROM 1 FOR 4) FROM `sPO`; -bP SUBSTRING(`bP` FROM 1 FOR 4) - - - - - - -SELECT `bP`, SUBSTRING(`bP` FROM 1 FOR 5) FROM `sPO`; -bP SUBSTRING(`bP` FROM 1 FOR 5) - - - - - - -SELECT `bP`, SUBSTRING(`bP` FROM 1 FOR 6) FROM `sPO`; -bP SUBSTRING(`bP` FROM 1 FOR 6) - - - - - - -SELECT `bP`, SUBSTRING(`bP`,0) FROM `sPP`; -bP SUBSTRING(`bP`,0) - - - - - - -SELECT `bP`, SUBSTRING(`bP`,1) FROM `sPP`; -bP SUBSTRING(`bP`,1) - - - - - - -SELECT `bP`, SUBSTRING(`bP`,2) FROM `sPP`; -bP SUBSTRING(`bP`,2) - - - - - - -SELECT `bP`, SUBSTRING(`bP`,3) FROM `sPP`; -bP SUBSTRING(`bP`,3) - - - - - - -SELECT `bP`, SUBSTRING(`bP`,4) FROM `sPP`; -bP SUBSTRING(`bP`,4) - - - - - - -SELECT `bP`, SUBSTRING(`bP`,5) FROM `sPP`; -bP SUBSTRING(`bP`,5) - - - - - - -SELECT `bP`, SUBSTRING(`bP`,6) FROM `sPP`; -bP SUBSTRING(`bP`,6) - - - - - - -SELECT `bP`, SUBSTRING(`bP` FROM 0) FROM `sPP`; -bP SUBSTRING(`bP` FROM 0) - - - - - - -SELECT `bP`, SUBSTRING(`bP` FROM 1) FROM `sPP`; -bP SUBSTRING(`bP` FROM 1) - - - - - - -SELECT `bP`, SUBSTRING(`bP` FROM 2) FROM `sPP`; -bP SUBSTRING(`bP` FROM 2) - - - - - - -SELECT `bP`, SUBSTRING(`bP` FROM 3) FROM `sPP`; -bP SUBSTRING(`bP` FROM 3) - - - - - - -SELECT `bP`, SUBSTRING(`bP` FROM 4) FROM `sPP`; -bP SUBSTRING(`bP` FROM 4) - - - - - - -SELECT `bP`, SUBSTRING(`bP` FROM 5) FROM `sPP`; -bP SUBSTRING(`bP` FROM 5) - - - - - - -SELECT `bP`, SUBSTRING(`bP` FROM 6) FROM `sPP`; -bP SUBSTRING(`bP` FROM 6) - - - - - - -SELECT `bP`, SUBSTRING(`bP`,1,0) FROM `sPP`; -bP SUBSTRING(`bP`,1,0) - - - - - - -SELECT `bP`, SUBSTRING(`bP`,1,1) FROM `sPP`; -bP SUBSTRING(`bP`,1,1) - - - - - - -SELECT `bP`, SUBSTRING(`bP`,1,2) FROM `sPP`; -bP SUBSTRING(`bP`,1,2) - - - - - - -SELECT `bP`, SUBSTRING(`bP`,1,3) FROM `sPP`; -bP SUBSTRING(`bP`,1,3) - - - - - - -SELECT `bP`, SUBSTRING(`bP`,1,4) FROM `sPP`; -bP SUBSTRING(`bP`,1,4) - - - - - - -SELECT `bP`, SUBSTRING(`bP`,1,5) FROM `sPP`; -bP SUBSTRING(`bP`,1,5) - - - - - - -SELECT `bP`, SUBSTRING(`bP`,1,6) FROM `sPP`; -bP SUBSTRING(`bP`,1,6) - - - - - - -SELECT `bP`, SUBSTRING(`bP` FROM 1 FOR 0) FROM `sPP`; -bP SUBSTRING(`bP` FROM 1 FOR 0) - - - - - - -SELECT `bP`, SUBSTRING(`bP` FROM 1 FOR 1) FROM `sPP`; -bP SUBSTRING(`bP` FROM 1 FOR 1) - - - - - - -SELECT `bP`, SUBSTRING(`bP` FROM 1 FOR 2) FROM `sPP`; -bP SUBSTRING(`bP` FROM 1 FOR 2) - - - - - - -SELECT `bP`, SUBSTRING(`bP` FROM 1 FOR 3) FROM `sPP`; -bP SUBSTRING(`bP` FROM 1 FOR 3) - - - - - - -SELECT `bP`, SUBSTRING(`bP` FROM 1 FOR 4) FROM `sPP`; -bP SUBSTRING(`bP` FROM 1 FOR 4) - - - - - - -SELECT `bP`, SUBSTRING(`bP` FROM 1 FOR 5) FROM `sPP`; -bP SUBSTRING(`bP` FROM 1 FOR 5) - - - - - - -SELECT `bP`, SUBSTRING(`bP` FROM 1 FOR 6) FROM `sPP`; -bP SUBSTRING(`bP` FROM 1 FOR 6) - - - - - - -SELECT `bP`, SUBSTRING(`bP`,0) FROM `sPQ`; -bP SUBSTRING(`bP`,0) -\\\\\ -\\\\ -\\\ -\\ -\ - -SELECT `bP`, SUBSTRING(`bP`,1) FROM `sPQ`; -bP SUBSTRING(`bP`,1) -\\\\\ \\\\\ -\\\\ \\\\ -\\\ \\\ -\\ \\ -\ \ - -SELECT `bP`, SUBSTRING(`bP`,2) FROM `sPQ`; -bP SUBSTRING(`bP`,2) -\\\\\ \\\\ -\\\\ \\\ -\\\ \\ -\\ \ -\ - -SELECT `bP`, SUBSTRING(`bP`,3) FROM `sPQ`; -bP SUBSTRING(`bP`,3) -\\\\\ \\\ -\\\\ \\ -\\\ \ -\\ -\ - -SELECT `bP`, SUBSTRING(`bP`,4) FROM `sPQ`; -bP SUBSTRING(`bP`,4) -\\\\\ \\ -\\\\ \ -\\\ -\\ -\ - -SELECT `bP`, SUBSTRING(`bP`,5) FROM `sPQ`; -bP SUBSTRING(`bP`,5) -\\\\\ \ -\\\\ -\\\ -\\ -\ - -SELECT `bP`, SUBSTRING(`bP`,6) FROM `sPQ`; -bP SUBSTRING(`bP`,6) -\\\\\ -\\\\ -\\\ -\\ -\ - -SELECT `bP`, SUBSTRING(`bP` FROM 0) FROM `sPQ`; -bP SUBSTRING(`bP` FROM 0) -\\\\\ -\\\\ -\\\ -\\ -\ - -SELECT `bP`, SUBSTRING(`bP` FROM 1) FROM `sPQ`; -bP SUBSTRING(`bP` FROM 1) -\\\\\ \\\\\ -\\\\ \\\\ -\\\ \\\ -\\ \\ -\ \ - -SELECT `bP`, SUBSTRING(`bP` FROM 2) FROM `sPQ`; -bP SUBSTRING(`bP` FROM 2) -\\\\\ \\\\ -\\\\ \\\ -\\\ \\ -\\ \ -\ - -SELECT `bP`, SUBSTRING(`bP` FROM 3) FROM `sPQ`; -bP SUBSTRING(`bP` FROM 3) -\\\\\ \\\ -\\\\ \\ -\\\ \ -\\ -\ - -SELECT `bP`, SUBSTRING(`bP` FROM 4) FROM `sPQ`; -bP SUBSTRING(`bP` FROM 4) -\\\\\ \\ -\\\\ \ -\\\ -\\ -\ - -SELECT `bP`, SUBSTRING(`bP` FROM 5) FROM `sPQ`; -bP SUBSTRING(`bP` FROM 5) -\\\\\ \ -\\\\ -\\\ -\\ -\ - -SELECT `bP`, SUBSTRING(`bP` FROM 6) FROM `sPQ`; -bP SUBSTRING(`bP` FROM 6) -\\\\\ -\\\\ -\\\ -\\ -\ - -SELECT `bP`, SUBSTRING(`bP`,1,0) FROM `sPQ`; -bP SUBSTRING(`bP`,1,0) -\\\\\ -\\\\ -\\\ -\\ -\ - -SELECT `bP`, SUBSTRING(`bP`,1,1) FROM `sPQ`; -bP SUBSTRING(`bP`,1,1) -\\\\\ \ -\\\\ \ -\\\ \ -\\ \ -\ \ - -SELECT `bP`, SUBSTRING(`bP`,1,2) FROM `sPQ`; -bP SUBSTRING(`bP`,1,2) -\\\\\ \\ -\\\\ \\ -\\\ \\ -\\ \\ -\ \ - -SELECT `bP`, SUBSTRING(`bP`,1,3) FROM `sPQ`; -bP SUBSTRING(`bP`,1,3) -\\\\\ \\\ -\\\\ \\\ -\\\ \\\ -\\ \\ -\ \ - -SELECT `bP`, SUBSTRING(`bP`,1,4) FROM `sPQ`; -bP SUBSTRING(`bP`,1,4) -\\\\\ \\\\ -\\\\ \\\\ -\\\ \\\ -\\ \\ -\ \ - -SELECT `bP`, SUBSTRING(`bP`,1,5) FROM `sPQ`; -bP SUBSTRING(`bP`,1,5) -\\\\\ \\\\\ -\\\\ \\\\ -\\\ \\\ -\\ \\ -\ \ - -SELECT `bP`, SUBSTRING(`bP`,1,6) FROM `sPQ`; -bP SUBSTRING(`bP`,1,6) -\\\\\ \\\\\ -\\\\ \\\\ -\\\ \\\ -\\ \\ -\ \ - -SELECT `bP`, SUBSTRING(`bP` FROM 1 FOR 0) FROM `sPQ`; -bP SUBSTRING(`bP` FROM 1 FOR 0) -\\\\\ -\\\\ -\\\ -\\ -\ - -SELECT `bP`, SUBSTRING(`bP` FROM 1 FOR 1) FROM `sPQ`; -bP SUBSTRING(`bP` FROM 1 FOR 1) -\\\\\ \ -\\\\ \ -\\\ \ -\\ \ -\ \ - -SELECT `bP`, SUBSTRING(`bP` FROM 1 FOR 2) FROM `sPQ`; -bP SUBSTRING(`bP` FROM 1 FOR 2) -\\\\\ \\ -\\\\ \\ -\\\ \\ -\\ \\ -\ \ - -SELECT `bP`, SUBSTRING(`bP` FROM 1 FOR 3) FROM `sPQ`; -bP SUBSTRING(`bP` FROM 1 FOR 3) -\\\\\ \\\ -\\\\ \\\ -\\\ \\\ -\\ \\ -\ \ - -SELECT `bP`, SUBSTRING(`bP` FROM 1 FOR 4) FROM `sPQ`; -bP SUBSTRING(`bP` FROM 1 FOR 4) -\\\\\ \\\\ -\\\\ \\\\ -\\\ \\\ -\\ \\ -\ \ - -SELECT `bP`, SUBSTRING(`bP` FROM 1 FOR 5) FROM `sPQ`; -bP SUBSTRING(`bP` FROM 1 FOR 5) -\\\\\ \\\\\ -\\\\ \\\\ -\\\ \\\ -\\ \\ -\ \ - -SELECT `bP`, SUBSTRING(`bP` FROM 1 FOR 6) FROM `sPQ`; -bP SUBSTRING(`bP` FROM 1 FOR 6) -\\\\\ \\\\\ -\\\\ \\\\ -\\\ \\\ -\\ \\ -\ \ - DROP TABLE `sP`; DROP TABLE `sQ`; DROP TABLE `sR`; @@ -2733,6 +2052,3 @@ DROP TABLE `sU`; DROP TABLE `sV`; DROP TABLE `sW`; DROP TABLE `sX`; -DROP TABLE `sPO`; -DROP TABLE `sPP`; -DROP TABLE `sPQ`; diff --git a/mysql-test/suite/jp/r/jp_substring_ucs2.result b/mysql-test/suite/jp/r/jp_substring_ucs2.result index cb2a5b5b946..5b01928f2a9 100644 --- a/mysql-test/suite/jp/r/jp_substring_ucs2.result +++ b/mysql-test/suite/jp/r/jp_substring_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 `ԣ` (`ã` char(5), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engin 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 `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(' INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(''),(''),(''); SELECT `ã`, SUBSTRING(`ã`,1,0) FROM `ԣ`; ã SUBSTRING(`ã`,1,0) @@ -1045,342 +1036,6 @@ SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 6) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,1,0) FROM `ԣ`; -ã SUBSTRING(`ã`,1,0) - - - - - - -SELECT `ã`, SUBSTRING(`ã`,1,1) FROM `ԣ`; -ã SUBSTRING(`ã`,1,1) - - - - - - -SELECT `ã`, SUBSTRING(`ã`,1,2) FROM `ԣ`; -ã SUBSTRING(`ã`,1,2) - - - - - - -SELECT `ã`, SUBSTRING(`ã`,1,3) FROM `ԣ`; -ã SUBSTRING(`ã`,1,3) - - - - - - -SELECT `ã`, SUBSTRING(`ã`,1,4) FROM `ԣ`; -ã SUBSTRING(`ã`,1,4) - - - - - - -SELECT `ã`, SUBSTRING(`ã`,1,5) FROM `ԣ`; -ã SUBSTRING(`ã`,1,5) - - - - - - -SELECT `ã`, SUBSTRING(`ã`,1,6) FROM `ԣ`; -ã SUBSTRING(`ã`,1,6) - - - - - - -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 0) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 1 FOR 0) - - - - - - -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 1) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 1 FOR 1) - - - - - - -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 2) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 1 FOR 2) - - - - - - -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 3) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 1 FOR 3) - - - - - - -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 4) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 1 FOR 4) - - - - - - -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 5) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 1 FOR 5) - - - - - - -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 6) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 1 FOR 6) - - - - - - -SELECT `ã`, SUBSTRING(`ã`,1,0) FROM `ԣ`; -ã SUBSTRING(`ã`,1,0) - - - - - - -SELECT `ã`, SUBSTRING(`ã`,1,1) FROM `ԣ`; -ã SUBSTRING(`ã`,1,1) - - - - - - -SELECT `ã`, SUBSTRING(`ã`,1,2) FROM `ԣ`; -ã SUBSTRING(`ã`,1,2) - - - - - - -SELECT `ã`, SUBSTRING(`ã`,1,3) FROM `ԣ`; -ã SUBSTRING(`ã`,1,3) - - - - - - -SELECT `ã`, SUBSTRING(`ã`,1,4) FROM `ԣ`; -ã SUBSTRING(`ã`,1,4) - - - - - - -SELECT `ã`, SUBSTRING(`ã`,1,5) FROM `ԣ`; -ã SUBSTRING(`ã`,1,5) - - - - - - -SELECT `ã`, SUBSTRING(`ã`,1,6) FROM `ԣ`; -ã SUBSTRING(`ã`,1,6) - - - - - - -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 0) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 1 FOR 0) - - - - - - -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 1) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 1 FOR 1) - - - - - - -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 2) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 1 FOR 2) - - - - - - -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 3) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 1 FOR 3) - - - - - - -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 4) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 1 FOR 4) - - - - - - -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 5) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 1 FOR 5) - - - - - - -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 6) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 1 FOR 6) - - - - - - -SELECT `ã`, SUBSTRING(`ã`,1,0) FROM `ԣ`; -ã SUBSTRING(`ã`,1,0) -ݏޏߏ -ݏޏ -ݏ - - - -SELECT `ã`, SUBSTRING(`ã`,1,1) FROM `ԣ`; -ã SUBSTRING(`ã`,1,1) -ݏޏߏ -ݏޏ -ݏ - - - -SELECT `ã`, SUBSTRING(`ã`,1,2) FROM `ԣ`; -ã SUBSTRING(`ã`,1,2) -ݏޏߏ -ݏޏ -ݏ - - - -SELECT `ã`, SUBSTRING(`ã`,1,3) FROM `ԣ`; -ã SUBSTRING(`ã`,1,3) -ݏޏߏ ݏ -ݏޏ ݏ -ݏ ݏ - - - -SELECT `ã`, SUBSTRING(`ã`,1,4) FROM `ԣ`; -ã SUBSTRING(`ã`,1,4) -ݏޏߏ ݏޏ -ݏޏ ݏޏ -ݏ ݏ - - - -SELECT `ã`, SUBSTRING(`ã`,1,5) FROM `ԣ`; -ã SUBSTRING(`ã`,1,5) -ݏޏߏ ݏޏߏ -ݏޏ ݏޏ -ݏ ݏ - - - -SELECT `ã`, SUBSTRING(`ã`,1,6) FROM `ԣ`; -ã SUBSTRING(`ã`,1,6) -ݏޏߏ ݏޏߏ -ݏޏ ݏޏ -ݏ ݏ - - - -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 0) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 1 FOR 0) -ݏޏߏ -ݏޏ -ݏ - - - -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 1) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 1 FOR 1) -ݏޏߏ -ݏޏ -ݏ - - - -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 2) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 1 FOR 2) -ݏޏߏ -ݏޏ -ݏ - - - -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 3) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 1 FOR 3) -ݏޏߏ ݏ -ݏޏ ݏ -ݏ ݏ - - - -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 4) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 1 FOR 4) -ݏޏߏ ݏޏ -ݏޏ ݏޏ -ݏ ݏ - - - -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 5) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 1 FOR 5) -ݏޏߏ ݏޏߏ -ݏޏ ݏޏ -ݏ ݏ - - - -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 6) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 1 FOR 6) -ݏޏߏ ݏޏߏ -ݏޏ ݏޏ -ݏ ݏ - - - DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -1390,6 +1045,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/r/jp_substring_ujis.result b/mysql-test/suite/jp/r/jp_substring_ujis.result index 229de0c0236..6285271d267 100644 --- a/mysql-test/suite/jp/r/jp_substring_ujis.result +++ b/mysql-test/suite/jp/r/jp_substring_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 `ԣ` (`ã` char(5), INDEX(`ã`)) DEFAULT CHARSET = ujis engin 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 `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(' INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(''),(''),(''); SELECT `ã`, SUBSTRING(`ã`,0) FROM `ԣ`; ã SUBSTRING(`ã`,0) @@ -2052,678 +2043,6 @@ SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 6) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,0) FROM `ԣ`; -ã SUBSTRING(`ã`,0) - - - - - - -SELECT `ã`, SUBSTRING(`ã`,1) FROM `ԣ`; -ã SUBSTRING(`ã`,1) - - - - - - -SELECT `ã`, SUBSTRING(`ã`,2) FROM `ԣ`; -ã SUBSTRING(`ã`,2) - - - - - - -SELECT `ã`, SUBSTRING(`ã`,3) FROM `ԣ`; -ã SUBSTRING(`ã`,3) - - - - - - -SELECT `ã`, SUBSTRING(`ã`,4) FROM `ԣ`; -ã SUBSTRING(`ã`,4) - - - - - - -SELECT `ã`, SUBSTRING(`ã`,5) FROM `ԣ`; -ã SUBSTRING(`ã`,5) - - - - - - -SELECT `ã`, SUBSTRING(`ã`,6) FROM `ԣ`; -ã SUBSTRING(`ã`,6) - - - - - - -SELECT `ã`, SUBSTRING(`ã` FROM 0) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 0) - - - - - - -SELECT `ã`, SUBSTRING(`ã` FROM 1) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 1) - - - - - - -SELECT `ã`, SUBSTRING(`ã` FROM 2) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 2) - - - - - - -SELECT `ã`, SUBSTRING(`ã` FROM 3) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 3) - - - - - - -SELECT `ã`, SUBSTRING(`ã` FROM 4) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 4) - - - - - - -SELECT `ã`, SUBSTRING(`ã` FROM 5) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 5) - - - - - - -SELECT `ã`, SUBSTRING(`ã` FROM 6) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 6) - - - - - - -SELECT `ã`, SUBSTRING(`ã`,1,0) FROM `ԣ`; -ã SUBSTRING(`ã`,1,0) - - - - - - -SELECT `ã`, SUBSTRING(`ã`,1,1) FROM `ԣ`; -ã SUBSTRING(`ã`,1,1) - - - - - - -SELECT `ã`, SUBSTRING(`ã`,1,2) FROM `ԣ`; -ã SUBSTRING(`ã`,1,2) - - - - - - -SELECT `ã`, SUBSTRING(`ã`,1,3) FROM `ԣ`; -ã SUBSTRING(`ã`,1,3) - - - - - - -SELECT `ã`, SUBSTRING(`ã`,1,4) FROM `ԣ`; -ã SUBSTRING(`ã`,1,4) - - - - - - -SELECT `ã`, SUBSTRING(`ã`,1,5) FROM `ԣ`; -ã SUBSTRING(`ã`,1,5) - - - - - - -SELECT `ã`, SUBSTRING(`ã`,1,6) FROM `ԣ`; -ã SUBSTRING(`ã`,1,6) - - - - - - -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 0) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 1 FOR 0) - - - - - - -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 1) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 1 FOR 1) - - - - - - -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 2) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 1 FOR 2) - - - - - - -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 3) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 1 FOR 3) - - - - - - -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 4) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 1 FOR 4) - - - - - - -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 5) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 1 FOR 5) - - - - - - -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 6) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 1 FOR 6) - - - - - - -SELECT `ã`, SUBSTRING(`ã`,0) FROM `ԣ`; -ã SUBSTRING(`ã`,0) - - - - - - -SELECT `ã`, SUBSTRING(`ã`,1) FROM `ԣ`; -ã SUBSTRING(`ã`,1) - - - - - - -SELECT `ã`, SUBSTRING(`ã`,2) FROM `ԣ`; -ã SUBSTRING(`ã`,2) - - - - - - -SELECT `ã`, SUBSTRING(`ã`,3) FROM `ԣ`; -ã SUBSTRING(`ã`,3) - - - - - - -SELECT `ã`, SUBSTRING(`ã`,4) FROM `ԣ`; -ã SUBSTRING(`ã`,4) - - - - - - -SELECT `ã`, SUBSTRING(`ã`,5) FROM `ԣ`; -ã SUBSTRING(`ã`,5) - - - - - - -SELECT `ã`, SUBSTRING(`ã`,6) FROM `ԣ`; -ã SUBSTRING(`ã`,6) - - - - - - -SELECT `ã`, SUBSTRING(`ã` FROM 0) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 0) - - - - - - -SELECT `ã`, SUBSTRING(`ã` FROM 1) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 1) - - - - - - -SELECT `ã`, SUBSTRING(`ã` FROM 2) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 2) - - - - - - -SELECT `ã`, SUBSTRING(`ã` FROM 3) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 3) - - - - - - -SELECT `ã`, SUBSTRING(`ã` FROM 4) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 4) - - - - - - -SELECT `ã`, SUBSTRING(`ã` FROM 5) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 5) - - - - - - -SELECT `ã`, SUBSTRING(`ã` FROM 6) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 6) - - - - - - -SELECT `ã`, SUBSTRING(`ã`,1,0) FROM `ԣ`; -ã SUBSTRING(`ã`,1,0) - - - - - - -SELECT `ã`, SUBSTRING(`ã`,1,1) FROM `ԣ`; -ã SUBSTRING(`ã`,1,1) - - - - - - -SELECT `ã`, SUBSTRING(`ã`,1,2) FROM `ԣ`; -ã SUBSTRING(`ã`,1,2) - - - - - - -SELECT `ã`, SUBSTRING(`ã`,1,3) FROM `ԣ`; -ã SUBSTRING(`ã`,1,3) - - - - - - -SELECT `ã`, SUBSTRING(`ã`,1,4) FROM `ԣ`; -ã SUBSTRING(`ã`,1,4) - - - - - - -SELECT `ã`, SUBSTRING(`ã`,1,5) FROM `ԣ`; -ã SUBSTRING(`ã`,1,5) - - - - - - -SELECT `ã`, SUBSTRING(`ã`,1,6) FROM `ԣ`; -ã SUBSTRING(`ã`,1,6) - - - - - - -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 0) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 1 FOR 0) - - - - - - -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 1) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 1 FOR 1) - - - - - - -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 2) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 1 FOR 2) - - - - - - -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 3) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 1 FOR 3) - - - - - - -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 4) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 1 FOR 4) - - - - - - -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 5) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 1 FOR 5) - - - - - - -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 6) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 1 FOR 6) - - - - - - -SELECT `ã`, SUBSTRING(`ã`,0) FROM `ԣ`; -ã SUBSTRING(`ã`,0) -ݏޏߏ -ݏޏ -ݏ - - - -SELECT `ã`, SUBSTRING(`ã`,1) FROM `ԣ`; -ã SUBSTRING(`ã`,1) -ݏޏߏ ݏޏߏ -ݏޏ ݏޏ -ݏ ݏ - - - -SELECT `ã`, SUBSTRING(`ã`,2) FROM `ԣ`; -ã SUBSTRING(`ã`,2) -ݏޏߏ ݏޏߏ -ݏޏ ݏޏ -ݏ ݏ - - - -SELECT `ã`, SUBSTRING(`ã`,3) FROM `ԣ`; -ã SUBSTRING(`ã`,3) -ݏޏߏ ޏߏ -ݏޏ ޏ -ݏ - - - -SELECT `ã`, SUBSTRING(`ã`,4) FROM `ԣ`; -ã SUBSTRING(`ã`,4) -ݏޏߏ ߏ -ݏޏ -ݏ - - - -SELECT `ã`, SUBSTRING(`ã`,5) FROM `ԣ`; -ã SUBSTRING(`ã`,5) -ݏޏߏ -ݏޏ -ݏ - - - -SELECT `ã`, SUBSTRING(`ã`,6) FROM `ԣ`; -ã SUBSTRING(`ã`,6) -ݏޏߏ -ݏޏ -ݏ - - - -SELECT `ã`, SUBSTRING(`ã` FROM 0) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 0) -ݏޏߏ -ݏޏ -ݏ - - - -SELECT `ã`, SUBSTRING(`ã` FROM 1) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 1) -ݏޏߏ ݏޏߏ -ݏޏ ݏޏ -ݏ ݏ - - - -SELECT `ã`, SUBSTRING(`ã` FROM 2) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 2) -ݏޏߏ ݏޏߏ -ݏޏ ݏޏ -ݏ ݏ - - - -SELECT `ã`, SUBSTRING(`ã` FROM 3) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 3) -ݏޏߏ ޏߏ -ݏޏ ޏ -ݏ - - - -SELECT `ã`, SUBSTRING(`ã` FROM 4) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 4) -ݏޏߏ ߏ -ݏޏ -ݏ - - - -SELECT `ã`, SUBSTRING(`ã` FROM 5) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 5) -ݏޏߏ -ݏޏ -ݏ - - - -SELECT `ã`, SUBSTRING(`ã` FROM 6) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 6) -ݏޏߏ -ݏޏ -ݏ - - - -SELECT `ã`, SUBSTRING(`ã`,1,0) FROM `ԣ`; -ã SUBSTRING(`ã`,1,0) -ݏޏߏ -ݏޏ -ݏ - - - -SELECT `ã`, SUBSTRING(`ã`,1,1) FROM `ԣ`; -ã SUBSTRING(`ã`,1,1) -ݏޏߏ -ݏޏ -ݏ - - - -SELECT `ã`, SUBSTRING(`ã`,1,2) FROM `ԣ`; -ã SUBSTRING(`ã`,1,2) -ݏޏߏ -ݏޏ -ݏ - - - -SELECT `ã`, SUBSTRING(`ã`,1,3) FROM `ԣ`; -ã SUBSTRING(`ã`,1,3) -ݏޏߏ ݏ -ݏޏ ݏ -ݏ ݏ - - - -SELECT `ã`, SUBSTRING(`ã`,1,4) FROM `ԣ`; -ã SUBSTRING(`ã`,1,4) -ݏޏߏ ݏޏ -ݏޏ ݏޏ -ݏ ݏ - - - -SELECT `ã`, SUBSTRING(`ã`,1,5) FROM `ԣ`; -ã SUBSTRING(`ã`,1,5) -ݏޏߏ ݏޏߏ -ݏޏ ݏޏ -ݏ ݏ - - - -SELECT `ã`, SUBSTRING(`ã`,1,6) FROM `ԣ`; -ã SUBSTRING(`ã`,1,6) -ݏޏߏ ݏޏߏ -ݏޏ ݏޏ -ݏ ݏ - - - -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 0) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 1 FOR 0) -ݏޏߏ -ݏޏ -ݏ - - - -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 1) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 1 FOR 1) -ݏޏߏ -ݏޏ -ݏ - - - -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 2) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 1 FOR 2) -ݏޏߏ -ݏޏ -ݏ - - - -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 3) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 1 FOR 3) -ݏޏߏ ݏ -ݏޏ ݏ -ݏ ݏ - - - -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 4) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 1 FOR 4) -ݏޏߏ ݏޏ -ݏޏ ݏޏ -ݏ ݏ - - - -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 5) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 1 FOR 5) -ݏޏߏ ݏޏߏ -ݏޏ ݏޏ -ݏ ݏ - - - -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 6) FROM `ԣ`; -ã SUBSTRING(`ã` FROM 1 FOR 6) -ݏޏߏ ݏޏߏ -ݏޏ ݏޏ -ݏ ݏ - - - DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -2733,6 +2052,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/r/jp_substring_utf8.result b/mysql-test/suite/jp/r/jp_substring_utf8.result index f838a2e75e2..80c4ad5c6c1 100644 --- a/mysql-test/suite/jp/r/jp_substring_utf8.result +++ b/mysql-test/suite/jp/r/jp_substring_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 `Ｃ１`, SUBSTRING(`Ｃ１`,0) FROM `Ｔ１`; Ｃ１ SUBSTRING(`Ｃ１`,0) @@ -2052,678 +2043,6 @@ SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 6) FROM `Ｔ９`; 龔龖 龔龖 龔 龔 -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,0) FROM `Ｔ１０`; -Ｃ１ SUBSTRING(`Ｃ１`,0) -ｱｲｳｴｵ -ｱｲｳｴ -ｱｲｳ -ｱｲ -ｱ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1) FROM `Ｔ１０`; -Ｃ１ SUBSTRING(`Ｃ１`,1) -ｱｲｳｴｵ ｱｲｳｴｵ -ｱｲｳｴ ｱｲｳｴ -ｱｲｳ ｱｲｳ -ｱｲ ｱｲ -ｱ ｱ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,2) FROM `Ｔ１０`; -Ｃ１ SUBSTRING(`Ｃ１`,2) -ｱｲｳｴｵ ｲｳｴｵ -ｱｲｳｴ ｲｳｴ -ｱｲｳ ｲｳ -ｱｲ ｲ -ｱ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,3) FROM `Ｔ１０`; -Ｃ１ SUBSTRING(`Ｃ１`,3) -ｱｲｳｴｵ ｳｴｵ -ｱｲｳｴ ｳｴ -ｱｲｳ ｳ -ｱｲ -ｱ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,4) FROM `Ｔ１０`; -Ｃ１ SUBSTRING(`Ｃ１`,4) -ｱｲｳｴｵ ｴｵ -ｱｲｳｴ ｴ -ｱｲｳ -ｱｲ -ｱ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,5) FROM `Ｔ１０`; -Ｃ１ SUBSTRING(`Ｃ１`,5) -ｱｲｳｴｵ ｵ -ｱｲｳｴ -ｱｲｳ -ｱｲ -ｱ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,6) FROM `Ｔ１０`; -Ｃ１ SUBSTRING(`Ｃ１`,6) -ｱｲｳｴｵ -ｱｲｳｴ -ｱｲｳ -ｱｲ -ｱ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 0) FROM `Ｔ１０`; -Ｃ１ SUBSTRING(`Ｃ１` FROM 0) -ｱｲｳｴｵ -ｱｲｳｴ -ｱｲｳ -ｱｲ -ｱ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1) FROM `Ｔ１０`; -Ｃ１ SUBSTRING(`Ｃ１` FROM 1) -ｱｲｳｴｵ ｱｲｳｴｵ -ｱｲｳｴ ｱｲｳｴ -ｱｲｳ ｱｲｳ -ｱｲ ｱｲ -ｱ ｱ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 2) FROM `Ｔ１０`; -Ｃ１ SUBSTRING(`Ｃ１` FROM 2) -ｱｲｳｴｵ ｲｳｴｵ -ｱｲｳｴ ｲｳｴ -ｱｲｳ ｲｳ -ｱｲ ｲ -ｱ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 3) FROM `Ｔ１０`; -Ｃ１ SUBSTRING(`Ｃ１` FROM 3) -ｱｲｳｴｵ ｳｴｵ -ｱｲｳｴ ｳｴ -ｱｲｳ ｳ -ｱｲ -ｱ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 4) FROM `Ｔ１０`; -Ｃ１ SUBSTRING(`Ｃ１` FROM 4) -ｱｲｳｴｵ ｴｵ -ｱｲｳｴ ｴ -ｱｲｳ -ｱｲ -ｱ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 5) FROM `Ｔ１０`; -Ｃ１ SUBSTRING(`Ｃ１` FROM 5) -ｱｲｳｴｵ ｵ -ｱｲｳｴ -ｱｲｳ -ｱｲ -ｱ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 6) FROM `Ｔ１０`; -Ｃ１ SUBSTRING(`Ｃ１` FROM 6) -ｱｲｳｴｵ -ｱｲｳｴ -ｱｲｳ -ｱｲ -ｱ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,0) FROM `Ｔ１０`; -Ｃ１ SUBSTRING(`Ｃ１`,1,0) -ｱｲｳｴｵ -ｱｲｳｴ -ｱｲｳ -ｱｲ -ｱ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,1) FROM `Ｔ１０`; -Ｃ１ SUBSTRING(`Ｃ１`,1,1) -ｱｲｳｴｵ ｱ -ｱｲｳｴ ｱ -ｱｲｳ ｱ -ｱｲ ｱ -ｱ ｱ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,2) FROM `Ｔ１０`; -Ｃ１ SUBSTRING(`Ｃ１`,1,2) -ｱｲｳｴｵ ｱｲ -ｱｲｳｴ ｱｲ -ｱｲｳ ｱｲ -ｱｲ ｱｲ -ｱ ｱ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,3) FROM `Ｔ１０`; -Ｃ１ SUBSTRING(`Ｃ１`,1,3) -ｱｲｳｴｵ ｱｲｳ -ｱｲｳｴ ｱｲｳ -ｱｲｳ ｱｲｳ -ｱｲ ｱｲ -ｱ ｱ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,4) FROM `Ｔ１０`; -Ｃ１ SUBSTRING(`Ｃ１`,1,4) -ｱｲｳｴｵ ｱｲｳｴ -ｱｲｳｴ ｱｲｳｴ -ｱｲｳ ｱｲｳ -ｱｲ ｱｲ -ｱ ｱ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,5) FROM `Ｔ１０`; -Ｃ１ SUBSTRING(`Ｃ１`,1,5) -ｱｲｳｴｵ ｱｲｳｴｵ -ｱｲｳｴ ｱｲｳｴ -ｱｲｳ ｱｲｳ -ｱｲ ｱｲ -ｱ ｱ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,6) FROM `Ｔ１０`; -Ｃ１ SUBSTRING(`Ｃ１`,1,6) -ｱｲｳｴｵ ｱｲｳｴｵ -ｱｲｳｴ ｱｲｳｴ -ｱｲｳ ｱｲｳ -ｱｲ ｱｲ -ｱ ｱ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 0) FROM `Ｔ１０`; -Ｃ１ SUBSTRING(`Ｃ１` FROM 1 FOR 0) -ｱｲｳｴｵ -ｱｲｳｴ -ｱｲｳ -ｱｲ -ｱ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 1) FROM `Ｔ１０`; -Ｃ１ SUBSTRING(`Ｃ１` FROM 1 FOR 1) -ｱｲｳｴｵ ｱ -ｱｲｳｴ ｱ -ｱｲｳ ｱ -ｱｲ ｱ -ｱ ｱ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 2) FROM `Ｔ１０`; -Ｃ１ SUBSTRING(`Ｃ１` FROM 1 FOR 2) -ｱｲｳｴｵ ｱｲ -ｱｲｳｴ ｱｲ -ｱｲｳ ｱｲ -ｱｲ ｱｲ -ｱ ｱ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 3) FROM `Ｔ１０`; -Ｃ１ SUBSTRING(`Ｃ１` FROM 1 FOR 3) -ｱｲｳｴｵ ｱｲｳ -ｱｲｳｴ ｱｲｳ -ｱｲｳ ｱｲｳ -ｱｲ ｱｲ -ｱ ｱ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 4) FROM `Ｔ１０`; -Ｃ１ SUBSTRING(`Ｃ１` FROM 1 FOR 4) -ｱｲｳｴｵ ｱｲｳｴ -ｱｲｳｴ ｱｲｳｴ -ｱｲｳ ｱｲｳ -ｱｲ ｱｲ -ｱ ｱ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 5) FROM `Ｔ１０`; -Ｃ１ SUBSTRING(`Ｃ１` FROM 1 FOR 5) -ｱｲｳｴｵ ｱｲｳｴｵ -ｱｲｳｴ ｱｲｳｴ -ｱｲｳ ｱｲｳ -ｱｲ ｱｲ -ｱ ｱ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 6) FROM `Ｔ１０`; -Ｃ１ SUBSTRING(`Ｃ１` FROM 1 FOR 6) -ｱｲｳｴｵ ｱｲｳｴｵ -ｱｲｳｴ ｱｲｳｴ -ｱｲｳ ｱｲｳ -ｱｲ ｱｲ -ｱ ｱ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,0) FROM `Ｔ１１`; -Ｃ１ SUBSTRING(`Ｃ１`,0) -あいうえお -あいうえ -あいう -あい -あ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1) FROM `Ｔ１１`; -Ｃ１ SUBSTRING(`Ｃ１`,1) -あいうえお あいうえお -あいうえ あいうえ -あいう あいう -あい あい -あ あ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,2) FROM `Ｔ１１`; -Ｃ１ SUBSTRING(`Ｃ１`,2) -あいうえお いうえお -あいうえ いうえ -あいう いう -あい い -あ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,3) FROM `Ｔ１１`; -Ｃ１ SUBSTRING(`Ｃ１`,3) -あいうえお うえお -あいうえ うえ -あいう う -あい -あ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,4) FROM `Ｔ１１`; -Ｃ１ SUBSTRING(`Ｃ１`,4) -あいうえお えお -あいうえ え -あいう -あい -あ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,5) FROM `Ｔ１１`; -Ｃ１ SUBSTRING(`Ｃ１`,5) -あいうえお お -あいうえ -あいう -あい -あ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,6) FROM `Ｔ１１`; -Ｃ１ SUBSTRING(`Ｃ１`,6) -あいうえお -あいうえ -あいう -あい -あ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 0) FROM `Ｔ１１`; -Ｃ１ SUBSTRING(`Ｃ１` FROM 0) -あいうえお -あいうえ -あいう -あい -あ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1) FROM `Ｔ１１`; -Ｃ１ SUBSTRING(`Ｃ１` FROM 1) -あいうえお あいうえお -あいうえ あいうえ -あいう あいう -あい あい -あ あ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 2) FROM `Ｔ１１`; -Ｃ１ SUBSTRING(`Ｃ１` FROM 2) -あいうえお いうえお -あいうえ いうえ -あいう いう -あい い -あ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 3) FROM `Ｔ１１`; -Ｃ１ SUBSTRING(`Ｃ１` FROM 3) -あいうえお うえお -あいうえ うえ -あいう う -あい -あ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 4) FROM `Ｔ１１`; -Ｃ１ SUBSTRING(`Ｃ１` FROM 4) -あいうえお えお -あいうえ え -あいう -あい -あ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 5) FROM `Ｔ１１`; -Ｃ１ SUBSTRING(`Ｃ１` FROM 5) -あいうえお お -あいうえ -あいう -あい -あ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 6) FROM `Ｔ１１`; -Ｃ１ SUBSTRING(`Ｃ１` FROM 6) -あいうえお -あいうえ -あいう -あい -あ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,0) FROM `Ｔ１１`; -Ｃ１ SUBSTRING(`Ｃ１`,1,0) -あいうえお -あいうえ -あいう -あい -あ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,1) FROM `Ｔ１１`; -Ｃ１ SUBSTRING(`Ｃ１`,1,1) -あいうえお あ -あいうえ あ -あいう あ -あい あ -あ あ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,2) FROM `Ｔ１１`; -Ｃ１ SUBSTRING(`Ｃ１`,1,2) -あいうえお あい -あいうえ あい -あいう あい -あい あい -あ あ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,3) FROM `Ｔ１１`; -Ｃ１ SUBSTRING(`Ｃ１`,1,3) -あいうえお あいう -あいうえ あいう -あいう あいう -あい あい -あ あ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,4) FROM `Ｔ１１`; -Ｃ１ SUBSTRING(`Ｃ１`,1,4) -あいうえお あいうえ -あいうえ あいうえ -あいう あいう -あい あい -あ あ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,5) FROM `Ｔ１１`; -Ｃ１ SUBSTRING(`Ｃ１`,1,5) -あいうえお あいうえお -あいうえ あいうえ -あいう あいう -あい あい -あ あ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,6) FROM `Ｔ１１`; -Ｃ１ SUBSTRING(`Ｃ１`,1,6) -あいうえお あいうえお -あいうえ あいうえ -あいう あいう -あい あい -あ あ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 0) FROM `Ｔ１１`; -Ｃ１ SUBSTRING(`Ｃ１` FROM 1 FOR 0) -あいうえお -あいうえ -あいう -あい -あ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 1) FROM `Ｔ１１`; -Ｃ１ SUBSTRING(`Ｃ１` FROM 1 FOR 1) -あいうえお あ -あいうえ あ -あいう あ -あい あ -あ あ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 2) FROM `Ｔ１１`; -Ｃ１ SUBSTRING(`Ｃ１` FROM 1 FOR 2) -あいうえお あい -あいうえ あい -あいう あい -あい あい -あ あ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 3) FROM `Ｔ１１`; -Ｃ１ SUBSTRING(`Ｃ１` FROM 1 FOR 3) -あいうえお あいう -あいうえ あいう -あいう あいう -あい あい -あ あ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 4) FROM `Ｔ１１`; -Ｃ１ SUBSTRING(`Ｃ１` FROM 1 FOR 4) -あいうえお あいうえ -あいうえ あいうえ -あいう あいう -あい あい -あ あ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 5) FROM `Ｔ１１`; -Ｃ１ SUBSTRING(`Ｃ１` FROM 1 FOR 5) -あいうえお あいうえお -あいうえ あいうえ -あいう あいう -あい あい -あ あ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 6) FROM `Ｔ１１`; -Ｃ１ SUBSTRING(`Ｃ１` FROM 1 FOR 6) -あいうえお あいうえお -あいうえ あいうえ -あいう あいう -あい あい -あ あ - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,0) FROM `Ｔ１２`; -Ｃ１ SUBSTRING(`Ｃ１`,0) -龔龖龗龞龡 -龔龖龗龞 -龔龖龗 -龔龖 -龔 - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1) FROM `Ｔ１２`; -Ｃ１ SUBSTRING(`Ｃ１`,1) -龔龖龗龞龡 龔龖龗龞龡 -龔龖龗龞 龔龖龗龞 -龔龖龗 龔龖龗 -龔龖 龔龖 -龔 龔 - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,2) FROM `Ｔ１２`; -Ｃ１ SUBSTRING(`Ｃ１`,2) -龔龖龗龞龡 龖龗龞龡 -龔龖龗龞 龖龗龞 -龔龖龗 龖龗 -龔龖 龖 -龔 - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,3) FROM `Ｔ１２`; -Ｃ１ SUBSTRING(`Ｃ１`,3) -龔龖龗龞龡 龗龞龡 -龔龖龗龞 龗龞 -龔龖龗 龗 -龔龖 -龔 - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,4) FROM `Ｔ１２`; -Ｃ１ SUBSTRING(`Ｃ１`,4) -龔龖龗龞龡 龞龡 -龔龖龗龞 龞 -龔龖龗 -龔龖 -龔 - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,5) FROM `Ｔ１２`; -Ｃ１ SUBSTRING(`Ｃ１`,5) -龔龖龗龞龡 龡 -龔龖龗龞 -龔龖龗 -龔龖 -龔 - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,6) FROM `Ｔ１２`; -Ｃ１ SUBSTRING(`Ｃ１`,6) -龔龖龗龞龡 -龔龖龗龞 -龔龖龗 -龔龖 -龔 - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 0) FROM `Ｔ１２`; -Ｃ１ SUBSTRING(`Ｃ１` FROM 0) -龔龖龗龞龡 -龔龖龗龞 -龔龖龗 -龔龖 -龔 - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1) FROM `Ｔ１２`; -Ｃ１ SUBSTRING(`Ｃ１` FROM 1) -龔龖龗龞龡 龔龖龗龞龡 -龔龖龗龞 龔龖龗龞 -龔龖龗 龔龖龗 -龔龖 龔龖 -龔 龔 - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 2) FROM `Ｔ１２`; -Ｃ１ SUBSTRING(`Ｃ１` FROM 2) -龔龖龗龞龡 龖龗龞龡 -龔龖龗龞 龖龗龞 -龔龖龗 龖龗 -龔龖 龖 -龔 - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 3) FROM `Ｔ１２`; -Ｃ１ SUBSTRING(`Ｃ１` FROM 3) -龔龖龗龞龡 龗龞龡 -龔龖龗龞 龗龞 -龔龖龗 龗 -龔龖 -龔 - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 4) FROM `Ｔ１２`; -Ｃ１ SUBSTRING(`Ｃ１` FROM 4) -龔龖龗龞龡 龞龡 -龔龖龗龞 龞 -龔龖龗 -龔龖 -龔 - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 5) FROM `Ｔ１２`; -Ｃ１ SUBSTRING(`Ｃ１` FROM 5) -龔龖龗龞龡 龡 -龔龖龗龞 -龔龖龗 -龔龖 -龔 - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 6) FROM `Ｔ１２`; -Ｃ１ SUBSTRING(`Ｃ１` FROM 6) -龔龖龗龞龡 -龔龖龗龞 -龔龖龗 -龔龖 -龔 - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,0) FROM `Ｔ１２`; -Ｃ１ SUBSTRING(`Ｃ１`,1,0) -龔龖龗龞龡 -龔龖龗龞 -龔龖龗 -龔龖 -龔 - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,1) FROM `Ｔ１２`; -Ｃ１ SUBSTRING(`Ｃ１`,1,1) -龔龖龗龞龡 龔 -龔龖龗龞 龔 -龔龖龗 龔 -龔龖 龔 -龔 龔 - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,2) FROM `Ｔ１２`; -Ｃ１ SUBSTRING(`Ｃ１`,1,2) -龔龖龗龞龡 龔龖 -龔龖龗龞 龔龖 -龔龖龗 龔龖 -龔龖 龔龖 -龔 龔 - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,3) FROM `Ｔ１２`; -Ｃ１ SUBSTRING(`Ｃ１`,1,3) -龔龖龗龞龡 龔龖龗 -龔龖龗龞 龔龖龗 -龔龖龗 龔龖龗 -龔龖 龔龖 -龔 龔 - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,4) FROM `Ｔ１２`; -Ｃ１ SUBSTRING(`Ｃ１`,1,4) -龔龖龗龞龡 龔龖龗龞 -龔龖龗龞 龔龖龗龞 -龔龖龗 龔龖龗 -龔龖 龔龖 -龔 龔 - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,5) FROM `Ｔ１２`; -Ｃ１ SUBSTRING(`Ｃ１`,1,5) -龔龖龗龞龡 龔龖龗龞龡 -龔龖龗龞 龔龖龗龞 -龔龖龗 龔龖龗 -龔龖 龔龖 -龔 龔 - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,6) FROM `Ｔ１２`; -Ｃ１ SUBSTRING(`Ｃ１`,1,6) -龔龖龗龞龡 龔龖龗龞龡 -龔龖龗龞 龔龖龗龞 -龔龖龗 龔龖龗 -龔龖 龔龖 -龔 龔 - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 0) FROM `Ｔ１２`; -Ｃ１ SUBSTRING(`Ｃ１` FROM 1 FOR 0) -龔龖龗龞龡 -龔龖龗龞 -龔龖龗 -龔龖 -龔 - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 1) FROM `Ｔ１２`; -Ｃ１ SUBSTRING(`Ｃ１` FROM 1 FOR 1) -龔龖龗龞龡 龔 -龔龖龗龞 龔 -龔龖龗 龔 -龔龖 龔 -龔 龔 - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 2) FROM `Ｔ１２`; -Ｃ１ SUBSTRING(`Ｃ１` FROM 1 FOR 2) -龔龖龗龞龡 龔龖 -龔龖龗龞 龔龖 -龔龖龗 龔龖 -龔龖 龔龖 -龔 龔 - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 3) FROM `Ｔ１２`; -Ｃ１ SUBSTRING(`Ｃ１` FROM 1 FOR 3) -龔龖龗龞龡 龔龖龗 -龔龖龗龞 龔龖龗 -龔龖龗 龔龖龗 -龔龖 龔龖 -龔 龔 - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 4) FROM `Ｔ１２`; -Ｃ１ SUBSTRING(`Ｃ１` FROM 1 FOR 4) -龔龖龗龞龡 龔龖龗龞 -龔龖龗龞 龔龖龗龞 -龔龖龗 龔龖龗 -龔龖 龔龖 -龔 龔 - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 5) FROM `Ｔ１２`; -Ｃ１ SUBSTRING(`Ｃ１` FROM 1 FOR 5) -龔龖龗龞龡 龔龖龗龞龡 -龔龖龗龞 龔龖龗龞 -龔龖龗 龔龖龗 -龔龖 龔龖 -龔 龔 - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 6) FROM `Ｔ１２`; -Ｃ１ SUBSTRING(`Ｃ１` FROM 1 FOR 6) -龔龖龗龞龡 龔龖龗龞龡 -龔龖龗龞 龔龖龗龞 -龔龖龗 龔龖龗 -龔龖 龔龖 -龔 龔 - DROP TABLE `Ｔ１`; DROP TABLE `Ｔ２`; DROP TABLE `Ｔ３`; @@ -2733,6 +2052,3 @@ DROP TABLE `Ｔ６`; DROP TABLE `Ｔ７`; DROP TABLE `Ｔ８`; DROP TABLE `Ｔ９`; -DROP TABLE `Ｔ１０`; -DROP TABLE `Ｔ１１`; -DROP TABLE `Ｔ１２`; diff --git a/mysql-test/suite/jp/r/jp_trim_sjis.result b/mysql-test/suite/jp/r/jp_trim_sjis.result index e6ab86fd20a..604b2afcae5 100644 --- a/mysql-test/suite/jp/r/jp_trim_sjis.result +++ b/mysql-test/suite/jp/r/jp_trim_sjis.result @@ -1,27 +1,11 @@ -drop table if exists `sP`; -drop table if exists `sQ`; -drop table if exists `sR`; -drop table if exists `sS`; -drop table if exists `sT`; -drop table if exists `sU`; -drop table if exists `sV`; -drop table if exists `sW`; -drop table if exists `sX`; -drop table if exists `sPO`; SET NAMES sjis; SET character_set_database = sjis; -CREATE TABLE `sP` (`bP` char(12), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = innodb; -CREATE TABLE `sQ` (`bP` char(12), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = innodb; -CREATE TABLE `sR` (`bP` char(12), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = innodb; -CREATE TABLE `sS` (`bP` char(12), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; -CREATE TABLE `sT` (`bP` char(12), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; -CREATE TABLE `sU` (`bP` char(12), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; -CREATE TABLE `sV` (`bP` char(12), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sW` (`bP` char(12), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sX` (`bP` char(12), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPO` (`bP` char(12), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPP` (`bP` char(12), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPQ` (`bP` char(12), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; +DROP TABLE IF EXISTS `sP`; +DROP TABLE IF EXISTS `sQ`; +DROP TABLE IF EXISTS `sR`; +CREATE TABLE `sP` (`bP` CHAR(12), INDEX(`bP`)) DEFAULT CHARSET = sjis ENGINE = <engine_to_be_tested>; +CREATE TABLE `sQ` (`bP` CHAR(12), INDEX(`bP`)) DEFAULT CHARSET = sjis ENGINE = <engine_to_be_tested>; +CREATE TABLE `sR` (`bP` CHAR(12), INDEX(`bP`)) DEFAULT CHARSET = sjis ENGINE = <engine_to_be_tested>; INSERT INTO `sP` VALUES (''); INSERT INTO `sP` VALUES (''); INSERT INTO `sP` VALUES (''); @@ -49,87 +33,6 @@ INSERT INTO `sR` VALUES ('\\\\\\\'); INSERT INTO `sR` VALUES ('\\\\\\\\'); INSERT INTO `sR` VALUES ('\\\\\\\\\\\'); INSERT INTO `sR` VALUES (' \\\\\ '); -INSERT INTO `sS` VALUES (''); -INSERT INTO `sS` VALUES (''); -INSERT INTO `sS` VALUES (''); -INSERT INTO `sS` VALUES (''); -INSERT INTO `sS` VALUES (''); -INSERT INTO `sS` VALUES (''); -INSERT INTO `sS` VALUES (''); -INSERT INTO `sS` VALUES (''); -INSERT INTO `sS` VALUES (' '); -INSERT INTO `sT` VALUES (''); -INSERT INTO `sT` VALUES (''); -INSERT INTO `sT` VALUES (''); -INSERT INTO `sT` VALUES (''); -INSERT INTO `sT` VALUES (''); -INSERT INTO `sT` VALUES (''); -INSERT INTO `sT` VALUES (''); -INSERT INTO `sT` VALUES (''); -INSERT INTO `sT` VALUES (' '); -INSERT INTO `sU` VALUES ('\\\\\'); -INSERT INTO `sU` VALUES ('\\\\\\'); -INSERT INTO `sU` VALUES ('\\\\\\\'); -INSERT INTO `sU` VALUES ('\\\\\\\\'); -INSERT INTO `sU` VALUES ('\\\\\\'); -INSERT INTO `sU` VALUES ('\\\\\\\'); -INSERT INTO `sU` VALUES ('\\\\\\\\'); -INSERT INTO `sU` VALUES ('\\\\\\\\\\\'); -INSERT INTO `sU` VALUES (' \\\\\ '); -INSERT INTO `sV` VALUES (''); -INSERT INTO `sV` VALUES (''); -INSERT INTO `sV` VALUES (''); -INSERT INTO `sV` VALUES (''); -INSERT INTO `sV` VALUES (''); -INSERT INTO `sV` VALUES (''); -INSERT INTO `sV` VALUES (''); -INSERT INTO `sV` VALUES (''); -INSERT INTO `sV` VALUES (' '); -INSERT INTO `sW` VALUES (''); -INSERT INTO `sW` VALUES (''); -INSERT INTO `sW` VALUES (''); -INSERT INTO `sW` VALUES (''); -INSERT INTO `sW` VALUES (''); -INSERT INTO `sW` VALUES (''); -INSERT INTO `sW` VALUES (''); -INSERT INTO `sW` VALUES (''); -INSERT INTO `sW` VALUES (' '); -INSERT INTO `sX` VALUES ('\\\\\'); -INSERT INTO `sX` VALUES ('\\\\\\'); -INSERT INTO `sX` VALUES ('\\\\\\\'); -INSERT INTO `sX` VALUES ('\\\\\\\\'); -INSERT INTO `sX` VALUES ('\\\\\\'); -INSERT INTO `sX` VALUES ('\\\\\\\'); -INSERT INTO `sX` VALUES ('\\\\\\\\'); -INSERT INTO `sX` VALUES ('\\\\\\\\\\\'); -INSERT INTO `sX` VALUES (' \\\\\ '); -INSERT INTO `sPO` VALUES (''); -INSERT INTO `sPO` VALUES (''); -INSERT INTO `sPO` VALUES (''); -INSERT INTO `sPO` VALUES (''); -INSERT INTO `sPO` VALUES (''); -INSERT INTO `sPO` VALUES (''); -INSERT INTO `sPO` VALUES (''); -INSERT INTO `sPO` VALUES (''); -INSERT INTO `sPO` VALUES (' '); -INSERT INTO `sPP` VALUES (''); -INSERT INTO `sPP` VALUES (''); -INSERT INTO `sPP` VALUES (''); -INSERT INTO `sPP` VALUES (''); -INSERT INTO `sPP` VALUES (''); -INSERT INTO `sPP` VALUES (''); -INSERT INTO `sPP` VALUES (''); -INSERT INTO `sPP` VALUES (''); -INSERT INTO `sPP` VALUES (' '); -INSERT INTO `sPQ` VALUES ('\\\\\'); -INSERT INTO `sPQ` VALUES ('\\\\\\'); -INSERT INTO `sPQ` VALUES ('\\\\\\\'); -INSERT INTO `sPQ` VALUES ('\\\\\\\\'); -INSERT INTO `sPQ` VALUES ('\\\\\\'); -INSERT INTO `sPQ` VALUES ('\\\\\\\'); -INSERT INTO `sPQ` VALUES ('\\\\\\\\'); -INSERT INTO `sPQ` VALUES ('\\\\\\\\\\\'); -INSERT INTO `sPQ` VALUES (' \\\\\ '); SELECT `bP`,TRIM(TRAILING '' FROM `bP`) FROM `sP`; bP TRIM(TRAILING '' FROM `bP`) @@ -218,8 +121,8 @@ SELECT `bP`,TRIM(`bP`) FROM `sQ`; -SELECT `bP`,TRIM(TRAILING '\'FROM `bP`) FROM `sR`; -bP TRIM(TRAILING '\'FROM `bP`) +SELECT `bP`,TRIM(TRAILING '\' FROM `bP`) FROM `sR`; +bP TRIM(TRAILING '\' FROM `bP`) \\\\\ \\\\\ \\\\\ \\\\\ \\\\\\ \\\\\ @@ -262,7 +165,45 @@ SELECT `bP`,TRIM(`bP`) FROM `sR`; \\\\\\\ \\\\\\\ \\\\\\\\ \\\\\\\\ \\\\\\\\\\\ \\\\\\\\\\\ -SELECT `bP`,TRIM(TRAILING '' FROM `bP`) FROM `sS`; +DROP TABLE `sP`; +DROP TABLE `sQ`; +DROP TABLE `sR`; +SET NAMES sjis; +SET character_set_database = sjis; +DROP TABLE IF EXISTS `sP`; +DROP TABLE IF EXISTS `sQ`; +DROP TABLE IF EXISTS `sR`; +CREATE TABLE `sP` (`bP` CHAR(12), INDEX(`bP`)) DEFAULT CHARSET = sjis ENGINE = <engine_to_be_tested>; +CREATE TABLE `sQ` (`bP` CHAR(12), INDEX(`bP`)) DEFAULT CHARSET = sjis ENGINE = <engine_to_be_tested>; +CREATE TABLE `sR` (`bP` CHAR(12), INDEX(`bP`)) DEFAULT CHARSET = sjis ENGINE = <engine_to_be_tested>; +INSERT INTO `sP` VALUES (''); +INSERT INTO `sP` VALUES (''); +INSERT INTO `sP` VALUES (''); +INSERT INTO `sP` VALUES (''); +INSERT INTO `sP` VALUES (''); +INSERT INTO `sP` VALUES (''); +INSERT INTO `sP` VALUES (''); +INSERT INTO `sP` VALUES (''); +INSERT INTO `sP` VALUES (' '); +INSERT INTO `sQ` VALUES (''); +INSERT INTO `sQ` VALUES (''); +INSERT INTO `sQ` VALUES (''); +INSERT INTO `sQ` VALUES (''); +INSERT INTO `sQ` VALUES (''); +INSERT INTO `sQ` VALUES (''); +INSERT INTO `sQ` VALUES (''); +INSERT INTO `sQ` VALUES (''); +INSERT INTO `sQ` VALUES (' '); +INSERT INTO `sR` VALUES ('\\\\\'); +INSERT INTO `sR` VALUES ('\\\\\\'); +INSERT INTO `sR` VALUES ('\\\\\\\'); +INSERT INTO `sR` VALUES ('\\\\\\\\'); +INSERT INTO `sR` VALUES ('\\\\\\'); +INSERT INTO `sR` VALUES ('\\\\\\\'); +INSERT INTO `sR` VALUES ('\\\\\\\\'); +INSERT INTO `sR` VALUES ('\\\\\\\\\\\'); +INSERT INTO `sR` VALUES (' \\\\\ '); +SELECT `bP`,TRIM(TRAILING '' FROM `bP`) FROM `sP`; bP TRIM(TRAILING '' FROM `bP`) @@ -273,7 +214,7 @@ SELECT `bP`,TRIM(TRAILING '' FROM `bP`) FROM `sS`; -SELECT `bP`,TRIM(LEADING '' FROM `bP`) FROM `sS`; +SELECT `bP`,TRIM(LEADING '' FROM `bP`) FROM `sP`; bP TRIM(LEADING '' FROM `bP`) @@ -284,7 +225,7 @@ SELECT `bP`,TRIM(LEADING '' FROM `bP`) FROM `sS`; -SELECT `bP`,TRIM(BOTH '' FROM `bP`) FROM `sS`; +SELECT `bP`,TRIM(BOTH '' FROM `bP`) FROM `sP`; bP TRIM(BOTH '' FROM `bP`) @@ -295,7 +236,7 @@ SELECT `bP`,TRIM(BOTH '' FROM `bP`) FROM `sS`; -SELECT `bP`,TRIM(`bP`) FROM `sS`; +SELECT `bP`,TRIM(`bP`) FROM `sP`; bP TRIM(`bP`) @@ -306,7 +247,7 @@ SELECT `bP`,TRIM(`bP`) FROM `sS`; -SELECT `bP`,TRIM(TRAILING '' FROM `bP`) FROM `sT`; +SELECT `bP`,TRIM(TRAILING '' FROM `bP`) FROM `sQ`; bP TRIM(TRAILING '' FROM `bP`) @@ -317,7 +258,7 @@ SELECT `bP`,TRIM(TRAILING '' FROM `bP`) FROM `sT`; -SELECT `bP`,TRIM(LEADING '' FROM `bP`) FROM `sT`; +SELECT `bP`,TRIM(LEADING '' FROM `bP`) FROM `sQ`; bP TRIM(LEADING '' FROM `bP`) @@ -328,7 +269,7 @@ SELECT `bP`,TRIM(LEADING '' FROM `bP`) FROM `sT`; -SELECT `bP`,TRIM(BOTH '' FROM `bP`) FROM `sT`; +SELECT `bP`,TRIM(BOTH '' FROM `bP`) FROM `sQ`; bP TRIM(BOTH '' FROM `bP`) @@ -339,7 +280,7 @@ SELECT `bP`,TRIM(BOTH '' FROM `bP`) FROM `sT`; -SELECT `bP`,TRIM(`bP`) FROM `sT`; +SELECT `bP`,TRIM(`bP`) FROM `sQ`; bP TRIM(`bP`) @@ -350,7 +291,7 @@ SELECT `bP`,TRIM(`bP`) FROM `sT`; -SELECT `bP`,TRIM(TRAILING '\' FROM `bP`) FROM `sU`; +SELECT `bP`,TRIM(TRAILING '\' FROM `bP`) FROM `sR`; bP TRIM(TRAILING '\' FROM `bP`) \\\\\ \\\\\ \\\\\ \\\\\ @@ -361,7 +302,7 @@ SELECT `bP`,TRIM(TRAILING '\' FROM `bP`) FROM `sU`; \\\\\\\ \\\\\\\ \\\\\\\\ \\\\\\\\ \\\\\\\\\\\ \\\\\\\\ -SELECT `bP`,TRIM(LEADING '\' FROM `bP`) FROM `sU`; +SELECT `bP`,TRIM(LEADING '\' FROM `bP`) FROM `sR`; bP TRIM(LEADING '\' FROM `bP`) \\\\\ \\\\\ \\\\\ \\\\\ @@ -372,7 +313,7 @@ SELECT `bP`,TRIM(LEADING '\' FROM `bP`) FROM `sU`; \\\\\\\ \\\\\ \\\\\\\\ \\\\\ \\\\\\\\\\\ \\\\\\\\ -SELECT `bP`,TRIM(BOTH '\' FROM `bP`) FROM `sU`; +SELECT `bP`,TRIM(BOTH '\' FROM `bP`) FROM `sR`; bP TRIM(BOTH '\' FROM `bP`) \\\\\ \\\\\ \\\\\ \\\\\ @@ -383,7 +324,7 @@ SELECT `bP`,TRIM(BOTH '\' FROM `bP`) FROM `sU`; \\\\\\\ \\\\\ \\\\\\\\ \\\\\ \\\\\\\\\\\ \\\\\ -SELECT `bP`,TRIM(`bP`) FROM `sU`; +SELECT `bP`,TRIM(`bP`) FROM `sR`; bP TRIM(`bP`) \\\\\ \\\\\ \\\\\ \\\\\ @@ -394,139 +335,45 @@ SELECT `bP`,TRIM(`bP`) FROM `sU`; \\\\\\\ \\\\\\\ \\\\\\\\ \\\\\\\\ \\\\\\\\\\\ \\\\\\\\\\\ -SELECT `bP`,TRIM(TRAILING '' FROM `bP`) FROM `sV`; -bP TRIM(TRAILING '' FROM `bP`) - - - - - - - - - -SELECT `bP`,TRIM(LEADING '' FROM `bP`) FROM `sV`; -bP TRIM(LEADING '' FROM `bP`) - - - - - - - - - -SELECT `bP`,TRIM(BOTH '' FROM `bP`) FROM `sV`; -bP TRIM(BOTH '' FROM `bP`) - - - - - - - - - -SELECT `bP`,TRIM(`bP`) FROM `sV`; -bP TRIM(`bP`) - - - - - - - - - -SELECT `bP`,TRIM(TRAILING '' FROM `bP`) FROM `sW`; -bP TRIM(TRAILING '' FROM `bP`) - - - - - - - - - -SELECT `bP`,TRIM(LEADING '' FROM `bP`) FROM `sW`; -bP TRIM(LEADING '' FROM `bP`) - - - - - - - - - -SELECT `bP`,TRIM(BOTH '' FROM `bP`) FROM `sW`; -bP TRIM(BOTH '' FROM `bP`) - - - - - - - - - -SELECT `bP`,TRIM(`bP`) FROM `sW`; -bP TRIM(`bP`) - - - - - - - - - -SELECT `bP`,TRIM(TRAILING '\' FROM `bP`) FROM `sX`; -bP TRIM(TRAILING '\' FROM `bP`) -\\\\\ \\\\\ -\\\\\\ \\\\\ -\\\\\\\ \\\\\ -\\\\\\\\ \\\\\ -\\\\\\ \\\\\\ -\\\\\\\ \\\\\\\ -\\\\\\\\ \\\\\\\\ -\\\\\\\\\\\ \\\\\\\\ - \\\\\ \\\\\ -SELECT `bP`,TRIM(LEADING '\' FROM `bP`) FROM `sX`; -bP TRIM(LEADING '\' FROM `bP`) -\\\\\ \\\\\ -\\\\\\ \\\\\\ -\\\\\\\ \\\\\\\ -\\\\\\\\ \\\\\\\\ -\\\\\\ \\\\\ -\\\\\\\ \\\\\ -\\\\\\\\ \\\\\ -\\\\\\\\\\\ \\\\\\\\ - \\\\\ \\\\\ -SELECT `bP`,TRIM(BOTH '\' FROM `bP`) FROM `sX`; -bP TRIM(BOTH '\' FROM `bP`) -\\\\\ \\\\\ -\\\\\\ \\\\\ -\\\\\\\ \\\\\ -\\\\\\\\ \\\\\ -\\\\\\ \\\\\ -\\\\\\\ \\\\\ -\\\\\\\\ \\\\\ -\\\\\\\\\\\ \\\\\ - \\\\\ \\\\\ -SELECT `bP`,TRIM(`bP`) FROM `sX`; -bP TRIM(`bP`) -\\\\\ \\\\\ -\\\\\\ \\\\\\ -\\\\\\\ \\\\\\\ -\\\\\\\\ \\\\\\\\ -\\\\\\ \\\\\\ -\\\\\\\ \\\\\\\ -\\\\\\\\ \\\\\\\\ -\\\\\\\\\\\ \\\\\\\\\\\ - \\\\\ \\\\\ -SELECT `bP`,TRIM(TRAILING '' FROM `bP`) FROM `sPO`; +DROP TABLE `sP`; +DROP TABLE `sQ`; +DROP TABLE `sR`; +SET NAMES sjis; +SET character_set_database = sjis; +DROP TABLE IF EXISTS `sP`; +DROP TABLE IF EXISTS `sQ`; +DROP TABLE IF EXISTS `sR`; +CREATE TABLE `sP` (`bP` CHAR(12), INDEX(`bP`)) DEFAULT CHARSET = sjis ENGINE = <engine_to_be_tested>; +CREATE TABLE `sQ` (`bP` CHAR(12), INDEX(`bP`)) DEFAULT CHARSET = sjis ENGINE = <engine_to_be_tested>; +CREATE TABLE `sR` (`bP` CHAR(12), INDEX(`bP`)) DEFAULT CHARSET = sjis ENGINE = <engine_to_be_tested>; +INSERT INTO `sP` VALUES (''); +INSERT INTO `sP` VALUES (''); +INSERT INTO `sP` VALUES (''); +INSERT INTO `sP` VALUES (''); +INSERT INTO `sP` VALUES (''); +INSERT INTO `sP` VALUES (''); +INSERT INTO `sP` VALUES (''); +INSERT INTO `sP` VALUES (''); +INSERT INTO `sP` VALUES (' '); +INSERT INTO `sQ` VALUES (''); +INSERT INTO `sQ` VALUES (''); +INSERT INTO `sQ` VALUES (''); +INSERT INTO `sQ` VALUES (''); +INSERT INTO `sQ` VALUES (''); +INSERT INTO `sQ` VALUES (''); +INSERT INTO `sQ` VALUES (''); +INSERT INTO `sQ` VALUES (''); +INSERT INTO `sQ` VALUES (' '); +INSERT INTO `sR` VALUES ('\\\\\'); +INSERT INTO `sR` VALUES ('\\\\\\'); +INSERT INTO `sR` VALUES ('\\\\\\\'); +INSERT INTO `sR` VALUES ('\\\\\\\\'); +INSERT INTO `sR` VALUES ('\\\\\\'); +INSERT INTO `sR` VALUES ('\\\\\\\'); +INSERT INTO `sR` VALUES ('\\\\\\\\'); +INSERT INTO `sR` VALUES ('\\\\\\\\\\\'); +INSERT INTO `sR` VALUES (' \\\\\ '); +SELECT `bP`,TRIM(TRAILING '' FROM `bP`) FROM `sP`; bP TRIM(TRAILING '' FROM `bP`) @@ -537,7 +384,7 @@ SELECT `bP`,TRIM(TRAILING '' FROM `bP`) FROM `sPO`; -SELECT `bP`,TRIM(LEADING '' FROM `bP`) FROM `sPO`; +SELECT `bP`,TRIM(LEADING '' FROM `bP`) FROM `sP`; bP TRIM(LEADING '' FROM `bP`) @@ -548,7 +395,7 @@ SELECT `bP`,TRIM(LEADING '' FROM `bP`) FROM `sPO`; -SELECT `bP`,TRIM(BOTH '' FROM `bP`) FROM `sPO`; +SELECT `bP`,TRIM(BOTH '' FROM `bP`) FROM `sP`; bP TRIM(BOTH '' FROM `bP`) @@ -559,7 +406,7 @@ SELECT `bP`,TRIM(BOTH '' FROM `bP`) FROM `sPO`; -SELECT `bP`,TRIM(`bP`) FROM `sPO`; +SELECT `bP`,TRIM(`bP`) FROM `sP`; bP TRIM(`bP`) @@ -570,7 +417,7 @@ SELECT `bP`,TRIM(`bP`) FROM `sPO`; -SELECT `bP`,TRIM(TRAILING '' FROM `bP`) FROM `sPP`; +SELECT `bP`,TRIM(TRAILING '' FROM `bP`) FROM `sQ`; bP TRIM(TRAILING '' FROM `bP`) @@ -581,7 +428,7 @@ SELECT `bP`,TRIM(TRAILING '' FROM `bP`) FROM `sPP`; -SELECT `bP`,TRIM(LEADING '' FROM `bP`) FROM `sPP`; +SELECT `bP`,TRIM(LEADING '' FROM `bP`) FROM `sQ`; bP TRIM(LEADING '' FROM `bP`) @@ -592,7 +439,7 @@ SELECT `bP`,TRIM(LEADING '' FROM `bP`) FROM `sPP`; -SELECT `bP`,TRIM(BOTH '' FROM `bP`) FROM `sPP`; +SELECT `bP`,TRIM(BOTH '' FROM `bP`) FROM `sQ`; bP TRIM(BOTH '' FROM `bP`) @@ -603,7 +450,7 @@ SELECT `bP`,TRIM(BOTH '' FROM `bP`) FROM `sPP`; -SELECT `bP`,TRIM(`bP`) FROM `sPP`; +SELECT `bP`,TRIM(`bP`) FROM `sQ`; bP TRIM(`bP`) @@ -614,7 +461,7 @@ SELECT `bP`,TRIM(`bP`) FROM `sPP`; -SELECT `bP`,TRIM(TRAILING '\' FROM `bP`) FROM `sPQ`; +SELECT `bP`,TRIM(TRAILING '\' FROM `bP`) FROM `sR`; bP TRIM(TRAILING '\' FROM `bP`) \\\\\ \\\\\ \\\\\\ \\\\\ @@ -625,7 +472,7 @@ SELECT `bP`,TRIM(TRAILING '\' FROM `bP`) FROM `sPQ`; \\\\\\\\ \\\\\\\\ \\\\\\\\\\\ \\\\\\\\ \\\\\ \\\\\ -SELECT `bP`,TRIM(LEADING '\' FROM `bP`) FROM `sPQ`; +SELECT `bP`,TRIM(LEADING '\' FROM `bP`) FROM `sR`; bP TRIM(LEADING '\' FROM `bP`) \\\\\ \\\\\ \\\\\\ \\\\\\ @@ -636,7 +483,7 @@ SELECT `bP`,TRIM(LEADING '\' FROM `bP`) FROM `sPQ`; \\\\\\\\ \\\\\ \\\\\\\\\\\ \\\\\\\\ \\\\\ \\\\\ -SELECT `bP`,TRIM(BOTH '\' FROM `bP`) FROM `sPQ`; +SELECT `bP`,TRIM(BOTH '\' FROM `bP`) FROM `sR`; bP TRIM(BOTH '\' FROM `bP`) \\\\\ \\\\\ \\\\\\ \\\\\ @@ -647,7 +494,7 @@ SELECT `bP`,TRIM(BOTH '\' FROM `bP`) FROM `sPQ`; \\\\\\\\ \\\\\ \\\\\\\\\\\ \\\\\ \\\\\ \\\\\ -SELECT `bP`,TRIM(`bP`) FROM `sPQ`; +SELECT `bP`,TRIM(`bP`) FROM `sR`; bP TRIM(`bP`) \\\\\ \\\\\ \\\\\\ \\\\\\ @@ -661,12 +508,3 @@ SELECT `bP`,TRIM(`bP`) FROM `sPQ`; DROP TABLE `sP`; DROP TABLE `sQ`; DROP TABLE `sR`; -DROP TABLE `sS`; -DROP TABLE `sT`; -DROP TABLE `sU`; -DROP TABLE `sV`; -DROP TABLE `sW`; -DROP TABLE `sX`; -DROP TABLE `sPO`; -DROP TABLE `sPP`; -DROP TABLE `sPQ`; diff --git a/mysql-test/suite/jp/r/jp_trim_ucs2.result b/mysql-test/suite/jp/r/jp_trim_ucs2.result index 6ef73301a49..31ae0ab9115 100644 --- a/mysql-test/suite/jp/r/jp_trim_ucs2.result +++ b/mysql-test/suite/jp/r/jp_trim_ucs2.result @@ -7,7 +7,6 @@ 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; @@ -17,12 +16,9 @@ CREATE TABLE `ԣ` (`ã` char(12), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engi CREATE TABLE `ԣ` (`ã` char(12), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = myisam; CREATE TABLE `ԣ` (`ã` char(12), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = myisam; CREATE TABLE `ԣ` (`ã` char(12), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = myisam; -CREATE TABLE `ԣ` (`ã` char(12), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` char(12), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` char(12), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` char(12), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = bdb; -CREATE TABLE `ԣ` (`ã` char(12), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = bdb; -CREATE TABLE `ԣ` (`ã` char(12), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = bdb; +CREATE TABLE `ԣ` (`ã` char(12), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(12), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(12), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = MEMORY; INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES (''); @@ -104,33 +100,6 @@ 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 (''); -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 `ԣ`; ã TRIM(TRAILING '' FROM `ã`) @@ -527,138 +496,6 @@ SELECT `ã`,TRIM(`ã`) FROM `ԣ`; ݏޏߏ ݏޏߏ ݏޏߏ ݏޏߏ ݏޏߏ ݏޏߏ -SELECT `ã`,TRIM(TRAILING '' FROM `ã`) FROM `ԣ`; -ã TRIM(TRAILING '' FROM `ã`) - - - - - - - - - -SELECT `ã`,TRIM(LEADING '' FROM `ã`) FROM `ԣ`; -ã TRIM(LEADING '' FROM `ã`) - - - - - - - - - -SELECT `ã`,TRIM(BOTH '' FROM `ã`) FROM `ԣ`; -ã TRIM(BOTH '' FROM `ã`) - - - - - - - - - -SELECT `ã`,TRIM(`ã`) FROM `ԣ`; -ã TRIM(`ã`) - - - - - - - - - -SELECT `ã`,TRIM(TRAILING '' FROM `ã`) FROM `ԣ`; -ã TRIM(TRAILING '' FROM `ã`) - - - - - - - - - -SELECT `ã`,TRIM(LEADING '' FROM `ã`) FROM `ԣ`; -ã TRIM(LEADING '' FROM `ã`) - - - - - - - - - -SELECT `ã`,TRIM(BOTH '' FROM `ã`) FROM `ԣ`; -ã TRIM(BOTH '' FROM `ã`) - - - - - - - - - -SELECT `ã`,TRIM(`ã`) FROM `ԣ`; -ã TRIM(`ã`) - - - - - - - - - -SELECT `ã`,TRIM(TRAILING '' FROM `ã`) FROM `ԣ`; -ã TRIM(TRAILING '' FROM `ã`) -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ - ݏޏߏ ݏޏߏ -SELECT `ã`,TRIM(LEADING '' FROM `ã`) FROM `ԣ`; -ã TRIM(LEADING '' FROM `ã`) -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ - ݏޏߏ ݏޏߏ -SELECT `ã`,TRIM(BOTH '' FROM `ã`) FROM `ԣ`; -ã TRIM(BOTH '' FROM `ã`) -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ - ݏޏߏ ݏޏߏ -SELECT `ã`,TRIM(`ã`) FROM `ԣ`; -ã TRIM(`ã`) -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ - ݏޏߏ ݏޏߏ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -668,6 +505,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/r/jp_trim_ujis.result b/mysql-test/suite/jp/r/jp_trim_ujis.result index b79a1b24a37..c90d1a50308 100644 --- a/mysql-test/suite/jp/r/jp_trim_ujis.result +++ b/mysql-test/suite/jp/r/jp_trim_ujis.result @@ -7,7 +7,6 @@ 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(12), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = innodb; @@ -16,12 +15,9 @@ CREATE TABLE `ԣ` (`ã` char(12), INDEX(`ã`)) DEFAULT CHARSET = ujis engi CREATE TABLE `ԣ` (`ã` char(12), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = myisam; CREATE TABLE `ԣ` (`ã` char(12), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = myisam; CREATE TABLE `ԣ` (`ã` char(12), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = myisam; -CREATE TABLE `ԣ` (`ã` char(12), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` char(12), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` char(12), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` char(12), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = bdb; -CREATE TABLE `ԣ` (`ã` char(12), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = bdb; -CREATE TABLE `ԣ` (`ã` char(12), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = bdb; +CREATE TABLE `ԣ` (`ã` char(12), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(12), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(12), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = MEMORY; INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES (''); @@ -103,33 +99,6 @@ 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 (''); -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 `ԣ`; ã TRIM(TRAILING '' FROM `ã`) @@ -526,138 +495,6 @@ SELECT `ã`,TRIM(`ã`) FROM `ԣ`; ݏޏߏ ݏޏߏ ݏޏߏ ݏޏߏ ݏޏߏ ݏޏߏ -SELECT `ã`,TRIM(TRAILING '' FROM `ã`) FROM `ԣ`; -ã TRIM(TRAILING '' FROM `ã`) - - - - - - - - - -SELECT `ã`,TRIM(LEADING '' FROM `ã`) FROM `ԣ`; -ã TRIM(LEADING '' FROM `ã`) - - - - - - - - - -SELECT `ã`,TRIM(BOTH '' FROM `ã`) FROM `ԣ`; -ã TRIM(BOTH '' FROM `ã`) - - - - - - - - - -SELECT `ã`,TRIM(`ã`) FROM `ԣ`; -ã TRIM(`ã`) - - - - - - - - - -SELECT `ã`,TRIM(TRAILING '' FROM `ã`) FROM `ԣ`; -ã TRIM(TRAILING '' FROM `ã`) - - - - - - - - - -SELECT `ã`,TRIM(LEADING '' FROM `ã`) FROM `ԣ`; -ã TRIM(LEADING '' FROM `ã`) - - - - - - - - - -SELECT `ã`,TRIM(BOTH '' FROM `ã`) FROM `ԣ`; -ã TRIM(BOTH '' FROM `ã`) - - - - - - - - - -SELECT `ã`,TRIM(`ã`) FROM `ԣ`; -ã TRIM(`ã`) - - - - - - - - - -SELECT `ã`,TRIM(TRAILING '' FROM `ã`) FROM `ԣ`; -ã TRIM(TRAILING '' FROM `ã`) -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ - ݏޏߏ ݏޏߏ -SELECT `ã`,TRIM(LEADING '' FROM `ã`) FROM `ԣ`; -ã TRIM(LEADING '' FROM `ã`) -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ - ݏޏߏ ݏޏߏ -SELECT `ã`,TRIM(BOTH '' FROM `ã`) FROM `ԣ`; -ã TRIM(BOTH '' FROM `ã`) -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ - ݏޏߏ ݏޏߏ -SELECT `ã`,TRIM(`ã`) FROM `ԣ`; -ã TRIM(`ã`) -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ -ݏޏߏ ݏޏߏ - ݏޏߏ ݏޏߏ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -667,6 +504,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/r/jp_trim_utf8.result b/mysql-test/suite/jp/r/jp_trim_utf8.result index 99fb785e495..4f4849c9f3c 100644 --- a/mysql-test/suite/jp/r/jp_trim_utf8.result +++ b/mysql-test/suite/jp/r/jp_trim_utf8.result @@ -7,7 +7,6 @@ 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(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = innodb; @@ -16,12 +15,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf CREATE TABLE `Ｔ４` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam; CREATE TABLE `Ｔ５` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam; CREATE TABLE `Ｔ６` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam; -CREATE TABLE `Ｔ７` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ８` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ９` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ１０` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb; -CREATE TABLE `Ｔ１１` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb; -CREATE TABLE `Ｔ１２` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb; +CREATE TABLE `Ｔ７` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ８` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ９` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY; INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'); INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵｶ'); INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵｶｶ'); @@ -103,33 +99,6 @@ 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 ('かかあいうえお'); -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 `Ｔ１`; Ｃ１ TRIM(TRAILING 'ｶ' FROM `Ｃ１`) ｱｲｳｴｵ ｱｲｳｴｵ @@ -526,138 +495,6 @@ SELECT `Ｃ１`,TRIM(`Ｃ１`) FROM `Ｔ９`; 丂丂丂龔龖龗龞龡 丂丂丂龔龖龗龞龡 丂丂丂龔龖龗龞龡丂丂丂 丂丂丂龔龖龗龞龡丂丂丂 龔龖龗龞龡 龔龖龗龞龡 -SELECT `Ｃ１`,TRIM(TRAILING 'ｶ' FROM `Ｃ１`) FROM `Ｔ１０`; -Ｃ１ TRIM(TRAILING 'ｶ' FROM `Ｃ１`) -ｱｲｳｴｵ ｱｲｳｴｵ -ｱｲｳｴｵｶ ｱｲｳｴｵ -ｱｲｳｴｵｶｶ ｱｲｳｴｵ -ｱｲｳｴｵｶｶｶ ｱｲｳｴｵ -ｶｱｲｳｴｵ ｶｱｲｳｴｵ -ｶｶｱｲｳｴｵ ｶｶｱｲｳｴｵ -ｶｶｶｱｲｳｴｵ ｶｶｶｱｲｳｴｵ -ｶｶｶｱｲｳｴｵｶｶｶ ｶｶｶｱｲｳｴｵ - ｱｲｳｴｵ ｱｲｳｴｵ -SELECT `Ｃ１`,TRIM(LEADING 'ｶ' FROM `Ｃ１`) FROM `Ｔ１０`; -Ｃ１ TRIM(LEADING 'ｶ' FROM `Ｃ１`) -ｱｲｳｴｵ ｱｲｳｴｵ -ｱｲｳｴｵｶ ｱｲｳｴｵｶ -ｱｲｳｴｵｶｶ ｱｲｳｴｵｶｶ -ｱｲｳｴｵｶｶｶ ｱｲｳｴｵｶｶｶ -ｶｱｲｳｴｵ ｱｲｳｴｵ -ｶｶｱｲｳｴｵ ｱｲｳｴｵ -ｶｶｶｱｲｳｴｵ ｱｲｳｴｵ -ｶｶｶｱｲｳｴｵｶｶｶ ｱｲｳｴｵｶｶｶ - ｱｲｳｴｵ ｱｲｳｴｵ -SELECT `Ｃ１`,TRIM(BOTH 'ｶ' FROM `Ｃ１`) FROM `Ｔ１０`; -Ｃ１ TRIM(BOTH 'ｶ' FROM `Ｃ１`) -ｱｲｳｴｵ ｱｲｳｴｵ -ｱｲｳｴｵｶ ｱｲｳｴｵ -ｱｲｳｴｵｶｶ ｱｲｳｴｵ -ｱｲｳｴｵｶｶｶ ｱｲｳｴｵ -ｶｱｲｳｴｵ ｱｲｳｴｵ -ｶｶｱｲｳｴｵ ｱｲｳｴｵ -ｶｶｶｱｲｳｴｵ ｱｲｳｴｵ -ｶｶｶｱｲｳｴｵｶｶｶ ｱｲｳｴｵ - ｱｲｳｴｵ ｱｲｳｴｵ -SELECT `Ｃ１`,TRIM(`Ｃ１`) FROM `Ｔ１０`; -Ｃ１ TRIM(`Ｃ１`) -ｱｲｳｴｵ ｱｲｳｴｵ -ｱｲｳｴｵｶ ｱｲｳｴｵｶ -ｱｲｳｴｵｶｶ ｱｲｳｴｵｶｶ -ｱｲｳｴｵｶｶｶ ｱｲｳｴｵｶｶｶ -ｶｱｲｳｴｵ ｶｱｲｳｴｵ -ｶｶｱｲｳｴｵ ｶｶｱｲｳｴｵ -ｶｶｶｱｲｳｴｵ ｶｶｶｱｲｳｴｵ -ｶｶｶｱｲｳｴｵｶｶｶ ｶｶｶｱｲｳｴｵｶｶｶ - ｱｲｳｴｵ ｱｲｳｴｵ -SELECT `Ｃ１`,TRIM(TRAILING 'か' FROM `Ｃ１`) FROM `Ｔ１１`; -Ｃ１ TRIM(TRAILING 'か' FROM `Ｃ１`) -あいうえお あいうえお -あいうえおか あいうえお -あいうえおかか あいうえお -あいうえおかかか あいうえお -かあいうえお かあいうえお -かかあいうえお かかあいうえお -かかかあいうえお かかかあいうえお -かかかあいうえおかかか かかかあいうえお - あいうえお あいうえお -SELECT `Ｃ１`,TRIM(LEADING 'か' FROM `Ｃ１`) FROM `Ｔ１１`; -Ｃ１ TRIM(LEADING 'か' FROM `Ｃ１`) -あいうえお あいうえお -あいうえおか あいうえおか -あいうえおかか あいうえおかか -あいうえおかかか あいうえおかかか -かあいうえお あいうえお -かかあいうえお あいうえお -かかかあいうえお あいうえお -かかかあいうえおかかか あいうえおかかか - あいうえお あいうえお -SELECT `Ｃ１`,TRIM(BOTH 'か' FROM `Ｃ１`) FROM `Ｔ１１`; -Ｃ１ TRIM(BOTH 'か' FROM `Ｃ１`) -あいうえお あいうえお -あいうえおか あいうえお -あいうえおかか あいうえお -あいうえおかかか あいうえお -かあいうえお あいうえお -かかあいうえお あいうえお -かかかあいうえお あいうえお -かかかあいうえおかかか あいうえお - あいうえお あいうえお -SELECT `Ｃ１`,TRIM(`Ｃ１`) FROM `Ｔ１１`; -Ｃ１ TRIM(`Ｃ１`) -あいうえお あいうえお -あいうえおか あいうえおか -あいうえおかか あいうえおかか -あいうえおかかか あいうえおかかか -かあいうえお かあいうえお -かかあいうえお かかあいうえお -かかかあいうえお かかかあいうえお -かかかあいうえおかかか かかかあいうえおかかか - あいうえお あいうえお -SELECT `Ｃ１`,TRIM(TRAILING '丂' FROM `Ｃ１`) FROM `Ｔ１２`; -Ｃ１ TRIM(TRAILING '丂' FROM `Ｃ１`) -龔龖龗龞龡 龔龖龗龞龡 -龔龖龗龞龡丂 龔龖龗龞龡 -龔龖龗龞龡丂丂 龔龖龗龞龡 -龔龖龗龞龡丂丂丂 龔龖龗龞龡 -丂龔龖龗龞龡 丂龔龖龗龞龡 -丂丂龔龖龗龞龡 丂丂龔龖龗龞龡 -丂丂丂龔龖龗龞龡 丂丂丂龔龖龗龞龡 -丂丂丂龔龖龗龞龡丂丂丂 丂丂丂龔龖龗龞龡 - 龔龖龗龞龡 龔龖龗龞龡 -SELECT `Ｃ１`,TRIM(LEADING '丂' FROM `Ｃ１`) FROM `Ｔ１２`; -Ｃ１ TRIM(LEADING '丂' FROM `Ｃ１`) -龔龖龗龞龡 龔龖龗龞龡 -龔龖龗龞龡丂 龔龖龗龞龡丂 -龔龖龗龞龡丂丂 龔龖龗龞龡丂丂 -龔龖龗龞龡丂丂丂 龔龖龗龞龡丂丂丂 -丂龔龖龗龞龡 龔龖龗龞龡 -丂丂龔龖龗龞龡 龔龖龗龞龡 -丂丂丂龔龖龗龞龡 龔龖龗龞龡 -丂丂丂龔龖龗龞龡丂丂丂 龔龖龗龞龡丂丂丂 - 龔龖龗龞龡 龔龖龗龞龡 -SELECT `Ｃ１`,TRIM(BOTH '丂' FROM `Ｃ１`) FROM `Ｔ１２`; -Ｃ１ TRIM(BOTH '丂' FROM `Ｃ１`) -龔龖龗龞龡 龔龖龗龞龡 -龔龖龗龞龡丂 龔龖龗龞龡 -龔龖龗龞龡丂丂 龔龖龗龞龡 -龔龖龗龞龡丂丂丂 龔龖龗龞龡 -丂龔龖龗龞龡 龔龖龗龞龡 -丂丂龔龖龗龞龡 龔龖龗龞龡 -丂丂丂龔龖龗龞龡 龔龖龗龞龡 -丂丂丂龔龖龗龞龡丂丂丂 龔龖龗龞龡 - 龔龖龗龞龡 龔龖龗龞龡 -SELECT `Ｃ１`,TRIM(`Ｃ１`) FROM `Ｔ１２`; -Ｃ１ TRIM(`Ｃ１`) -龔龖龗龞龡 龔龖龗龞龡 -龔龖龗龞龡丂 龔龖龗龞龡丂 -龔龖龗龞龡丂丂 龔龖龗龞龡丂丂 -龔龖龗龞龡丂丂丂 龔龖龗龞龡丂丂丂 -丂龔龖龗龞龡 丂龔龖龗龞龡 -丂丂龔龖龗龞龡 丂丂龔龖龗龞龡 -丂丂丂龔龖龗龞龡 丂丂丂龔龖龗龞龡 -丂丂丂龔龖龗龞龡丂丂丂 丂丂丂龔龖龗龞龡丂丂丂 - 龔龖龗龞龡 龔龖龗龞龡 DROP TABLE `Ｔ１`; DROP TABLE `Ｔ２`; DROP TABLE `Ｔ３`; @@ -667,6 +504,3 @@ DROP TABLE `Ｔ６`; DROP TABLE `Ｔ７`; DROP TABLE `Ｔ８`; DROP TABLE `Ｔ９`; -DROP TABLE `Ｔ１０`; -DROP TABLE `Ｔ１１`; -DROP TABLE `Ｔ１２`; diff --git a/mysql-test/suite/jp/r/jp_union_ujis.result b/mysql-test/suite/jp/r/jp_union_ujis.result index 4b74c570ffe..00dc868b8e2 100644 --- a/mysql-test/suite/jp/r/jp_union_ujis.result +++ b/mysql-test/suite/jp/r/jp_union_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(1), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = innodb; @@ -202,104 +199,9 @@ SELECT * FROM `ԣ` UNION SELECT REPEAT(`ã`,5) FROM `ԣ` ORDER BY `ã`; DROP TABLE `ԣ` ; DROP TABLE `ԣ` ; DROP TABLE `ԣ` ; -CREATE TABLE `ԣ` (`ã` char(1), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = HEAP; -CREATE TABLE `ԣ` (`ã` char(1), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = HEAP; -CREATE TABLE `ԣ` (`ã` char(1), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = HEAP; -INSERT INTO `ԣ` VALUES(''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES(''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES(''),(''),(''),(''),(''),(''); -SELECT * FROM `ԣ` UNION DISTINCT SELECT * FROM `ԣ` ORDER BY `ã`; -ã - - - - - - -SELECT * FROM `ԣ` UNION ALL SELECT * FROM `ԣ` ORDER BY `ã`; -ã - - - - - - - - - - - - -(SELECT * FROM `ԣ`) UNION (SELECT * FROM `ԣ`) UNION (SELECT '') ORDER BY `ã`; -ã - - - - - - - -(SELECT '' AS `ã`) UNION (SELECT * FROM `ԣ`) UNION (SELECT * FROM `ԣ`) ORDER BY `ã`; -ã - - - - - - - -SELECT `ã`, COUNT(*) FROM `ԣ` GROUP BY `ã` UNION -SELECT `ã`, COUNT(*) FROM `ԣ` GROUP BY `ã` ORDER BY `ã`; -ã COUNT(*) - 2 - 2 - 2 - 2 - 2 - 2 -SELECT * FROM `ԣ` UNION DISTINCT -SELECT * FROM `ԣ` UNION ALL -SELECT * FROM `ԣ` ORDER BY `ã`; -ã - - - - - - - - - - - - -SELECT * FROM `ԣ` UNION ALL -SELECT * FROM `ԣ` UNION DISTINCT -SELECT * FROM `ԣ` ORDER BY `ã`; -ã - - - - - - - - - -SELECT * FROM `ԣ` UNION SELECT REPEAT(`ã`,5) FROM `ԣ` ORDER BY `ã`; -ã - - - -ݏݏݏݏ - - -DROP TABLE `ԣ` ; -DROP TABLE `ԣ` ; -DROP TABLE `ԣ` ; -CREATE TABLE `ԣ` (`ã` char(1), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = BDB; -CREATE TABLE `ԣ` (`ã` char(1), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = BDB; -CREATE TABLE `ԣ` (`ã` char(1), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = BDB; +CREATE TABLE `ԣ` (`ã` char(1), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(1), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(1), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = MEMORY; INSERT INTO `ԣ` VALUES(''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES(''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES(''),(''),(''),(''),(''),(''); diff --git a/mysql-test/suite/jp/r/jp_update_sjis.result b/mysql-test/suite/jp/r/jp_update_sjis.result index 65151cc7021..08d250a12e3 100644 --- a/mysql-test/suite/jp/r/jp_update_sjis.result +++ b/mysql-test/suite/jp/r/jp_update_sjis.result @@ -7,9 +7,6 @@ drop table if exists `sU`; 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(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = innodb; @@ -18,12 +15,9 @@ CREATE TABLE `sR` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engin CREATE TABLE `sS` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sT` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sU` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; -CREATE TABLE `sV` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sW` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sX` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPO` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPP` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPQ` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; +CREATE TABLE `sV` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sW` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sX` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; INSERT INTO `sP` VALUES (''); INSERT INTO `sQ` VALUES (''); INSERT INTO `sR` VALUES ('\\\\\'); @@ -33,9 +27,6 @@ INSERT INTO `sU` VALUES ('\\\\\'); INSERT INTO `sV` VALUES (''); INSERT INTO `sW` VALUES (''); INSERT INTO `sX` VALUES ('\\\\\'); -INSERT INTO `sPO` VALUES (''); -INSERT INTO `sPP` VALUES (''); -INSERT INTO `sPQ` VALUES ('\\\\\'); UPDATE `sP` SET `bP` = (''); UPDATE `sQ` SET `bP` = (''); UPDATE `sR` SET `bP` = ('\\\\\'); @@ -45,9 +36,6 @@ UPDATE `sU` SET `bP` = ('\\\\\'); UPDATE `sV` SET `bP` = (''); UPDATE `sW` SET `bP` = (''); UPDATE `sX` SET `bP` = ('\\\\\'); -UPDATE `sPO` SET `bP` = (''); -UPDATE `sPP` SET `bP` = (''); -UPDATE `sPQ` SET `bP` = ('\\\\\'); SELECT * FROM `sP`; bP @@ -75,15 +63,6 @@ SELECT * FROM `sW`; SELECT * FROM `sX`; bP \\\\\ -SELECT * FROM `sPO`; -bP - -SELECT * FROM `sPP`; -bP - -SELECT * FROM `sPQ`; -bP -\\\\\ DROP TABLE `sP`; DROP TABLE `sQ`; DROP TABLE `sR`; @@ -93,6 +72,3 @@ DROP TABLE `sU`; DROP TABLE `sV`; DROP TABLE `sW`; DROP TABLE `sX`; -DROP TABLE `sPO`; -DROP TABLE `sPP`; -DROP TABLE `sPQ`; diff --git a/mysql-test/suite/jp/r/jp_update_ucs2.result b/mysql-test/suite/jp/r/jp_update_ucs2.result index 2796958ac3e..998126a4e4c 100644 --- a/mysql-test/suite/jp/r/jp_update_ucs2.result +++ b/mysql-test/suite/jp/r/jp_update_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 `ԣ` (`ã` char(5), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engin 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 `ԣ` VALUES ('ݏޏߏ'); INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES ('ݏޏߏ'); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'); UPDATE `ԣ` SET `ã` = (''); UPDATE `ԣ` SET `ã` = (''); UPDATE `ԣ` SET `ã` = ('ȏɏʏˏ'); @@ -46,9 +37,6 @@ UPDATE `ԣ` SET `ã` = ('ȏɏʏˏ'); UPDATE `ԣ` SET `ã` = (''); UPDATE `ԣ` SET `ã` = (''); UPDATE `ԣ` SET `ã` = ('ȏɏʏˏ'); -UPDATE `ԣ` SET `ã` = (''); -UPDATE `ԣ` SET `ã` = (''); -UPDATE `ԣ` SET `ã` = ('ȏɏʏˏ'); SELECT * FROM `ԣ`; ã @@ -76,15 +64,6 @@ SELECT * FROM `ԣ`; SELECT * FROM `ԣ`; ã ȏɏʏˏ -SELECT * FROM `ԣ`; -ã - -SELECT * FROM `ԣ`; -ã - -SELECT * FROM `ԣ`; -ã -ȏɏʏˏ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -94,6 +73,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/r/jp_update_ujis.result b/mysql-test/suite/jp/r/jp_update_ujis.result index e9633d14f0c..f976436030b 100644 --- a/mysql-test/suite/jp/r/jp_update_ujis.result +++ b/mysql-test/suite/jp/r/jp_update_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 `ԣ` (`ã` char(5), INDEX(`ã`)) DEFAULT CHARSET = ujis engin 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 `ԣ` VALUES ('ݏޏߏ'); INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES ('ݏޏߏ'); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'); UPDATE `ԣ` SET `ã` = (''); UPDATE `ԣ` SET `ã` = (''); UPDATE `ԣ` SET `ã` = ('ȏɏʏˏ'); @@ -45,9 +36,6 @@ UPDATE `ԣ` SET `ã` = ('ȏɏʏˏ'); UPDATE `ԣ` SET `ã` = (''); UPDATE `ԣ` SET `ã` = (''); UPDATE `ԣ` SET `ã` = ('ȏɏʏˏ'); -UPDATE `ԣ` SET `ã` = (''); -UPDATE `ԣ` SET `ã` = (''); -UPDATE `ԣ` SET `ã` = ('ȏɏʏˏ'); SELECT * FROM `ԣ`; ã @@ -75,15 +63,6 @@ SELECT * FROM `ԣ`; SELECT * FROM `ԣ`; ã ȏɏʏˏ -SELECT * FROM `ԣ`; -ã - -SELECT * FROM `ԣ`; -ã - -SELECT * FROM `ԣ`; -ã -ȏɏʏˏ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -93,6 +72,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/r/jp_update_utf8.result b/mysql-test/suite/jp/r/jp_update_utf8.result index f690d2f0247..15d3214534b 100644 --- a/mysql-test/suite/jp/r/jp_update_utf8.result +++ b/mysql-test/suite/jp/r/jp_update_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 ('龔龖龗龞龡'); UPDATE `Ｔ１` SET `Ｃ１` = ('ｶｷｸｹｺ'); UPDATE `Ｔ２` SET `Ｃ１` = ('かきくけこ'); UPDATE `Ｔ３` SET `Ｃ１` = ('齗齘齚齝齞'); @@ -45,9 +36,6 @@ UPDATE `Ｔ６` SET `Ｃ１` = ('齗齘齚齝齞'); UPDATE `Ｔ７` SET `Ｃ１` = ('ｶｷｸｹｺ'); UPDATE `Ｔ８` SET `Ｃ１` = ('かきくけこ'); UPDATE `Ｔ９` SET `Ｃ１` = ('齗齘齚齝齞'); -UPDATE `Ｔ１０` SET `Ｃ１` = ('ｶｷｸｹｺ'); -UPDATE `Ｔ１１` SET `Ｃ１` = ('かきくけこ'); -UPDATE `Ｔ１２` SET `Ｃ１` = ('齗齘齚齝齞'); SELECT * FROM `Ｔ１`; Ｃ１ ｶｷｸｹｺ @@ -75,15 +63,6 @@ SELECT * FROM `Ｔ８`; SELECT * FROM `Ｔ９`; Ｃ１ 齗齘齚齝齞 -SELECT * FROM `Ｔ１０`; -Ｃ１ -ｶｷｸｹｺ -SELECT * FROM `Ｔ１１`; -Ｃ１ -かきくけこ -SELECT * FROM `Ｔ１２`; -Ｃ１ -齗齘齚齝齞 DROP TABLE `Ｔ１`; DROP TABLE `Ｔ２`; DROP TABLE `Ｔ３`; @@ -93,6 +72,3 @@ DROP TABLE `Ｔ６`; DROP TABLE `Ｔ７`; DROP TABLE `Ｔ８`; DROP TABLE `Ｔ９`; -DROP TABLE `Ｔ１０`; -DROP TABLE `Ｔ１１`; -DROP TABLE `Ｔ１２`; diff --git a/mysql-test/suite/jp/r/jp_where_sjis.result b/mysql-test/suite/jp/r/jp_where_sjis.result index a3cbc24c113..536d2a8d330 100644 --- a/mysql-test/suite/jp/r/jp_where_sjis.result +++ b/mysql-test/suite/jp/r/jp_where_sjis.result @@ -7,9 +7,6 @@ drop table if exists `sU`; 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), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = innodb; @@ -18,12 +15,9 @@ CREATE TABLE `sR` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engi CREATE TABLE `sS` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sT` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sU` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; -CREATE TABLE `sV` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sW` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sX` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPO` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPP` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPQ` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; +CREATE TABLE `sV` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sW` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sX` (`bP` char(20), INDEX(`bP`)) 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 `sU`; 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 * FROM `sP` WHERE `bP` = ''; bP @@ -63,23 +54,15 @@ SELECT * FROM `sW` WHERE `bP` = 'E'; SELECT * FROM `sX` WHERE `bP` = '\\\\\\\\\\\\\\\\\\\\'; bP \\\\\\\\\\\\\\\\\\\\ -SELECT * FROM `sPO` WHERE `bP` = ''; -bP - -SELECT * FROM `sPP` WHERE `bP` = 'E'; -bP -E -SELECT * FROM `sPQ` WHERE `bP` = '\\\\\\\\\\\\\\\\\\\\'; -bP -\\\\\\\\\\\\\\\\\\\\ +DROP TABLE IF EXISTS t1; +DROP TABLE IF EXISTS t2; +DROP TABLE IF EXISTS t3; CREATE TABLE t1(c1 char(1)) default charset = sjis engine=innodb; CREATE TABLE t2(c1 char(1)) default charset = sjis engine=myisam; -CREATE TABLE t3(c1 char(1)) default charset = sjis engine=heap; -CREATE TABLE t4(c1 char(1)) default charset = sjis engine=bdb; +CREATE TABLE t3(c1 char(1)) default charset = sjis engine=MEMORY; INSERT INTO t1 VALUES('S'),('s'); INSERT INTO t2 VALUES('S'),('s'); INSERT INTO t3 VALUES('S'),('s'); -INSERT INTO t4 VALUES('S'),('s'); SELECT * FROM t1 WHERE c1 = 'S'; c1 S @@ -89,9 +72,6 @@ c1 SELECT * FROM t3 WHERE c1 = 'S'; c1 S -SELECT * FROM t4 WHERE c1 = 'S'; -c1 -S SELECT * FROM t1 WHERE c1 = 's'; c1 s @@ -101,9 +81,9 @@ c1 SELECT * FROM t3 WHERE c1 = 's'; c1 s -SELECT * FROM t4 WHERE c1 = 's'; -c1 -s +DROP TABLE t1; +DROP TABLE t2; +DROP TABLE t3; DROP TABLE `sP`; DROP TABLE `sQ`; DROP TABLE `sR`; @@ -113,6 +93,3 @@ DROP TABLE `sU`; DROP TABLE `sV`; DROP TABLE `sW`; DROP TABLE `sX`; -DROP TABLE `sPO`; -DROP TABLE `sPP`; -DROP TABLE `sPQ`; diff --git a/mysql-test/suite/jp/r/jp_where_ucs2.result b/mysql-test/suite/jp/r/jp_where_ucs2.result index a05b1da9b68..b581ba017a0 100644 --- a/mysql-test/suite/jp/r/jp_where_ucs2.result +++ b/mysql-test/suite/jp/r/jp_where_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 `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engi CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = myisam; CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = myisam; CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = myisam; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = bdb; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = bdb; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = bdb; +CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = MEMORY; INSERT INTO `ԣ` VALUES ('PQRSTUVWXYZ[\\]^_') ,(' ') @@ -91,28 +85,6 @@ INSERT INTO `ԣ` VALUES ,('') ,('ÏďŏƏ') ,('ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ'); -INSERT INTO `ԣ` VALUES -('PQRSTUVWXYZ[\\]^_') -,(' ') -,('') -,('ÎĎŎƎǎȎɎʎˎ͎̎Ύ') -,('ЎюҎӎԎՎ֎؎َڎێݎގ'); -INSERT INTO `ԣ` VALUES -('¡áġšơ') -,('ȡɡʡˡ̡͡ΡϡСѡҡӡԡա֡סء١ڡ') -,('') -,('') -,('') -,('СТУФХЦЧШЩЪЫЬЭЮЯабвг') -,(''); -INSERT INTO `ԣ` VALUES -('Ïġ') -,('ÏďŏƏ') -,('ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ') -,('ݏޏߏᏰ⏰㏰䏰台揰珰菰鏰ꏰ돰쏰폰') -,('') -,('ÏďŏƏ') -,('ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ'); SELECT * FROM `ԣ` WHERE `ã` = ''; ã @@ -140,15 +112,6 @@ SELECT * FROM `ԣ` WHERE `ã` = ''; SELECT * FROM `ԣ` WHERE `ã` = 'ÏďŏƏ'; ã ÏďŏƏ -SELECT * FROM `ԣ` WHERE `ã` = ''; -ã - -SELECT * FROM `ԣ` WHERE `ã` = ''; -ã - -SELECT * FROM `ԣ` WHERE `ã` = 'ÏďŏƏ'; -ã -ÏďŏƏ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -158,6 +121,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/r/jp_where_ujis.result b/mysql-test/suite/jp/r/jp_where_ujis.result index b13b8a10ef8..0c4621c3a33 100644 --- a/mysql-test/suite/jp/r/jp_where_ujis.result +++ b/mysql-test/suite/jp/r/jp_where_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), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = innodb; @@ -18,12 +15,9 @@ CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engi CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = myisam; CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = myisam; CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = myisam; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = bdb; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = bdb; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = bdb; +CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) 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 * FROM `ԣ` WHERE `ã` = ''; ã @@ -63,15 +54,6 @@ SELECT * FROM `ԣ` WHERE `ã` = ''; SELECT * FROM `ԣ` WHERE `ã` = 'ÏďŏƏ'; ã ÏďŏƏ -SELECT * FROM `ԣ` WHERE `ã` = ''; -ã - -SELECT * FROM `ԣ` WHERE `ã` = ''; -ã - -SELECT * FROM `ԣ` WHERE `ã` = 'ÏďŏƏ'; -ã -ÏďŏƏ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -81,6 +63,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/r/jp_where_utf8.result b/mysql-test/suite/jp/r/jp_where_utf8.result index d69aaf8715d..3adb5733dbf 100644 --- a/mysql-test/suite/jp/r/jp_where_utf8.result +++ b/mysql-test/suite/jp/r/jp_where_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), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = innodb; @@ -18,12 +15,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf CREATE TABLE `Ｔ４` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam; CREATE TABLE `Ｔ５` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam; CREATE TABLE `Ｔ６` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam; -CREATE TABLE `Ｔ７` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ８` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ９` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ１０` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb; -CREATE TABLE `Ｔ１１` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb; -CREATE TABLE `Ｔ１２` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb; +CREATE TABLE `Ｔ７` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ８` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ９` (`Ｃ１` char(20), INDEX(`Ｃ１`)) 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 * FROM `Ｔ１` WHERE `Ｃ１` = 'ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ'; Ｃ１ ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ @@ -63,15 +54,6 @@ SELECT * FROM `Ｔ８` WHERE `Ｃ１` = '・ぁあぃいぅうぇえぉおかが SELECT * FROM `Ｔ９` WHERE `Ｃ１` = '鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖'; Ｃ１ 鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖 -SELECT * FROM `Ｔ１０` WHERE `Ｃ１` = 'ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ'; -Ｃ１ -ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ -SELECT * FROM `Ｔ１１` WHERE `Ｃ１` = '・ぁあぃいぅうぇえぉおかがきぎくぐけげこ'; -Ｃ１ -・ぁあぃいぅうぇえぉおかがきぎくぐけげこ -SELECT * FROM `Ｔ１２` WHERE `Ｃ１` = '鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖'; -Ｃ１ -鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖 DROP TABLE `Ｔ１`; DROP TABLE `Ｔ２`; DROP TABLE `Ｔ３`; @@ -81,6 +63,3 @@ DROP TABLE `Ｔ６`; DROP TABLE `Ｔ７`; DROP TABLE `Ｔ８`; DROP TABLE `Ｔ９`; -DROP TABLE `Ｔ１０`; -DROP TABLE `Ｔ１１`; -DROP TABLE `Ｔ１２`; diff --git a/mysql-test/suite/jp/t/disabled.def b/mysql-test/suite/jp/t/disabled.def new file mode 100644 index 00000000000..8c4d862ebde --- /dev/null +++ b/mysql-test/suite/jp/t/disabled.def @@ -0,0 +1,13 @@ +############################################################################## +# +# List the test cases that are to be disabled temporarily. +# +# Separate the test case name and the comment with ':'. +# +# <testcasename> : BUG#<xxxx> <date disabled> <disabler> <comment> +# +# Do not use any TAB characters for whitespace. +# +############################################################################## +jp_convert_sjis : Bug#36597 Testsuite "jp": Suspicious results for some tests +jp_select_sjis : Bug#36597 Testsuite "jp": Suspicious results for some tests diff --git a/mysql-test/suite/jp/t/jp_alter_sjis.test b/mysql-test/suite/jp/t/jp_alter_sjis.test index b7b31862599..ec3abf01b8a 100644 --- a/mysql-test/suite/jp/t/jp_alter_sjis.test +++ b/mysql-test/suite/jp/t/jp_alter_sjis.test @@ -1,6 +1,8 @@ +--source include/have_sjis.inc --character_set sjis SET NAMES sjis; SET character_set_database = sjis; +--source include/have_innodb.inc --disable_warnings DROP TABLE IF EXISTS ``; DROP TABLE IF EXISTS ``; @@ -217,15 +219,15 @@ DROP TABLE `\\\`; DROP TABLE `\\\`; # -# Test HEAP +# Test MEMORY # -CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = sjis engine=HEAP; -CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = sjis engine=HEAP; -CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = sjis engine=HEAP; -CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = sjis engine=HEAP; -CREATE TABLE `\\\`(`\\\` char(5)) DEFAULT CHARSET = sjis engine=HEAP; -CREATE TABLE `\\\`(`\\\` char(5)) DEFAULT CHARSET = sjis engine=HEAP; +CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = sjis engine=MEMORY; +CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = sjis engine=MEMORY; +CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = sjis engine=MEMORY; +CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = sjis engine=MEMORY; +CREATE TABLE `\\\`(`\\\` char(5)) DEFAULT CHARSET = sjis engine=MEMORY; +CREATE TABLE `\\\`(`\\\` char(5)) DEFAULT CHARSET = sjis engine=MEMORY; INSERT INTO `` VALUES (''),(''),(''); INSERT INTO `` VALUES (''),(''),(''); @@ -314,103 +316,3 @@ DROP TABLE ``; DROP TABLE ``; DROP TABLE `\\\`; DROP TABLE `\\\`; - -# -# Test BDB -# - -CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = sjis engine=BDB; -CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = sjis engine=BDB; -CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = sjis engine=BDB; -CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = sjis engine=BDB; -CREATE TABLE `\\\`(`\\\` char(5)) DEFAULT CHARSET = sjis engine=BDB; -CREATE TABLE `\\\`(`\\\` char(5)) DEFAULT CHARSET = sjis engine=BDB; - -INSERT INTO `` VALUES (''),(''),(''); -INSERT INTO `` VALUES (''),(''),(''); -INSERT INTO `\\\` VALUES ('\\\\\'),('\\\\\'),('\\\\\'); - -ALTER TABLE `` ADD `` char(1) FIRST; -ALTER TABLE `` ADD `` char(1) AFTER ``; -ALTER TABLE `` ADD `` char(1); -ALTER TABLE `` ADD INDEX (``); -ALTER TABLE `` ADD PRIMARY KEY (``); -#Multiple NULL fields are not allowed in BDB -#ALTER TABLE `` ADD UNIQUE (``); -#ALTER TABLE `` ADD FOREIGN KEY (``) REFERENCES ``(``); -ALTER TABLE `` CHANGE `` `` char(1); -ALTER TABLE `` MODIFY `` char(6); - -SELECT * FROM ``; -DESC ``; -SHOW CREATE TABLE ``; - -ALTER TABLE `` DROP INDEX ``; -ALTER TABLE `` DROP PRIMARY KEY; -#ALTER TABLE `` DROP INDEX ``; -#ALTER TABLE `` DROP FOREIGN KEY ``; -ALTER TABLE `` DROP ``; -ALTER TABLE `` DROP ``; -ALTER TABLE `` DROP ``; -SELECT * FROM ``; -DESC ``; -SHOW CREATE TABLE ``; - -ALTER TABLE `` ADD `` char(1) FIRST; -ALTER TABLE `` ADD `` char(1) AFTER ``; -ALTER TABLE `` ADD `` char(1); -ALTER TABLE `` ADD INDEX (``); -ALTER TABLE `` ADD PRIMARY KEY (``); -#ALTER TABLE `` ADD UNIQUE (``); -#ALTER TABLE `` ADD FOREIGN KEY (``) REFERENCES ``(``); -ALTER TABLE `` CHANGE `` `` char(1); -ALTER TABLE `` MODIFY `` char(6); - -SELECT * FROM ``; -DESC ``; -SHOW CREATE TABLE ``; - -ALTER TABLE `` DROP INDEX ``; -ALTER TABLE `` DROP PRIMARY KEY; -#ALTER TABLE `` DROP INDEX ``; -#ALTER TABLE `` DROP FOREIGN KEY ``; -ALTER TABLE `` DROP ``; -ALTER TABLE `` DROP ``; -ALTER TABLE `` DROP ``; - -SELECT * FROM ``; -DESC ``; -SHOW CREATE TABLE ``; - -ALTER TABLE `\\\` ADD `\\\` char(1) FIRST; -ALTER TABLE `\\\` ADD `\\\` char(1) AFTER `\\\`; -ALTER TABLE `\\\` ADD `\\\` char(1); -ALTER TABLE `\\\` ADD INDEX (`\\\`); -ALTER TABLE `\\\` ADD PRIMARY KEY (`\\\`); -#ALTER TABLE `\\\` ADD UNIQUE (`\\\`); -#ALTER TABLE `\\\` ADD FOREIGN KEY (`\\\`) REFERENCES `\\\`(`\\\`); -ALTER TABLE `\\\` CHANGE `\\\` `\\` char(1); -ALTER TABLE `\\\` MODIFY `\\\` char(6); - -SELECT * FROM `\\\`; -DESC `\\\`; -SHOW CREATE TABLE `\\\`; - -ALTER TABLE `\\\` DROP INDEX `\\\`; -ALTER TABLE `\\\` DROP PRIMARY KEY; -#ALTER TABLE `\\\` DROP INDEX `\\\`; -#ALTER TABLE `\\\` DROP FOREIGN KEY `\\\`; -ALTER TABLE `\\\` DROP `\\`; -ALTER TABLE `\\\` DROP `\\\`; -ALTER TABLE `\\\` DROP `\\\`; - -SELECT * FROM `\\\`; -DESC `\\\`; -SHOW CREATE TABLE `\\\`; - -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE `\\\`; -DROP TABLE `\\\`; diff --git a/mysql-test/suite/jp/t/jp_alter_ucs2.test b/mysql-test/suite/jp/t/jp_alter_ucs2.test index 6c5b3132edf..24cfed06e3e 100644 --- a/mysql-test/suite/jp/t/jp_alter_ucs2.test +++ b/mysql-test/suite/jp/t/jp_alter_ucs2.test @@ -1,4 +1,5 @@ --source include/have_ucs2.inc +--source include/have_innodb.inc --disable_warnings DROP TABLE IF EXISTS ``; @@ -220,15 +221,15 @@ DROP TABLE `ݏݏ`; DROP TABLE `ޏޏ`; # -# Test HEAP +# Test MEMORY # -CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = ucs2 engine=HEAP; -CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = ucs2 engine=HEAP; -CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = ucs2 engine=HEAP; -CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = ucs2 engine=HEAP; -CREATE TABLE `ݏݏ`(`` char(5)) DEFAULT CHARSET = ucs2 engine=HEAP; -CREATE TABLE `ޏޏ`(`` char(5)) DEFAULT CHARSET = ucs2 engine=HEAP; +CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = ucs2 engine=MEMORY; +CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = ucs2 engine=MEMORY; +CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = ucs2 engine=MEMORY; +CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = ucs2 engine=MEMORY; +CREATE TABLE `ݏݏ`(`` char(5)) DEFAULT CHARSET = ucs2 engine=MEMORY; +CREATE TABLE `ޏޏ`(`` char(5)) DEFAULT CHARSET = ucs2 engine=MEMORY; INSERT INTO `` VALUES (''),(''),(''); INSERT INTO `` VALUES (''),(''),(''); @@ -317,103 +318,3 @@ DROP TABLE ``; DROP TABLE ``; DROP TABLE `ݏݏ`; DROP TABLE `ޏޏ`; - -# -# Test BDB -# - -CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = ucs2 engine=BDB; -CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = ucs2 engine=BDB; -CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = ucs2 engine=BDB; -CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = ucs2 engine=BDB; -CREATE TABLE `ݏݏ`(`` char(5)) DEFAULT CHARSET = ucs2 engine=BDB; -CREATE TABLE `ޏޏ`(`` char(5)) DEFAULT CHARSET = ucs2 engine=BDB; - -INSERT INTO `` VALUES (''),(''),(''); -INSERT INTO `` VALUES (''),(''),(''); -INSERT INTO `ݏݏ` VALUES (''),(''),(''); - -ALTER TABLE `` ADD `` char(1) FIRST; -ALTER TABLE `` ADD `` char(1) AFTER ``; -ALTER TABLE `` ADD `` char(1); -ALTER TABLE `` ADD INDEX (``); -ALTER TABLE `` ADD PRIMARY KEY (``); -#Multiple NULL fields are not allowed in BDB -#ALTER TABLE `` ADD UNIQUE (``); -#ALTER TABLE `` ADD FOREIGN KEY (``) REFERENCES ``(``); -ALTER TABLE `` CHANGE `` `` char(1); -ALTER TABLE `` MODIFY `` char(6); - -SELECT * FROM ``; -DESC ``; -SHOW CREATE TABLE ``; - -ALTER TABLE `` DROP INDEX ``; -ALTER TABLE `` DROP PRIMARY KEY; -#ALTER TABLE `` DROP INDEX ``; -#ALTER TABLE `` DROP FOREIGN KEY ``; -ALTER TABLE `` DROP ``; -ALTER TABLE `` DROP ``; -ALTER TABLE `` DROP ``; -SELECT * FROM ``; -DESC ``; -SHOW CREATE TABLE ``; - -ALTER TABLE `` ADD `` char(1) FIRST; -ALTER TABLE `` ADD `` char(1) AFTER ``; -ALTER TABLE `` ADD `` char(1); -ALTER TABLE `` ADD INDEX (``); -ALTER TABLE `` ADD PRIMARY KEY (``); -#ALTER TABLE `` ADD UNIQUE (``); -#ALTER TABLE `` ADD FOREIGN KEY (``) REFERENCES ``(``); -ALTER TABLE `` CHANGE `` `` char(1); -ALTER TABLE `` MODIFY `` char(6); - -SELECT * FROM ``; -DESC ``; -SHOW CREATE TABLE ``; - -ALTER TABLE `` DROP INDEX ``; -ALTER TABLE `` DROP PRIMARY KEY; -#ALTER TABLE `` DROP INDEX ``; -#ALTER TABLE `` DROP FOREIGN KEY ``; -ALTER TABLE `` DROP ``; -ALTER TABLE `` DROP ``; -ALTER TABLE `` DROP ``; - -SELECT * FROM ``; -DESC ``; -SHOW CREATE TABLE ``; - -ALTER TABLE `ݏݏ` ADD `` char(1) FIRST; -ALTER TABLE `ݏݏ` ADD `` char(1) AFTER ``; -ALTER TABLE `ݏݏ` ADD `` char(1); -ALTER TABLE `ݏݏ` ADD INDEX (``); -ALTER TABLE `ݏݏ` ADD PRIMARY KEY (``); -#ALTER TABLE `ݏݏ` ADD UNIQUE (``); -#ALTER TABLE `ݏݏ` ADD FOREIGN KEY (``) REFERENCES `ޏޏ`(``); -ALTER TABLE `ݏݏ` CHANGE `` `` char(1); -ALTER TABLE `ݏݏ` MODIFY `` char(6); - -SELECT * FROM `ݏݏ`; -DESC `ݏݏ`; -SHOW CREATE TABLE `ݏݏ`; - -ALTER TABLE `ݏݏ` DROP INDEX ``; -ALTER TABLE `ݏݏ` DROP PRIMARY KEY; -#ALTER TABLE `ݏݏ` DROP INDEX ``; -#ALTER TABLE `ݏݏ` DROP FOREIGN KEY ``; -ALTER TABLE `ݏݏ` DROP ``; -ALTER TABLE `ݏݏ` DROP ``; -ALTER TABLE `ݏݏ` DROP ``; - -SELECT * FROM `ݏݏ`; -DESC `ݏݏ`; -SHOW CREATE TABLE `ݏݏ`; - -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE `ݏݏ`; -DROP TABLE `ޏޏ`; diff --git a/mysql-test/suite/jp/t/jp_alter_ujis.test b/mysql-test/suite/jp/t/jp_alter_ujis.test index d388d20c49b..e397cf66a50 100644 --- a/mysql-test/suite/jp/t/jp_alter_ujis.test +++ b/mysql-test/suite/jp/t/jp_alter_ujis.test @@ -1,4 +1,6 @@ --source include/have_ujis.inc +--source include/have_innodb.inc + --disable_warnings DROP TABLE IF EXISTS ``; @@ -219,15 +221,15 @@ DROP TABLE `ݏݏ`; DROP TABLE `ޏޏ`; # -# Test HEAP +# Test MEMORY # -CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = ujis engine=HEAP; -CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = ujis engine=HEAP; -CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = ujis engine=HEAP; -CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = ujis engine=HEAP; -CREATE TABLE `ݏݏ`(`` char(5)) DEFAULT CHARSET = ujis engine=HEAP; -CREATE TABLE `ޏޏ`(`` char(5)) DEFAULT CHARSET = ujis engine=HEAP; +CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = ujis engine=MEMORY; +CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = ujis engine=MEMORY; +CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = ujis engine=MEMORY; +CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = ujis engine=MEMORY; +CREATE TABLE `ݏݏ`(`` char(5)) DEFAULT CHARSET = ujis engine=MEMORY; +CREATE TABLE `ޏޏ`(`` char(5)) DEFAULT CHARSET = ujis engine=MEMORY; INSERT INTO `` VALUES (''),(''),(''); INSERT INTO `` VALUES (''),(''),(''); @@ -316,103 +318,3 @@ DROP TABLE ``; DROP TABLE ``; DROP TABLE `ݏݏ`; DROP TABLE `ޏޏ`; - -# -# Test BDB -# - -CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = ujis engine=BDB; -CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = ujis engine=BDB; -CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = ujis engine=BDB; -CREATE TABLE ``(`` char(5)) DEFAULT CHARSET = ujis engine=BDB; -CREATE TABLE `ݏݏ`(`` char(5)) DEFAULT CHARSET = ujis engine=BDB; -CREATE TABLE `ޏޏ`(`` char(5)) DEFAULT CHARSET = ujis engine=BDB; - -INSERT INTO `` VALUES (''),(''),(''); -INSERT INTO `` VALUES (''),(''),(''); -INSERT INTO `ݏݏ` VALUES (''),(''),(''); - -ALTER TABLE `` ADD `` char(1) FIRST; -ALTER TABLE `` ADD `` char(1) AFTER ``; -ALTER TABLE `` ADD `` char(1); -ALTER TABLE `` ADD INDEX (``); -ALTER TABLE `` ADD PRIMARY KEY (``); -#Multiple NULL fields are not allowed in BDB -#ALTER TABLE `` ADD UNIQUE (``); -#ALTER TABLE `` ADD FOREIGN KEY (``) REFERENCES ``(``); -ALTER TABLE `` CHANGE `` `` char(1); -ALTER TABLE `` MODIFY `` char(6); - -SELECT * FROM ``; -DESC ``; -SHOW CREATE TABLE ``; - -ALTER TABLE `` DROP INDEX ``; -ALTER TABLE `` DROP PRIMARY KEY; -#ALTER TABLE `` DROP INDEX ``; -#ALTER TABLE `` DROP FOREIGN KEY ``; -ALTER TABLE `` DROP ``; -ALTER TABLE `` DROP ``; -ALTER TABLE `` DROP ``; -SELECT * FROM ``; -DESC ``; -SHOW CREATE TABLE ``; - -ALTER TABLE `` ADD `` char(1) FIRST; -ALTER TABLE `` ADD `` char(1) AFTER ``; -ALTER TABLE `` ADD `` char(1); -ALTER TABLE `` ADD INDEX (``); -ALTER TABLE `` ADD PRIMARY KEY (``); -#ALTER TABLE `` ADD UNIQUE (``); -#ALTER TABLE `` ADD FOREIGN KEY (``) REFERENCES ``(``); -ALTER TABLE `` CHANGE `` `` char(1); -ALTER TABLE `` MODIFY `` char(6); - -SELECT * FROM ``; -DESC ``; -SHOW CREATE TABLE ``; - -ALTER TABLE `` DROP INDEX ``; -ALTER TABLE `` DROP PRIMARY KEY; -#ALTER TABLE `` DROP INDEX ``; -#ALTER TABLE `` DROP FOREIGN KEY ``; -ALTER TABLE `` DROP ``; -ALTER TABLE `` DROP ``; -ALTER TABLE `` DROP ``; - -SELECT * FROM ``; -DESC ``; -SHOW CREATE TABLE ``; - -ALTER TABLE `ݏݏ` ADD `` char(1) FIRST; -ALTER TABLE `ݏݏ` ADD `` char(1) AFTER ``; -ALTER TABLE `ݏݏ` ADD `` char(1); -ALTER TABLE `ݏݏ` ADD INDEX (``); -ALTER TABLE `ݏݏ` ADD PRIMARY KEY (``); -#ALTER TABLE `ݏݏ` ADD UNIQUE (``); -#ALTER TABLE `ݏݏ` ADD FOREIGN KEY (``) REFERENCES `ޏޏ`(``); -ALTER TABLE `ݏݏ` CHANGE `` `` char(1); -ALTER TABLE `ݏݏ` MODIFY `` char(6); - -SELECT * FROM `ݏݏ`; -DESC `ݏݏ`; -SHOW CREATE TABLE `ݏݏ`; - -ALTER TABLE `ݏݏ` DROP INDEX ``; -ALTER TABLE `ݏݏ` DROP PRIMARY KEY; -#ALTER TABLE `ݏݏ` DROP INDEX ``; -#ALTER TABLE `ݏݏ` DROP FOREIGN KEY ``; -ALTER TABLE `ݏݏ` DROP ``; -ALTER TABLE `ݏݏ` DROP ``; -ALTER TABLE `ݏݏ` DROP ``; - -SELECT * FROM `ݏݏ`; -DESC `ݏݏ`; -SHOW CREATE TABLE `ݏݏ`; - -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE `ݏݏ`; -DROP TABLE `ޏޏ`; diff --git a/mysql-test/suite/jp/t/jp_alter_utf8.test b/mysql-test/suite/jp/t/jp_alter_utf8.test index 6771343f38f..fc98e20acfe 100644 --- a/mysql-test/suite/jp/t/jp_alter_utf8.test +++ b/mysql-test/suite/jp/t/jp_alter_utf8.test @@ -11,9 +11,12 @@ DROP TABLE IF EXISTS `龗龗龗`; # Test altering table with Japanese characters in utf8 encoding # +--source include/have_utf8.inc SET NAMES utf8; SET character_set_database = utf8; +--source include/have_innodb.inc + # # Test InnoDB # @@ -217,15 +220,15 @@ DROP TABLE `龖龖龖`; DROP TABLE `龗龗龗`; # -# Test HEAP +# Test MEMORY # -CREATE TABLE `ｱｱｱ`(`ｷｷｷ` char(5)) DEFAULT CHARSET = utf8 engine=HEAP; -CREATE TABLE `ｲｲｲ`(`ｹｹｹ` char(5)) DEFAULT CHARSET = utf8 engine=HEAP; -CREATE TABLE `あああ`(`ききき` char(5)) DEFAULT CHARSET = utf8 engine=HEAP; -CREATE TABLE `いいい`(`けけけ` char(5)) DEFAULT CHARSET = utf8 engine=HEAP; -CREATE TABLE `龖龖龖`(`丂丂丂` char(5)) DEFAULT CHARSET = utf8 engine=HEAP; -CREATE TABLE `龗龗龗`(`乚乚乚` char(5)) DEFAULT CHARSET = utf8 engine=HEAP; +CREATE TABLE `ｱｱｱ`(`ｷｷｷ` char(5)) DEFAULT CHARSET = utf8 engine=MEMORY; +CREATE TABLE `ｲｲｲ`(`ｹｹｹ` char(5)) DEFAULT CHARSET = utf8 engine=MEMORY; +CREATE TABLE `あああ`(`ききき` char(5)) DEFAULT CHARSET = utf8 engine=MEMORY; +CREATE TABLE `いいい`(`けけけ` char(5)) DEFAULT CHARSET = utf8 engine=MEMORY; +CREATE TABLE `龖龖龖`(`丂丂丂` char(5)) DEFAULT CHARSET = utf8 engine=MEMORY; +CREATE TABLE `龗龗龗`(`乚乚乚` char(5)) DEFAULT CHARSET = utf8 engine=MEMORY; INSERT INTO `ｱｱｱ` VALUES ('ｱｱｱｱｱ'),('ｲｲｲｲｲ'),('ｳｳｳｳｳ'); INSERT INTO `あああ` VALUES ('あああああ'),('いいいいい'),('ううううう'); @@ -314,103 +317,3 @@ DROP TABLE `あああ`; DROP TABLE `いいい`; DROP TABLE `龖龖龖`; DROP TABLE `龗龗龗`; - -# -# Test BDB -# - -CREATE TABLE `ｱｱｱ`(`ｷｷｷ` char(5)) DEFAULT CHARSET = utf8 engine=BDB; -CREATE TABLE `ｲｲｲ`(`ｹｹｹ` char(5)) DEFAULT CHARSET = utf8 engine=BDB; -CREATE TABLE `あああ`(`ききき` char(5)) DEFAULT CHARSET = utf8 engine=BDB; -CREATE TABLE `いいい`(`けけけ` char(5)) DEFAULT CHARSET = utf8 engine=BDB; -CREATE TABLE `龖龖龖`(`丂丂丂` char(5)) DEFAULT CHARSET = utf8 engine=BDB; -CREATE TABLE `龗龗龗`(`乚乚乚` char(5)) DEFAULT CHARSET = utf8 engine=BDB; - -INSERT INTO `ｱｱｱ` VALUES ('ｱｱｱｱｱ'),('ｲｲｲｲｲ'),('ｳｳｳｳｳ'); -INSERT INTO `あああ` VALUES ('あああああ'),('いいいいい'),('ううううう'); -INSERT INTO `龖龖龖` VALUES ('丂丂丂丂丂'),('丄丄丄丄丄'),('丅丅丅丅丅'); - -ALTER TABLE `ｱｱｱ` ADD `ｶｶｶ` char(1) FIRST; -ALTER TABLE `ｱｱｱ` ADD `ｸｸｸ` char(1) AFTER `ｷｷｷ`; -ALTER TABLE `ｱｱｱ` ADD `ｹｹｹ` char(1); -ALTER TABLE `ｱｱｱ` ADD INDEX (`ｶｶｶ`); -ALTER TABLE `ｱｱｱ` ADD PRIMARY KEY (`ｷｷｷ`); -#Multiple NULL fields are not allowed in BDB -#ALTER TABLE `ｱｱｱ` ADD UNIQUE (`ｸｸｸ`); -#ALTER TABLE `ｱｱｱ` ADD FOREIGN KEY (`ｹｹｹ`) REFERENCES `ｲｲｲ`(`ｹｹｹ`); -ALTER TABLE `ｱｱｱ` CHANGE `ｶｶｶ` `ｶｶ` char(1); -ALTER TABLE `ｱｱｱ` MODIFY `ｷｷｷ` char(6); - -SELECT * FROM `ｱｱｱ`; -DESC `ｱｱｱ`; -SHOW CREATE TABLE `ｱｱｱ`; - -ALTER TABLE `ｱｱｱ` DROP INDEX `ｶｶｶ`; -ALTER TABLE `ｱｱｱ` DROP PRIMARY KEY; -#ALTER TABLE `ｱｱｱ` DROP INDEX `ｸｸｸ`; -#ALTER TABLE `ｱｱｱ` DROP FOREIGN KEY `ｹｹｹ`; -ALTER TABLE `ｱｱｱ` DROP `ｶｶ`; -ALTER TABLE `ｱｱｱ` DROP `ｸｸｸ`; -ALTER TABLE `ｱｱｱ` DROP `ｹｹｹ`; -SELECT * FROM `ｱｱｱ`; -DESC `ｱｱｱ`; -SHOW CREATE TABLE `ｱｱｱ`; - -ALTER TABLE `あああ` ADD `かかか` char(1) FIRST; -ALTER TABLE `あああ` ADD `くくく` char(1) AFTER `ききき`; -ALTER TABLE `あああ` ADD `けけけ` char(1); -ALTER TABLE `あああ` ADD INDEX (`かかか`); -ALTER TABLE `あああ` ADD PRIMARY KEY (`ききき`); -#ALTER TABLE `あああ` ADD UNIQUE (`くくく`); -#ALTER TABLE `あああ` ADD FOREIGN KEY (`けけけ`) REFERENCES `いいい`(`けけけ`); -ALTER TABLE `あああ` CHANGE `かかか` `かか` char(1); -ALTER TABLE `あああ` MODIFY `ききき` char(6); - -SELECT * FROM `あああ`; -DESC `あああ`; -SHOW CREATE TABLE `あああ`; - -ALTER TABLE `あああ` DROP INDEX `かかか`; -ALTER TABLE `あああ` DROP PRIMARY KEY; -#ALTER TABLE `あああ` DROP INDEX `くくく`; -#ALTER TABLE `あああ` DROP FOREIGN KEY `けけけ`; -ALTER TABLE `あああ` DROP `かか`; -ALTER TABLE `あああ` DROP `くくく`; -ALTER TABLE `あああ` DROP `けけけ`; - -SELECT * FROM `あああ`; -DESC `あああ`; -SHOW CREATE TABLE `あああ`; - -ALTER TABLE `龖龖龖` ADD `丄丄丄` char(1) FIRST; -ALTER TABLE `龖龖龖` ADD `丅丅丅` char(1) AFTER `丂丂丂`; -ALTER TABLE `龖龖龖` ADD `乚乚乚` char(1); -ALTER TABLE `龖龖龖` ADD INDEX (`丄丄丄`); -ALTER TABLE `龖龖龖` ADD PRIMARY KEY (`丂丂丂`); -#ALTER TABLE `龖龖龖` ADD UNIQUE (`丅丅丅`); -#ALTER TABLE `龖龖龖` ADD FOREIGN KEY (`乚乚乚`) REFERENCES `龗龗龗`(`乚乚乚`); -ALTER TABLE `龖龖龖` CHANGE `丄丄丄` `丄丄` char(1); -ALTER TABLE `龖龖龖` MODIFY `丂丂丂` char(6); - -SELECT * FROM `龖龖龖`; -DESC `龖龖龖`; -SHOW CREATE TABLE `龖龖龖`; - -ALTER TABLE `龖龖龖` DROP INDEX `丄丄丄`; -ALTER TABLE `龖龖龖` DROP PRIMARY KEY; -#ALTER TABLE `龖龖龖` DROP INDEX `丅丅丅`; -#ALTER TABLE `龖龖龖` DROP FOREIGN KEY `乚乚乚`; -ALTER TABLE `龖龖龖` DROP `丄丄`; -ALTER TABLE `龖龖龖` DROP `丅丅丅`; -ALTER TABLE `龖龖龖` DROP `乚乚乚`; - -SELECT * FROM `龖龖龖`; -DESC `龖龖龖`; -SHOW CREATE TABLE `龖龖龖`; - -DROP TABLE `ｱｱｱ`; -DROP TABLE `ｲｲｲ`; -DROP TABLE `あああ`; -DROP TABLE `いいい`; -DROP TABLE `龖龖龖`; -DROP TABLE `龗龗龗`; diff --git a/mysql-test/suite/jp/t/jp_charlength_sjis.test b/mysql-test/suite/jp/t/jp_charlength_sjis.test index 5f3543bb7a6..91bdb272d14 100644 --- a/mysql-test/suite/jp/t/jp_charlength_sjis.test +++ b/mysql-test/suite/jp/t/jp_charlength_sjis.test @@ -1,3 +1,5 @@ +--source include/have_sjis.inc +--source include/have_innodb.inc --character_set sjis --disable_warnings drop table if exists `sP`; @@ -9,9 +11,6 @@ drop table if exists `sU`; 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`; --enable_warnings # @@ -27,12 +26,9 @@ CREATE TABLE `sR` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engin CREATE TABLE `sS` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sT` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sU` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; -CREATE TABLE `sV` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sW` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sX` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPO` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPP` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPQ` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; +CREATE TABLE `sV` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sW` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sX` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; INSERT INTO `sP` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `sQ` VALUES (''),(''),(''),(''),(''),(''); @@ -43,9 +39,6 @@ INSERT INTO `sU` VALUES ('\\\\\'),('\\\\'),('\\\'),('\\'),('\') INSERT INTO `sV` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `sW` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `sX` VALUES ('\\\\\'),('\\\\'),('\\\'),('\\'),('\'),(''); -INSERT INTO `sPO` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `sPP` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `sPQ` VALUES ('\\\\\'),('\\\\'),('\\\'),('\\'),('\'),(''); #InnoDB SELECT `bP`, CHAR_LENGTH(`bP`) FROM `sP`; @@ -57,16 +50,11 @@ SELECT `bP`, CHAR_LENGTH(`bP`) FROM `sS`; SELECT `bP`, CHAR_LENGTH(`bP`) FROM `sT`; SELECT `bP`, CHAR_LENGTH(`bP`) FROM `sU`; -#HEAP +#MEMORY SELECT `bP`, CHAR_LENGTH(`bP`) FROM `sV`; SELECT `bP`, CHAR_LENGTH(`bP`) FROM `sW`; SELECT `bP`, CHAR_LENGTH(`bP`) FROM `sX`; -#BDB -SELECT `bP`, CHAR_LENGTH(`bP`) FROM `sPO`; -SELECT `bP`, CHAR_LENGTH(`bP`) FROM `sPP`; -SELECT `bP`, CHAR_LENGTH(`bP`) FROM `sPQ`; - DROP TABLE `sP`; DROP TABLE `sQ`; DROP TABLE `sR`; @@ -76,6 +64,3 @@ DROP TABLE `sU`; DROP TABLE `sV`; DROP TABLE `sW`; DROP TABLE `sX`; -DROP TABLE `sPO`; -DROP TABLE `sPP`; -DROP TABLE `sPQ`; diff --git a/mysql-test/suite/jp/t/jp_charlength_ucs2.test b/mysql-test/suite/jp/t/jp_charlength_ucs2.test index 2db9db7cfc6..4376ebbd135 100644 --- a/mysql-test/suite/jp/t/jp_charlength_ucs2.test +++ b/mysql-test/suite/jp/t/jp_charlength_ucs2.test @@ -1,4 +1,5 @@ --source include/have_ucs2.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `ԣ`; @@ -10,9 +11,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 `ԣ`; --enable_warnings # @@ -29,12 +27,9 @@ CREATE TABLE `ԣ` (`ã` char(5), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engin 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 (''),(''),(''),(''),(''),(''); @@ -45,9 +40,6 @@ INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(' INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(''),(''),(''); #InnoDB SELECT `ã`, CHAR_LENGTH(`ã`) FROM `ԣ`; @@ -59,16 +51,11 @@ SELECT `ã`, CHAR_LENGTH(`ã`) FROM `ԣ`; SELECT `ã`, CHAR_LENGTH(`ã`) FROM `ԣ`; SELECT `ã`, CHAR_LENGTH(`ã`) FROM `ԣ`; -#HEAP +#MEMORY SELECT `ã`, CHAR_LENGTH(`ã`) FROM `ԣ`; SELECT `ã`, CHAR_LENGTH(`ã`) FROM `ԣ`; SELECT `ã`, CHAR_LENGTH(`ã`) FROM `ԣ`; -#BDB -SELECT `ã`, CHAR_LENGTH(`ã`) FROM `ԣ`; -SELECT `ã`, CHAR_LENGTH(`ã`) FROM `ԣ`; -SELECT `ã`, CHAR_LENGTH(`ã`) FROM `ԣ`; - DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -78,6 +65,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/t/jp_charlength_ujis.test b/mysql-test/suite/jp/t/jp_charlength_ujis.test index 08973231f27..3f55e8ee73d 100644 --- a/mysql-test/suite/jp/t/jp_charlength_ujis.test +++ b/mysql-test/suite/jp/t/jp_charlength_ujis.test @@ -1,4 +1,5 @@ --source include/have_ujis.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `ԣ`; @@ -10,9 +11,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 `ԣ`; --enable_warnings # @@ -28,12 +26,9 @@ CREATE TABLE `ԣ` (`ã` char(5), INDEX(`ã`)) DEFAULT CHARSET = ujis engin 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 (''),(''),(''),(''),(''),(''); @@ -44,9 +39,6 @@ INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(' INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(''),(''),(''); #InnoDB SELECT `ã`, CHAR_LENGTH(`ã`) FROM `ԣ`; @@ -58,16 +50,11 @@ SELECT `ã`, CHAR_LENGTH(`ã`) FROM `ԣ`; SELECT `ã`, CHAR_LENGTH(`ã`) FROM `ԣ`; SELECT `ã`, CHAR_LENGTH(`ã`) FROM `ԣ`; -#HEAP +#MEMORY SELECT `ã`, CHAR_LENGTH(`ã`) FROM `ԣ`; SELECT `ã`, CHAR_LENGTH(`ã`) FROM `ԣ`; SELECT `ã`, CHAR_LENGTH(`ã`) FROM `ԣ`; -#BDB -SELECT `ã`, CHAR_LENGTH(`ã`) FROM `ԣ`; -SELECT `ã`, CHAR_LENGTH(`ã`) FROM `ԣ`; -SELECT `ã`, CHAR_LENGTH(`ã`) FROM `ԣ`; - DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -77,6 +64,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/t/jp_charlength_utf8.test b/mysql-test/suite/jp/t/jp_charlength_utf8.test index a3f74db27ee..9e88bd98907 100644 --- a/mysql-test/suite/jp/t/jp_charlength_utf8.test +++ b/mysql-test/suite/jp/t/jp_charlength_utf8.test @@ -1,3 +1,5 @@ +--source include/have_utf8.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `Ｔ１`; drop table if exists `Ｔ２`; @@ -8,9 +10,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 `Ｔ１２`; --enable_warnings # @@ -26,12 +25,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 ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),(''); @@ -42,9 +38,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),( INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),(''); INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),(''); INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),(''); -INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),(''); -INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),(''); -INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),(''); #InnoDB SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１`; @@ -56,16 +49,11 @@ SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ４`; SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ５`; SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ６`; -#HEAP +#MEMORY SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ７`; SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ８`; SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ９`; -#BDB -SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１０`; -SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１１`; -SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１２`; - DROP TABLE `Ｔ１`; DROP TABLE `Ｔ２`; DROP TABLE `Ｔ３`; @@ -75,6 +63,3 @@ DROP TABLE `Ｔ６`; DROP TABLE `Ｔ７`; DROP TABLE `Ｔ８`; DROP TABLE `Ｔ９`; -DROP TABLE `Ｔ１０`; -DROP TABLE `Ｔ１１`; -DROP TABLE `Ｔ１２`; diff --git a/mysql-test/suite/jp/t/jp_charset_sjis.test b/mysql-test/suite/jp/t/jp_charset_sjis.test index 3a9f264bdfe..4cde0848a95 100644 --- a/mysql-test/suite/jp/t/jp_charset_sjis.test +++ b/mysql-test/suite/jp/t/jp_charset_sjis.test @@ -1,3 +1,8 @@ +--source include/have_sjis.inc +--source include/have_ucs2.inc +--source include/have_ujis.inc +--source include/have_utf8.inc +--source include/have_innodb.inc --character_set sjis --disable_warnings drop table if exists `sP`; @@ -9,9 +14,6 @@ drop table if exists `sU`; 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`; --enable_warnings # @@ -27,12 +29,9 @@ CREATE TABLE `sR` (`bP` char(20)) DEFAULT CHARSET = sjis engine = innodb; 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 the following data in each table # jisx0201 hankaku-katakana data @@ -47,9 +46,6 @@ CREATE TABLE `sPQ` (`bP` char(20)) DEFAULT CHARSET = sjis engine = bdb; 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`; #InnoDB SELECT DISTINCT CHARSET(`bP`) FROM `sP`; @@ -85,7 +81,7 @@ SELECT DISTINCT CHARSET(CONVERT(`bP` USING ucs2)) FROM `sU`; SELECT DISTINCT CHARSET(CONVERT(`bP` USING sjis)) FROM `sU`; SELECT DISTINCT CHARSET(CONVERT(`bP` USING ujis)) FROM `sU`; -#Heap +#MEMORY SELECT DISTINCT CHARSET(`bP`) FROM `sV`; SELECT DISTINCT CHARSET(`bP`) FROM `sW`; SELECT DISTINCT CHARSET(`bP`) FROM `sX`; @@ -102,23 +98,6 @@ SELECT DISTINCT CHARSET(CONVERT(`bP` USING ucs2)) FROM `sX`; SELECT DISTINCT CHARSET(CONVERT(`bP` USING sjis)) FROM `sX`; SELECT DISTINCT CHARSET(CONVERT(`bP` USING ujis)) FROM `sX`; -#BDB -SELECT DISTINCT CHARSET(`bP`) FROM `sPO`; -SELECT DISTINCT CHARSET(`bP`) FROM `sPP`; -SELECT DISTINCT CHARSET(`bP`) FROM `sPQ`; -SELECT DISTINCT CHARSET(CONVERT(`bP` USING utf8)) FROM `sPO`; -SELECT DISTINCT CHARSET(CONVERT(`bP` USING ucs2)) FROM `sPO`; -SELECT DISTINCT CHARSET(CONVERT(`bP` USING sjis)) FROM `sPO`; -SELECT DISTINCT CHARSET(CONVERT(`bP` USING ujis)) FROM `sPO`; -SELECT DISTINCT CHARSET(CONVERT(`bP` USING utf8)) FROM `sPP`; -SELECT DISTINCT CHARSET(CONVERT(`bP` USING ucs2)) FROM `sPP`; -SELECT DISTINCT CHARSET(CONVERT(`bP` USING sjis)) FROM `sPP`; -SELECT DISTINCT CHARSET(CONVERT(`bP` USING ujis)) FROM `sPP`; -SELECT DISTINCT CHARSET(CONVERT(`bP` USING utf8)) FROM `sPQ`; -SELECT DISTINCT CHARSET(CONVERT(`bP` USING ucs2)) FROM `sPQ`; -SELECT DISTINCT CHARSET(CONVERT(`bP` USING sjis)) FROM `sPQ`; -SELECT DISTINCT CHARSET(CONVERT(`bP` USING ujis)) FROM `sPQ`; - drop table `sP`; drop table `sQ`; drop table `sR`; @@ -128,6 +107,3 @@ drop table `sU`; drop table `sV`; drop table `sW`; drop table `sX`; -drop table `sPO`; -drop table `sPP`; -drop table `sPQ`; diff --git a/mysql-test/suite/jp/t/jp_charset_ucs2.test b/mysql-test/suite/jp/t/jp_charset_ucs2.test index 5183071033b..8427d721339 100644 --- a/mysql-test/suite/jp/t/jp_charset_ucs2.test +++ b/mysql-test/suite/jp/t/jp_charset_ucs2.test @@ -1,4 +1,8 @@ +--source include/have_sjis.inc --source include/have_ucs2.inc +--source include/have_ujis.inc +--source include/have_utf8.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `ԣ`; @@ -10,9 +14,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 `ԣ`; --enable_warnings # @@ -27,12 +28,9 @@ CREATE TABLE `ԣ` (`ã` char(20)) DEFAULT CHARSET = ucs2 engine = innodb; 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 the following data in each table # jisx0201 hankaku-katakana data @@ -114,31 +112,6 @@ INSERT INTO `ԣ` VALUES ,('ÏďŏƏ') ,('ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ'); -INSERT INTO `ԣ` VALUES - ('PQRSTUVWXYZ[\\]^_') -,(' ') -,('') -,('ÎĎŎƎǎȎɎʎˎ͎̎Ύ') -,('ЎюҎӎԎՎ֎؎َڎێݎގ'); - -INSERT INTO `ԣ` VALUES - ('¡áġšơ') -,('ȡɡʡˡ̡͡ΡϡСѡҡӡԡա֡סء١ڡ') -,('') -,('') -,('') -,('СТУФХЦЧШЩЪЫЬЭЮЯабвг') -,(''); - -INSERT INTO `ԣ` VALUES - ('Ïġ') -,('ÏďŏƏ') -,('ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ') -,('ݏޏߏᏰ⏰㏰䏰台揰珰菰鏰ꏰ돰쏰폰') -,('') -,('ÏďŏƏ') -,('ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ'); - #InnoDB SELECT DISTINCT CHARSET(`ã`) FROM `ԣ`; SELECT DISTINCT CHARSET(`ã`) FROM `ԣ`; @@ -173,7 +146,7 @@ SELECT DISTINCT CHARSET(CONVERT(`ã` USING ucs2)) FROM `ԣ`; SELECT DISTINCT CHARSET(CONVERT(`ã` USING sjis)) FROM `ԣ`; SELECT DISTINCT CHARSET(CONVERT(`ã` USING ujis)) FROM `ԣ`; -#Heap +#MEMORY SELECT DISTINCT CHARSET(`ã`) FROM `ԣ`; SELECT DISTINCT CHARSET(`ã`) FROM `ԣ`; SELECT DISTINCT CHARSET(`ã`) FROM `ԣ`; @@ -190,23 +163,6 @@ SELECT DISTINCT CHARSET(CONVERT(`ã` USING ucs2)) FROM `ԣ`; SELECT DISTINCT CHARSET(CONVERT(`ã` USING sjis)) FROM `ԣ`; SELECT DISTINCT CHARSET(CONVERT(`ã` USING ujis)) FROM `ԣ`; -#BDB -SELECT DISTINCT CHARSET(`ã`) FROM `ԣ`; -SELECT DISTINCT CHARSET(`ã`) FROM `ԣ`; -SELECT DISTINCT CHARSET(`ã`) FROM `ԣ`; -SELECT DISTINCT CHARSET(CONVERT(`ã` USING utf8)) FROM `ԣ`; -SELECT DISTINCT CHARSET(CONVERT(`ã` USING ucs2)) FROM `ԣ`; -SELECT DISTINCT CHARSET(CONVERT(`ã` USING sjis)) FROM `ԣ`; -SELECT DISTINCT CHARSET(CONVERT(`ã` USING ujis)) FROM `ԣ`; -SELECT DISTINCT CHARSET(CONVERT(`ã` USING utf8)) FROM `ԣ`; -SELECT DISTINCT CHARSET(CONVERT(`ã` USING ucs2)) FROM `ԣ`; -SELECT DISTINCT CHARSET(CONVERT(`ã` USING sjis)) FROM `ԣ`; -SELECT DISTINCT CHARSET(CONVERT(`ã` USING ujis)) FROM `ԣ`; -SELECT DISTINCT CHARSET(CONVERT(`ã` USING utf8)) FROM `ԣ`; -SELECT DISTINCT CHARSET(CONVERT(`ã` USING ucs2)) FROM `ԣ`; -SELECT DISTINCT CHARSET(CONVERT(`ã` USING sjis)) FROM `ԣ`; -SELECT DISTINCT CHARSET(CONVERT(`ã` USING ujis)) FROM `ԣ`; - drop table `ԣ`; drop table `ԣ`; drop table `ԣ`; @@ -216,6 +172,3 @@ drop table `ԣ`; drop table `ԣ`; drop table `ԣ`; drop table `ԣ`; -drop table `ԣ`; -drop table `ԣ`; -drop table `ԣ`; diff --git a/mysql-test/suite/jp/t/jp_charset_ujis.test b/mysql-test/suite/jp/t/jp_charset_ujis.test index de9ef318530..6e80162c2fa 100644 --- a/mysql-test/suite/jp/t/jp_charset_ujis.test +++ b/mysql-test/suite/jp/t/jp_charset_ujis.test @@ -1,4 +1,8 @@ +--source include/have_sjis.inc +--source include/have_ucs2.inc --source include/have_ujis.inc +--source include/have_utf8.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `ԣ`; @@ -10,9 +14,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 `ԣ`; --enable_warnings # @@ -28,12 +29,9 @@ CREATE TABLE `ԣ` (`ã` char(20)) DEFAULT CHARSET = ujis engine = innodb; 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 the following data in each table # jisx0201 hankaku-katakana data @@ -49,9 +47,6 @@ CREATE TABLE `ԣ` (`ã` char(20)) DEFAULT CHARSET = ujis engine = bdb; 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 `ԣ`; #InnoDB SELECT DISTINCT CHARSET(`ã`) FROM `ԣ`; @@ -87,7 +82,7 @@ SELECT DISTINCT CHARSET(CONVERT(`ã` USING ucs2)) FROM `ԣ`; SELECT DISTINCT CHARSET(CONVERT(`ã` USING sjis)) FROM `ԣ`; SELECT DISTINCT CHARSET(CONVERT(`ã` USING ujis)) FROM `ԣ`; -#Heap +#MEMORY SELECT DISTINCT CHARSET(`ã`) FROM `ԣ`; SELECT DISTINCT CHARSET(`ã`) FROM `ԣ`; SELECT DISTINCT CHARSET(`ã`) FROM `ԣ`; @@ -104,23 +99,6 @@ SELECT DISTINCT CHARSET(CONVERT(`ã` USING ucs2)) FROM `ԣ`; SELECT DISTINCT CHARSET(CONVERT(`ã` USING sjis)) FROM `ԣ`; SELECT DISTINCT CHARSET(CONVERT(`ã` USING ujis)) FROM `ԣ`; -#BDB -SELECT DISTINCT CHARSET(`ã`) FROM `ԣ`; -SELECT DISTINCT CHARSET(`ã`) FROM `ԣ`; -SELECT DISTINCT CHARSET(`ã`) FROM `ԣ`; -SELECT DISTINCT CHARSET(CONVERT(`ã` USING utf8)) FROM `ԣ`; -SELECT DISTINCT CHARSET(CONVERT(`ã` USING ucs2)) FROM `ԣ`; -SELECT DISTINCT CHARSET(CONVERT(`ã` USING sjis)) FROM `ԣ`; -SELECT DISTINCT CHARSET(CONVERT(`ã` USING ujis)) FROM `ԣ`; -SELECT DISTINCT CHARSET(CONVERT(`ã` USING utf8)) FROM `ԣ`; -SELECT DISTINCT CHARSET(CONVERT(`ã` USING ucs2)) FROM `ԣ`; -SELECT DISTINCT CHARSET(CONVERT(`ã` USING sjis)) FROM `ԣ`; -SELECT DISTINCT CHARSET(CONVERT(`ã` USING ujis)) FROM `ԣ`; -SELECT DISTINCT CHARSET(CONVERT(`ã` USING utf8)) FROM `ԣ`; -SELECT DISTINCT CHARSET(CONVERT(`ã` USING ucs2)) FROM `ԣ`; -SELECT DISTINCT CHARSET(CONVERT(`ã` USING sjis)) FROM `ԣ`; -SELECT DISTINCT CHARSET(CONVERT(`ã` USING ujis)) FROM `ԣ`; - drop table `ԣ`; drop table `ԣ`; drop table `ԣ`; @@ -130,6 +108,3 @@ drop table `ԣ`; drop table `ԣ`; drop table `ԣ`; drop table `ԣ`; -drop table `ԣ`; -drop table `ԣ`; -drop table `ԣ`; diff --git a/mysql-test/suite/jp/t/jp_charset_utf8.test b/mysql-test/suite/jp/t/jp_charset_utf8.test index 2d73daba42a..e02c035fb33 100644 --- a/mysql-test/suite/jp/t/jp_charset_utf8.test +++ b/mysql-test/suite/jp/t/jp_charset_utf8.test @@ -1,3 +1,9 @@ +--source include/have_sjis.inc +--source include/have_ucs2.inc +--source include/have_ujis.inc +--source include/have_utf8.inc +--source include/have_innodb.inc + --disable_warnings drop table if exists `Ｔ１`; drop table if exists `Ｔ２`; @@ -8,9 +14,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 `Ｔ１２`; --enable_warnings # @@ -26,12 +29,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 the following data in each table # jisx0201 hankaku-katakana data @@ -47,9 +47,6 @@ CREATE TABLE `Ｔ１２` (`Ｃ１` char(20)) DEFAULT CHARSET = utf8 engine = bdb 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 `Ｔ１２`; #InnoDB SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ１`; @@ -85,7 +82,7 @@ SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ６`; SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ６`; SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ６`; -#Heap +#MEMORY SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ７`; SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ８`; SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ９`; @@ -102,23 +99,6 @@ SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ９`; SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ９`; SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ９`; -#BDB -SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ１０`; -SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ１１`; -SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ１２`; -SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ１０`; -SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ１０`; -SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ１０`; -SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ１０`; -SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ１１`; -SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ１１`; -SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ１１`; -SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ１１`; -SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ１２`; -SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ１２`; -SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ１２`; -SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ１２`; - drop table `Ｔ１`; drop table `Ｔ２`; drop table `Ｔ３`; @@ -128,6 +108,3 @@ drop table `Ｔ６`; drop table `Ｔ７`; drop table `Ｔ８`; drop table `Ｔ９`; -drop table `Ｔ１０`; -drop table `Ｔ１１`; -drop table `Ｔ１２`; diff --git a/mysql-test/suite/jp/t/jp_convert_sjis.test b/mysql-test/suite/jp/t/jp_convert_sjis.test index 93fa33029bf..ccbce35b1e0 100644 --- a/mysql-test/suite/jp/t/jp_convert_sjis.test +++ b/mysql-test/suite/jp/t/jp_convert_sjis.test @@ -1,3 +1,9 @@ +--source include/have_sjis.inc +--source include/have_ucs2.inc +--source include/have_ujis.inc +--source include/have_utf8.inc +--source include/have_innodb.inc + --character_set sjis SET NAMES sjis; SET character_set_database = sjis; @@ -12,9 +18,6 @@ drop table if exists `sU`; 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`; --enable_warnings # @@ -27,12 +30,9 @@ CREATE TABLE `sR` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engi CREATE TABLE `sS` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sT` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sU` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; -CREATE TABLE `sV` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sW` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sX` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPO` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPP` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPQ` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; +CREATE TABLE `sV` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sW` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sX` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; #Load the following data in each table # jisx0201 hankaku-katakana data @@ -48,9 +48,6 @@ CREATE TABLE `sPQ` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis en 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`; #InnoDB SELECT `bP`, CONVERT(`bP` using utf8) FROM `sP`; @@ -74,7 +71,7 @@ SELECT `bP`, CONVERT(`bP` using utf8) FROM `sU`; SELECT `bP`, CONVERT(`bP` using ucs2) FROM `sU`; SELECT `bP`, CONVERT(`bP` using ujis) FROM `sU`; -#Heap +#MEMORY SELECT `bP`, CONVERT(`bP` using utf8) FROM `sV`; SELECT `bP`, CONVERT(`bP` using ucs2) FROM `sV`; SELECT `bP`, CONVERT(`bP` using ujis) FROM `sV`; @@ -85,17 +82,6 @@ SELECT `bP`, CONVERT(`bP` using utf8) FROM `sX`; SELECT `bP`, CONVERT(`bP` using ucs2) FROM `sX`; SELECT `bP`, CONVERT(`bP` using ujis) FROM `sX`; -#BDB -SELECT `bP`, CONVERT(`bP` using utf8) FROM `sPO`; -SELECT `bP`, CONVERT(`bP` using ucs2) FROM `sPO`; -SELECT `bP`, CONVERT(`bP` using ujis) FROM `sPO`; -SELECT `bP`, CONVERT(`bP` using utf8) FROM `sPP`; -SELECT `bP`, CONVERT(`bP` using ucs2) FROM `sPP`; -SELECT `bP`, CONVERT(`bP` using ujis) FROM `sPP`; -SELECT `bP`, CONVERT(`bP` using utf8) FROM `sPQ`; -SELECT `bP`, CONVERT(`bP` using ucs2) FROM `sPQ`; -SELECT `bP`, CONVERT(`bP` using ujis) FROM `sPQ`; - drop table `sP`; drop table `sQ`; drop table `sR`; @@ -105,6 +91,3 @@ drop table `sU`; drop table `sV`; drop table `sW`; drop table `sX`; -drop table `sPO`; -drop table `sPP`; -drop table `sPQ`; diff --git a/mysql-test/suite/jp/t/jp_convert_ucs2.test b/mysql-test/suite/jp/t/jp_convert_ucs2.test index 88b0d0c9cba..cf79622373c 100644 --- a/mysql-test/suite/jp/t/jp_convert_ucs2.test +++ b/mysql-test/suite/jp/t/jp_convert_ucs2.test @@ -1,4 +1,8 @@ +--source include/have_sjis.inc --source include/have_ucs2.inc +--source include/have_ujis.inc +--source include/have_utf8.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `ԣ`; @@ -10,9 +14,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 `ԣ`; --enable_warnings # @@ -29,12 +30,9 @@ CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engi CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = myisam; CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = myisam; CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = myisam; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = bdb; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = bdb; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = bdb; +CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = MEMORY; #Insert the following data in each table # jisx0201 hankaku-katakana data @@ -116,31 +114,6 @@ INSERT INTO `ԣ` VALUES ,('ÏďŏƏ') ,('ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ'); -INSERT INTO `ԣ` VALUES - ('PQRSTUVWXYZ[\\]^_') -,(' ') -,('') -,('ÎĎŎƎǎȎɎʎˎ͎̎Ύ') -,('ЎюҎӎԎՎ֎؎َڎێݎގ'); - -INSERT INTO `ԣ` VALUES - ('¡áġšơ') -,('ȡɡʡˡ̡͡ΡϡСѡҡӡԡա֡סء١ڡ') -,('') -,('') -,('') -,('СТУФХЦЧШЩЪЫЬЭЮЯабвг') -,(''); - -INSERT INTO `ԣ` VALUES - ('Ïġ') -,('ÏďŏƏ') -,('ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ') -,('ݏޏߏᏰ⏰㏰䏰台揰珰菰鏰ꏰ돰쏰폰') -,('') -,('ÏďŏƏ') -,('ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ'); - #InnoDB SELECT `ã`, CONVERT(`ã` using utf8) FROM `ԣ`; SELECT `ã`, CONVERT(`ã` using ucs2) FROM `ԣ`; @@ -165,7 +138,7 @@ SELECT `ã`, CONVERT(`ã` using ucs2) FROM `ԣ`; # The result will get garbled because jisx0212 is not included in sjis SELECT `ã`, CONVERT(`ã` using sjis) FROM `ԣ`; -#Heap +#MEMORY SELECT `ã`, CONVERT(`ã` using utf8) FROM `ԣ`; SELECT `ã`, CONVERT(`ã` using ucs2) FROM `ԣ`; SELECT `ã`, CONVERT(`ã` using sjis) FROM `ԣ`; @@ -177,18 +150,6 @@ SELECT `ã`, CONVERT(`ã` using ucs2) FROM `ԣ`; # The result will get garbled because jisx0212 is not included in sjis SELECT `ã`, CONVERT(`ã` using sjis) FROM `ԣ`; -#BDB -SELECT `ã`, CONVERT(`ã` using utf8) FROM `ԣ`; -SELECT `ã`, CONVERT(`ã` using ucs2) FROM `ԣ`; -SELECT `ã`, CONVERT(`ã` using sjis) FROM `ԣ`; -SELECT `ã`, CONVERT(`ã` using utf8) FROM `ԣ`; -SELECT `ã`, CONVERT(`ã` using ucs2) FROM `ԣ`; -SELECT `ã`, CONVERT(`ã` using sjis) FROM `ԣ`; -SELECT `ã`, CONVERT(`ã` using utf8) FROM `ԣ`; -SELECT `ã`, CONVERT(`ã` using ucs2) FROM `ԣ`; -# The result will get garbled because jisx0212 is not included in sjis -SELECT `ã`, CONVERT(`ã` using sjis) FROM `ԣ`; - drop table `ԣ`; drop table `ԣ`; drop table `ԣ`; @@ -198,6 +159,3 @@ drop table `ԣ`; drop table `ԣ`; drop table `ԣ`; drop table `ԣ`; -drop table `ԣ`; -drop table `ԣ`; -drop table `ԣ`; diff --git a/mysql-test/suite/jp/t/jp_convert_ujis.test b/mysql-test/suite/jp/t/jp_convert_ujis.test index d6303b66f34..f15fee492e5 100644 --- a/mysql-test/suite/jp/t/jp_convert_ujis.test +++ b/mysql-test/suite/jp/t/jp_convert_ujis.test @@ -1,4 +1,8 @@ +--source include/have_sjis.inc +--source include/have_ucs2.inc --source include/have_ujis.inc +--source include/have_utf8.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `ԣ`; @@ -10,9 +14,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 `ԣ`; --enable_warnings # @@ -28,12 +29,9 @@ CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engi CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = myisam; CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = myisam; CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = myisam; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = bdb; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = bdb; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = bdb; +CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = MEMORY; #Load the following data in each table # jisx0201 hankaku-katakana data @@ -49,9 +47,6 @@ CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis en 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 `ԣ`; #InnoDB SELECT `ã`, CONVERT(`ã` using utf8) FROM `ԣ`; @@ -77,7 +72,7 @@ SELECT `ã`, CONVERT(`ã` using ucs2) FROM `ԣ`; # The result will get garbled because jisx0212 is not included in sjis SELECT `ã`, CONVERT(`ã` using sjis) FROM `ԣ`; -#Heap +#MEMORY SELECT `ã`, CONVERT(`ã` using utf8) FROM `ԣ`; SELECT `ã`, CONVERT(`ã` using ucs2) FROM `ԣ`; SELECT `ã`, CONVERT(`ã` using sjis) FROM `ԣ`; @@ -89,18 +84,6 @@ SELECT `ã`, CONVERT(`ã` using ucs2) FROM `ԣ`; # The result will get garbled because jisx0212 is not included in sjis SELECT `ã`, CONVERT(`ã` using sjis) FROM `ԣ`; -#BDB -SELECT `ã`, CONVERT(`ã` using utf8) FROM `ԣ`; -SELECT `ã`, CONVERT(`ã` using ucs2) FROM `ԣ`; -SELECT `ã`, CONVERT(`ã` using sjis) FROM `ԣ`; -SELECT `ã`, CONVERT(`ã` using utf8) FROM `ԣ`; -SELECT `ã`, CONVERT(`ã` using ucs2) FROM `ԣ`; -SELECT `ã`, CONVERT(`ã` using sjis) FROM `ԣ`; -SELECT `ã`, CONVERT(`ã` using utf8) FROM `ԣ`; -SELECT `ã`, CONVERT(`ã` using ucs2) FROM `ԣ`; -# The result will get garbled because jisx0212 is not included in sjis -SELECT `ã`, CONVERT(`ã` using sjis) FROM `ԣ`; - drop table `ԣ`; drop table `ԣ`; drop table `ԣ`; @@ -110,6 +93,3 @@ drop table `ԣ`; drop table `ԣ`; drop table `ԣ`; drop table `ԣ`; -drop table `ԣ`; -drop table `ԣ`; -drop table `ԣ`; diff --git a/mysql-test/suite/jp/t/jp_convert_utf8.test b/mysql-test/suite/jp/t/jp_convert_utf8.test index a687b0f06cb..7a230495e78 100644 --- a/mysql-test/suite/jp/t/jp_convert_utf8.test +++ b/mysql-test/suite/jp/t/jp_convert_utf8.test @@ -1,3 +1,8 @@ +--source include/have_sjis.inc +--source include/have_ucs2.inc +--source include/have_ujis.inc +--source include/have_utf8.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `Ｔ１`; drop table if exists `Ｔ２`; @@ -8,9 +13,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 `Ｔ１２`; --enable_warnings # @@ -26,12 +28,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf CREATE TABLE `Ｔ４` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam; CREATE TABLE `Ｔ５` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam; CREATE TABLE `Ｔ６` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam; -CREATE TABLE `Ｔ７` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ８` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ９` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ１０` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb; -CREATE TABLE `Ｔ１１` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb; -CREATE TABLE `Ｔ１２` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb; +CREATE TABLE `Ｔ７` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ８` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ９` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY; #Load the following data in each table # jisx0201 hankaku-katakana data @@ -47,9 +46,6 @@ CREATE TABLE `Ｔ１２` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = 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 `Ｔ１２`; #InnoDB SELECT `Ｃ１`, CONVERT(`Ｃ１` using ujis) FROM `Ｔ１`; @@ -75,7 +71,7 @@ SELECT `Ｃ１`, CONVERT(`Ｃ１` using ucs2) FROM `Ｔ６`; # The result will get garbled because jisx0212 is not included in sjis SELECT `Ｃ１`, CONVERT(`Ｃ１` using sjis) FROM `Ｔ６`; -#Heap +#MEMORY SELECT `Ｃ１`, CONVERT(`Ｃ１` using ujis) FROM `Ｔ７`; SELECT `Ｃ１`, CONVERT(`Ｃ１` using ucs2) FROM `Ｔ７`; SELECT `Ｃ１`, CONVERT(`Ｃ１` using sjis) FROM `Ｔ７`; @@ -87,18 +83,6 @@ SELECT `Ｃ１`, CONVERT(`Ｃ１` using ucs2) FROM `Ｔ９`; # The result will get garbled because jisx0212 is not included in sjis SELECT `Ｃ１`, CONVERT(`Ｃ１` using sjis) FROM `Ｔ９`; -#BDB -SELECT `Ｃ１`, CONVERT(`Ｃ１` using ujis) FROM `Ｔ１０`; -SELECT `Ｃ１`, CONVERT(`Ｃ１` using ucs2) FROM `Ｔ１０`; -SELECT `Ｃ１`, CONVERT(`Ｃ１` using sjis) FROM `Ｔ１０`; -SELECT `Ｃ１`, CONVERT(`Ｃ１` using ujis) FROM `Ｔ１１`; -SELECT `Ｃ１`, CONVERT(`Ｃ１` using ucs2) FROM `Ｔ１１`; -SELECT `Ｃ１`, CONVERT(`Ｃ１` using sjis) FROM `Ｔ１１`; -SELECT `Ｃ１`, CONVERT(`Ｃ１` using ujis) FROM `Ｔ１２`; -SELECT `Ｃ１`, CONVERT(`Ｃ１` using ucs2) FROM `Ｔ１２`; -# The result will get garbled because jisx0212 is not included in sjis -SELECT `Ｃ１`, CONVERT(`Ｃ１` using sjis) FROM `Ｔ１２`; - drop table `Ｔ１`; drop table `Ｔ２`; drop table `Ｔ３`; @@ -108,6 +92,3 @@ drop table `Ｔ６`; drop table `Ｔ７`; drop table `Ｔ８`; drop table `Ｔ９`; -drop table `Ｔ１０`; -drop table `Ｔ１１`; -drop table `Ｔ１２`; diff --git a/mysql-test/suite/jp/t/jp_create_db_sjis.test b/mysql-test/suite/jp/t/jp_create_db_sjis.test index ef66d338fce..7d231eaf22c 100644 --- a/mysql-test/suite/jp/t/jp_create_db_sjis.test +++ b/mysql-test/suite/jp/t/jp_create_db_sjis.test @@ -1,3 +1,4 @@ +--source include/have_sjis.inc --character_set sjis SET NAMES sjis; SET character_set_database = sjis; diff --git a/mysql-test/suite/jp/t/jp_create_db_utf8.test b/mysql-test/suite/jp/t/jp_create_db_utf8.test index 4f8eb24cbe3..f8faf411ed0 100644 --- a/mysql-test/suite/jp/t/jp_create_db_utf8.test +++ b/mysql-test/suite/jp/t/jp_create_db_utf8.test @@ -1,3 +1,4 @@ +--source include/have_utf8.inc --disable_warnings drop database if exists `ﾆﾎﾝｺﾞ`; drop database if exists `日本語`; diff --git a/mysql-test/suite/jp/t/jp_create_tbl_sjis.test b/mysql-test/suite/jp/t/jp_create_tbl_sjis.test index 45c0b24388b..3a799958124 100644 --- a/mysql-test/suite/jp/t/jp_create_tbl_sjis.test +++ b/mysql-test/suite/jp/t/jp_create_tbl_sjis.test @@ -1,3 +1,5 @@ +--source include/have_sjis.inc +--source include/have_innodb.inc --character_set sjis SET NAMES sjis; SET character_set_database = sjis; @@ -163,101 +165,29 @@ DROP TABLE `\\\`; DROP TABLE `\\\`; DROP TABLE `\\\`; -CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = sjis engine=HEAP; -CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = sjis engine=HEAP; -CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = sjis engine=HEAP; -CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = sjis engine=HEAP; -CREATE TABLE `\\\`(`\\\` char(1)) DEFAULT CHARSET = sjis engine=HEAP; -CREATE TABLE `\\\`(`\\\` char(1)) DEFAULT CHARSET = sjis engine=HEAP; +CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = sjis engine=MEMORY; +CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = sjis engine=MEMORY; +CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = sjis engine=MEMORY; +CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = sjis engine=MEMORY; +CREATE TABLE `\\\`(`\\\` char(1)) DEFAULT CHARSET = sjis engine=MEMORY; +CREATE TABLE `\\\`(`\\\` char(1)) DEFAULT CHARSET = sjis engine=MEMORY; # Tables should not be created because table names exist -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = sjis engine=HEAP; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = sjis engine=HEAP; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = sjis engine=HEAP; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = sjis engine=HEAP; -CREATE TABLE IF NOT EXISTS `\\\`(`\\\` char(1)) DEFAULT CHARSET = sjis engine=HEAP; -CREATE TABLE IF NOT EXISTS `\\\`(`\\\` char(1)) DEFAULT CHARSET = sjis engine=HEAP; +CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = sjis engine=MEMORY; +CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = sjis engine=MEMORY; +CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = sjis engine=MEMORY; +CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = sjis engine=MEMORY; +CREATE TABLE IF NOT EXISTS `\\\`(`\\\` char(1)) DEFAULT CHARSET = sjis engine=MEMORY; +CREATE TABLE IF NOT EXISTS `\\\`(`\\\` char(1)) DEFAULT CHARSET = sjis engine=MEMORY; # Tables should be created -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = sjis engine=HEAP; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = sjis engine=HEAP; -CREATE TABLE IF NOT EXISTS `\\\`(`\\\`char(1)) DEFAULT CHARSET = sjis engine=HEAP; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = sjis engine=HEAP; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = sjis engine=HEAP; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = sjis engine=HEAP; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = sjis engine=HEAP; -CREATE TEMPORARY TABLE `\\\`(`\\\` char(1)) DEFAULT CHARSET = sjis engine=HEAP; -CREATE TEMPORARY TABLE `\\\`(`\\\` char(1)) DEFAULT CHARSET = sjis engine=HEAP; - -DESC ``; -DESC ``; -DESC ``; -DESC ``; -DESC ``; -DESC ``; -DESC ``; -DESC ``; -DESC ``; -DESC ``; -DESC `\\\`; -DESC `\\\`; -DESC `\\\`; -DESC `\\\`; -DESC `\\\`; - -SHOW CREATE TABLE ``; -SHOW CREATE TABLE ``; -SHOW CREATE TABLE ``; -SHOW CREATE TABLE ``; -SHOW CREATE TABLE ``; -SHOW CREATE TABLE ``; -SHOW CREATE TABLE ``; -SHOW CREATE TABLE ``; -SHOW CREATE TABLE ``; -SHOW CREATE TABLE ``; -SHOW CREATE TABLE `\\\`; -SHOW CREATE TABLE `\\\`; -SHOW CREATE TABLE `\\\`; -SHOW CREATE TABLE `\\\`; -SHOW CREATE TABLE `\\\`; - -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE `\\\`; -DROP TABLE `\\\`; -DROP TABLE `\\\`; -DROP TABLE `\\\`; -DROP TABLE `\\\`; - -CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = sjis engine=BDB; -CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = sjis engine=BDB; -CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = sjis engine=BDB; -CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = sjis engine=BDB; -CREATE TABLE `\\\`(`\\\` char(1)) DEFAULT CHARSET = sjis engine=BDB; -CREATE TABLE `\\\`(`\\\` char(1)) DEFAULT CHARSET = sjis engine=BDB; -# Tables should not be created because table names exist -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = sjis engine=BDB; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = sjis engine=BDB; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = sjis engine=BDB; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = sjis engine=BDB; -CREATE TABLE IF NOT EXISTS `\\\`(`\\\` char(1)) DEFAULT CHARSET = sjis engine=BDB; -CREATE TABLE IF NOT EXISTS `\\\`(`\\\` char(1)) DEFAULT CHARSET = sjis engine=BDB; -# Tables should be created -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = sjis engine=BDB; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = sjis engine=BDB; -CREATE TABLE IF NOT EXISTS `\\\`(`\\\`char(1)) DEFAULT CHARSET = sjis engine=BDB; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = sjis engine=BDB; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = sjis engine=BDB; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = sjis engine=BDB; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = sjis engine=BDB; -CREATE TEMPORARY TABLE `\\\`(`\\\` char(1)) DEFAULT CHARSET = sjis engine=BDB; -CREATE TEMPORARY TABLE `\\\`(`\\\` char(1)) DEFAULT CHARSET = sjis engine=BDB; +CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = sjis engine=MEMORY; +CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = sjis engine=MEMORY; +CREATE TABLE IF NOT EXISTS `\\\`(`\\\`char(1)) DEFAULT CHARSET = sjis engine=MEMORY; +CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = sjis engine=MEMORY; +CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = sjis engine=MEMORY; +CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = sjis engine=MEMORY; +CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = sjis engine=MEMORY; +CREATE TEMPORARY TABLE `\\\`(`\\\` char(1)) DEFAULT CHARSET = sjis engine=MEMORY; +CREATE TEMPORARY TABLE `\\\`(`\\\` char(1)) DEFAULT CHARSET = sjis engine=MEMORY; DESC ``; DESC ``; diff --git a/mysql-test/suite/jp/t/jp_create_tbl_ucs2.test b/mysql-test/suite/jp/t/jp_create_tbl_ucs2.test index 519697e3530..986cc50b10f 100644 --- a/mysql-test/suite/jp/t/jp_create_tbl_ucs2.test +++ b/mysql-test/suite/jp/t/jp_create_tbl_ucs2.test @@ -1,4 +1,5 @@ --source include/have_ucs2.inc +--source include/have_innodb.inc --disable_warnings DROP TABLE IF EXISTS ``; @@ -169,101 +170,29 @@ DROP TABLE `ߏߏ`; DROP TABLE ``; DROP TABLE ``; -CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; -CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; -CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; -CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; -CREATE TABLE `ݏݏ`(`` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; -CREATE TABLE `ޏޏ`(`` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; +CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY; +CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY; +CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY; +CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY; +CREATE TABLE `ݏݏ`(`` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY; +CREATE TABLE `ޏޏ`(`` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY; # Tables should not be created because table names exist -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; -CREATE TABLE IF NOT EXISTS `ݏݏ`(`` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; -CREATE TABLE IF NOT EXISTS `ޏޏ`(`` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; +CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY; +CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY; +CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY; +CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY; +CREATE TABLE IF NOT EXISTS `ݏݏ`(`` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY; +CREATE TABLE IF NOT EXISTS `ޏޏ`(`` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY; # Tables should be created -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; -CREATE TABLE IF NOT EXISTS `ߏߏ`(``char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; - -DESC ``; -DESC ``; -DESC ``; -DESC ``; -DESC ``; -DESC ``; -DESC ``; -DESC ``; -DESC ``; -DESC ``; -DESC `ݏݏ`; -DESC `ޏޏ`; -DESC `ߏߏ`; -DESC ``; -DESC ``; - -SHOW CREATE TABLE ``; -SHOW CREATE TABLE ``; -SHOW CREATE TABLE ``; -SHOW CREATE TABLE ``; -SHOW CREATE TABLE ``; -SHOW CREATE TABLE ``; -SHOW CREATE TABLE ``; -SHOW CREATE TABLE ``; -SHOW CREATE TABLE ``; -SHOW CREATE TABLE ``; -SHOW CREATE TABLE `ݏݏ`; -SHOW CREATE TABLE `ޏޏ`; -SHOW CREATE TABLE `ߏߏ`; -SHOW CREATE TABLE ``; -SHOW CREATE TABLE ``; - -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE `ݏݏ`; -DROP TABLE `ޏޏ`; -DROP TABLE `ߏߏ`; -DROP TABLE ``; -DROP TABLE ``; - -CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=BDB; -CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=BDB; -CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=BDB; -CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=BDB; -CREATE TABLE `ݏݏ`(`` char(1)) DEFAULT CHARSET = ucs2 engine=BDB; -CREATE TABLE `ޏޏ`(`` char(1)) DEFAULT CHARSET = ucs2 engine=BDB; -# Tables should not be created because table names exist -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=BDB; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=BDB; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=BDB; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=BDB; -CREATE TABLE IF NOT EXISTS `ݏݏ`(`` char(1)) DEFAULT CHARSET = ucs2 engine=BDB; -CREATE TABLE IF NOT EXISTS `ޏޏ`(`` char(1)) DEFAULT CHARSET = ucs2 engine=BDB; -# Tables should be created -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=BDB; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=BDB; -CREATE TABLE IF NOT EXISTS `ߏߏ`(``char(1)) DEFAULT CHARSET = ucs2 engine=BDB; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=BDB; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=BDB; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=BDB; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=BDB; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=BDB; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=BDB; +CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY; +CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY; +CREATE TABLE IF NOT EXISTS `ߏߏ`(``char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY; +CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY; +CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY; +CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY; +CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY; +CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY; +CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ucs2 engine=MEMORY; DESC ``; DESC ``; diff --git a/mysql-test/suite/jp/t/jp_create_tbl_ujis.test b/mysql-test/suite/jp/t/jp_create_tbl_ujis.test index ac70facdce9..c82d11868bd 100644 --- a/mysql-test/suite/jp/t/jp_create_tbl_ujis.test +++ b/mysql-test/suite/jp/t/jp_create_tbl_ujis.test @@ -1,4 +1,5 @@ --source include/have_ujis.inc +--source include/have_innodb.inc --disable_warnings DROP TABLE IF EXISTS ``; @@ -169,101 +170,29 @@ DROP TABLE `ߏߏ`; DROP TABLE ``; DROP TABLE ``; -CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=HEAP; -CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=HEAP; -CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=HEAP; -CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=HEAP; -CREATE TABLE `ݏݏ`(`` char(1)) DEFAULT CHARSET = ujis engine=HEAP; -CREATE TABLE `ޏޏ`(`` char(1)) DEFAULT CHARSET = ujis engine=HEAP; +CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=MEMORY; +CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=MEMORY; +CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=MEMORY; +CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=MEMORY; +CREATE TABLE `ݏݏ`(`` char(1)) DEFAULT CHARSET = ujis engine=MEMORY; +CREATE TABLE `ޏޏ`(`` char(1)) DEFAULT CHARSET = ujis engine=MEMORY; # Tables should not be created because table names exist -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ujis engine=HEAP; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ujis engine=HEAP; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ujis engine=HEAP; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ujis engine=HEAP; -CREATE TABLE IF NOT EXISTS `ݏݏ`(`` char(1)) DEFAULT CHARSET = ujis engine=HEAP; -CREATE TABLE IF NOT EXISTS `ޏޏ`(`` char(1)) DEFAULT CHARSET = ujis engine=HEAP; +CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ujis engine=MEMORY; +CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ujis engine=MEMORY; +CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ujis engine=MEMORY; +CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ujis engine=MEMORY; +CREATE TABLE IF NOT EXISTS `ݏݏ`(`` char(1)) DEFAULT CHARSET = ujis engine=MEMORY; +CREATE TABLE IF NOT EXISTS `ޏޏ`(`` char(1)) DEFAULT CHARSET = ujis engine=MEMORY; # Tables should be created -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ujis engine=HEAP; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ujis engine=HEAP; -CREATE TABLE IF NOT EXISTS `ߏߏ`(``char(1)) DEFAULT CHARSET = ujis engine=HEAP; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=HEAP; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=HEAP; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=HEAP; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=HEAP; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=HEAP; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=HEAP; - -DESC ``; -DESC ``; -DESC ``; -DESC ``; -DESC ``; -DESC ``; -DESC ``; -DESC ``; -DESC ``; -DESC ``; -DESC `ݏݏ`; -DESC `ޏޏ`; -DESC `ߏߏ`; -DESC ``; -DESC ``; - -SHOW CREATE TABLE ``; -SHOW CREATE TABLE ``; -SHOW CREATE TABLE ``; -SHOW CREATE TABLE ``; -SHOW CREATE TABLE ``; -SHOW CREATE TABLE ``; -SHOW CREATE TABLE ``; -SHOW CREATE TABLE ``; -SHOW CREATE TABLE ``; -SHOW CREATE TABLE ``; -SHOW CREATE TABLE `ݏݏ`; -SHOW CREATE TABLE `ޏޏ`; -SHOW CREATE TABLE `ߏߏ`; -SHOW CREATE TABLE ``; -SHOW CREATE TABLE ``; - -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE ``; -DROP TABLE `ݏݏ`; -DROP TABLE `ޏޏ`; -DROP TABLE `ߏߏ`; -DROP TABLE ``; -DROP TABLE ``; - -CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=BDB; -CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=BDB; -CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=BDB; -CREATE TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=BDB; -CREATE TABLE `ݏݏ`(`` char(1)) DEFAULT CHARSET = ujis engine=BDB; -CREATE TABLE `ޏޏ`(`` char(1)) DEFAULT CHARSET = ujis engine=BDB; -# Tables should not be created because table names exist -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ujis engine=BDB; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ujis engine=BDB; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ujis engine=BDB; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ujis engine=BDB; -CREATE TABLE IF NOT EXISTS `ݏݏ`(`` char(1)) DEFAULT CHARSET = ujis engine=BDB; -CREATE TABLE IF NOT EXISTS `ޏޏ`(`` char(1)) DEFAULT CHARSET = ujis engine=BDB; -# Tables should be created -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ujis engine=BDB; -CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ujis engine=BDB; -CREATE TABLE IF NOT EXISTS `ߏߏ`(``char(1)) DEFAULT CHARSET = ujis engine=BDB; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=BDB; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=BDB; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=BDB; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=BDB; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=BDB; -CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=BDB; +CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ujis engine=MEMORY; +CREATE TABLE IF NOT EXISTS ``(`` char(1)) DEFAULT CHARSET = ujis engine=MEMORY; +CREATE TABLE IF NOT EXISTS `ߏߏ`(``char(1)) DEFAULT CHARSET = ujis engine=MEMORY; +CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=MEMORY; +CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=MEMORY; +CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=MEMORY; +CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=MEMORY; +CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=MEMORY; +CREATE TEMPORARY TABLE ``(`` char(1)) DEFAULT CHARSET = ujis engine=MEMORY; DESC ``; DESC ``; diff --git a/mysql-test/suite/jp/t/jp_create_tbl_utf8.test b/mysql-test/suite/jp/t/jp_create_tbl_utf8.test index 5c816eb169a..d079560a931 100644 --- a/mysql-test/suite/jp/t/jp_create_tbl_utf8.test +++ b/mysql-test/suite/jp/t/jp_create_tbl_utf8.test @@ -1,3 +1,5 @@ +--source include/have_utf8.inc +--source include/have_innodb.inc --disable_warnings DROP TABLE IF EXISTS `ｱｱｱ`; DROP TABLE IF EXISTS `ｲｲｲ`; @@ -167,101 +169,29 @@ DROP TABLE `龞龞龞`; DROP TABLE `龡龡龡`; DROP TABLE `龢龢龢`; -CREATE TABLE `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = utf8 engine=HEAP; -CREATE TABLE `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = utf8 engine=HEAP; -CREATE TABLE `あああ`(`かかか` char(1)) DEFAULT CHARSET = utf8 engine=HEAP; -CREATE TABLE `いいい`(`ききき` char(1)) DEFAULT CHARSET = utf8 engine=HEAP; -CREATE TABLE `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = utf8 engine=HEAP; -CREATE TABLE `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = utf8 engine=HEAP; +CREATE TABLE `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY; +CREATE TABLE `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY; +CREATE TABLE `あああ`(`かかか` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY; +CREATE TABLE `いいい`(`ききき` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY; +CREATE TABLE `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY; +CREATE TABLE `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY; # Tables should not be created because table names exist -CREATE TABLE IF NOT EXISTS `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = utf8 engine=HEAP; -CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = utf8 engine=HEAP; -CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = utf8 engine=HEAP; -CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = utf8 engine=HEAP; -CREATE TABLE IF NOT EXISTS `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = utf8 engine=HEAP; -CREATE TABLE IF NOT EXISTS `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = utf8 engine=HEAP; +CREATE TABLE IF NOT EXISTS `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY; +CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY; +CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY; +CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY; +CREATE TABLE IF NOT EXISTS `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY; +CREATE TABLE IF NOT EXISTS `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY; # Tables should be created -CREATE TABLE IF NOT EXISTS `ｳｳｳ`(`ｸｸｸ` char(1)) DEFAULT CHARSET = utf8 engine=HEAP; -CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = utf8 engine=HEAP; -CREATE TABLE IF NOT EXISTS `龞龞龞`(`丅丅丅`char(1)) DEFAULT CHARSET = utf8 engine=HEAP; -CREATE TEMPORARY TABLE `ｴｴｴ`(`ｹｹｹ` char(1)) DEFAULT CHARSET = utf8 engine=HEAP; -CREATE TEMPORARY TABLE `ｵｵｵ`(`ｺｺｺ` char(1)) DEFAULT CHARSET = utf8 engine=HEAP; -CREATE TEMPORARY TABLE `えええ`(`けけけ` char(1)) DEFAULT CHARSET = utf8 engine=HEAP; -CREATE TEMPORARY TABLE `おおお`(`こここ` char(1)) DEFAULT CHARSET = utf8 engine=HEAP; -CREATE TEMPORARY TABLE `龡龡龡`(`丌丌丌` char(1)) DEFAULT CHARSET = utf8 engine=HEAP; -CREATE TEMPORARY TABLE `龢龢龢`(`丒丒丒` char(1)) DEFAULT CHARSET = utf8 engine=HEAP; - -DESC `ｱｱｱ`; -DESC `ｲｲｲ`; -DESC `ｳｳｳ`; -DESC `ｴｴｴ`; -DESC `ｵｵｵ`; -DESC `あああ`; -DESC `いいい`; -DESC `ううう`; -DESC `えええ`; -DESC `おおお`; -DESC `龖龖龖`; -DESC `龗龗龗`; -DESC `龞龞龞`; -DESC `龡龡龡`; -DESC `龢龢龢`; - -SHOW CREATE TABLE `ｱｱｱ`; -SHOW CREATE TABLE `ｲｲｲ`; -SHOW CREATE TABLE `ｳｳｳ`; -SHOW CREATE TABLE `ｴｴｴ`; -SHOW CREATE TABLE `ｵｵｵ`; -SHOW CREATE TABLE `あああ`; -SHOW CREATE TABLE `いいい`; -SHOW CREATE TABLE `ううう`; -SHOW CREATE TABLE `えええ`; -SHOW CREATE TABLE `おおお`; -SHOW CREATE TABLE `龖龖龖`; -SHOW CREATE TABLE `龗龗龗`; -SHOW CREATE TABLE `龞龞龞`; -SHOW CREATE TABLE `龡龡龡`; -SHOW CREATE TABLE `龢龢龢`; - -DROP TABLE `ｱｱｱ`; -DROP TABLE `ｲｲｲ`; -DROP TABLE `ｳｳｳ`; -DROP TABLE `ｴｴｴ`; -DROP TABLE `ｵｵｵ`; -DROP TABLE `あああ`; -DROP TABLE `いいい`; -DROP TABLE `ううう`; -DROP TABLE `えええ`; -DROP TABLE `おおお`; -DROP TABLE `龖龖龖`; -DROP TABLE `龗龗龗`; -DROP TABLE `龞龞龞`; -DROP TABLE `龡龡龡`; -DROP TABLE `龢龢龢`; - -CREATE TABLE `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = utf8 engine=BDB; -CREATE TABLE `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = utf8 engine=BDB; -CREATE TABLE `あああ`(`かかか` char(1)) DEFAULT CHARSET = utf8 engine=BDB; -CREATE TABLE `いいい`(`ききき` char(1)) DEFAULT CHARSET = utf8 engine=BDB; -CREATE TABLE `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = utf8 engine=BDB; -CREATE TABLE `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = utf8 engine=BDB; -# Tables should not be created because table names exist -CREATE TABLE IF NOT EXISTS `ｱｱｱ`(`ｶｶｶ` char(1)) DEFAULT CHARSET = utf8 engine=BDB; -CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = utf8 engine=BDB; -CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = utf8 engine=BDB; -CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = utf8 engine=BDB; -CREATE TABLE IF NOT EXISTS `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = utf8 engine=BDB; -CREATE TABLE IF NOT EXISTS `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = utf8 engine=BDB; -# Tables should be created -CREATE TABLE IF NOT EXISTS `ｳｳｳ`(`ｸｸｸ` char(1)) DEFAULT CHARSET = utf8 engine=BDB; -CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = utf8 engine=BDB; -CREATE TABLE IF NOT EXISTS `龞龞龞`(`丅丅丅`char(1)) DEFAULT CHARSET = utf8 engine=BDB; -CREATE TEMPORARY TABLE `ｴｴｴ`(`ｹｹｹ` char(1)) DEFAULT CHARSET = utf8 engine=BDB; -CREATE TEMPORARY TABLE `ｵｵｵ`(`ｺｺｺ` char(1)) DEFAULT CHARSET = utf8 engine=BDB; -CREATE TEMPORARY TABLE `えええ`(`けけけ` char(1)) DEFAULT CHARSET = utf8 engine=BDB; -CREATE TEMPORARY TABLE `おおお`(`こここ` char(1)) DEFAULT CHARSET = utf8 engine=BDB; -CREATE TEMPORARY TABLE `龡龡龡`(`丌丌丌` char(1)) DEFAULT CHARSET = utf8 engine=BDB; -CREATE TEMPORARY TABLE `龢龢龢`(`丒丒丒` char(1)) DEFAULT CHARSET = utf8 engine=BDB; +CREATE TABLE IF NOT EXISTS `ｳｳｳ`(`ｸｸｸ` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY; +CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY; +CREATE TABLE IF NOT EXISTS `龞龞龞`(`丅丅丅`char(1)) DEFAULT CHARSET = utf8 engine=MEMORY; +CREATE TEMPORARY TABLE `ｴｴｴ`(`ｹｹｹ` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY; +CREATE TEMPORARY TABLE `ｵｵｵ`(`ｺｺｺ` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY; +CREATE TEMPORARY TABLE `えええ`(`けけけ` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY; +CREATE TEMPORARY TABLE `おおお`(`こここ` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY; +CREATE TEMPORARY TABLE `龡龡龡`(`丌丌丌` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY; +CREATE TEMPORARY TABLE `龢龢龢`(`丒丒丒` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY; DESC `ｱｱｱ`; DESC `ｲｲｲ`; diff --git a/mysql-test/suite/jp/t/jp_enum_sjis-master.opt b/mysql-test/suite/jp/t/jp_enum_sjis-master.opt new file mode 100644 index 00000000000..9b27aef9bf8 --- /dev/null +++ b/mysql-test/suite/jp/t/jp_enum_sjis-master.opt @@ -0,0 +1 @@ +--lower_case_table_names=0 diff --git a/mysql-test/suite/jp/t/jp_enum_sjis.test b/mysql-test/suite/jp/t/jp_enum_sjis.test index 2ea1bf320e0..e1f22f6fe27 100644 --- a/mysql-test/suite/jp/t/jp_enum_sjis.test +++ b/mysql-test/suite/jp/t/jp_enum_sjis.test @@ -1,3 +1,5 @@ +--source include/have_sjis.inc +--source include/have_innodb.inc --character_set sjis --disable_warnings drop table if exists `sP`; @@ -9,10 +11,7 @@ drop table if exists `sU`; 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`; -#drop table if exists t1; +drop table if exists t1; --enable_warnings # @@ -28,12 +27,9 @@ CREATE TABLE `sR` (`bP` ENUM('\','\','\'), INDEX(`bP`)) DEFAULT CHARSET CREATE TABLE `sS` (`bP` ENUM('','',''), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sT` (`bP` ENUM('','',''), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sU` (`bP` ENUM('\','\','\'), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; -CREATE TABLE `sV` (`bP` ENUM('','',''), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sW` (`bP` ENUM('','',''), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sX` (`bP` ENUM('\','\','\'), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPO` (`bP` ENUM('','',''), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPP` (`bP` ENUM('','',''), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPQ` (`bP` ENUM('\','\','\'), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; +CREATE TABLE `sV` (`bP` ENUM('','',''), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sW` (`bP` ENUM('','',''), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sX` (`bP` ENUM('\','\','\'), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; INSERT INTO `sP` VALUES (''),(''),(''); INSERT INTO `sQ` VALUES (''),(''),(''); @@ -44,9 +40,6 @@ INSERT INTO `sU` VALUES ('\'),('\'),('\'); INSERT INTO `sV` VALUES (''),(''),(''); INSERT INTO `sW` VALUES (''),(''),(''); INSERT INTO `sX` VALUES ('\'),('\'),('\'); -INSERT INTO `sPO` VALUES (''),(''),(''); -INSERT INTO `sPP` VALUES (''),(''),(''); -INSERT INTO `sPQ` VALUES ('\'),('\'),('\'); SELECT * FROM `sP`; SELECT * FROM `sQ`; @@ -57,9 +50,6 @@ SELECT * FROM `sU`; SELECT * FROM `sV`; SELECT * FROM `sW`; SELECT * FROM `sX`; -SELECT * FROM `sPO`; -SELECT * FROM `sPP`; -SELECT * FROM `sPQ`; SHOW CREATE TABLE `sP`; SHOW CREATE TABLE `sQ`; @@ -70,9 +60,6 @@ SHOW CREATE TABLE `sU`; SHOW CREATE TABLE `sV`; SHOW CREATE TABLE `sW`; SHOW CREATE TABLE `sX`; -SHOW CREATE TABLE `sPO`; -SHOW CREATE TABLE `sPP`; -SHOW CREATE TABLE `sPQ`; DESC `sP`; DESC `sQ`; @@ -83,9 +70,6 @@ DESC `sU`; DESC `sV`; DESC `sW`; DESC `sX`; -DESC `sPO`; -DESC `sPP`; -DESC `sPQ`; # # Test problem with enum values after the colum with NOT NULL restriction @@ -100,9 +84,6 @@ ALTER TABLE `sU` ADD `bQ` CHAR(1) NOT NULL FIRST; ALTER TABLE `sV` ADD `bQ` CHAR(1) NOT NULL FIRST; ALTER TABLE `sW` ADD `bQ` CHAR(1) NOT NULL FIRST; ALTER TABLE `sX` ADD `bQ` CHAR(1) NOT NULL FIRST; -ALTER TABLE `sPO` ADD `bQ` CHAR(1) NOT NULL FIRST; -ALTER TABLE `sPP` ADD `bQ` CHAR(1) NOT NULL FIRST; -ALTER TABLE `sPQ` ADD `bQ` CHAR(1) NOT NULL FIRST; SHOW CREATE TABLE `sP`; SHOW CREATE TABLE `sQ`; @@ -113,18 +94,16 @@ SHOW CREATE TABLE `sU`; SHOW CREATE TABLE `sV`; SHOW CREATE TABLE `sW`; SHOW CREATE TABLE `sX`; -SHOW CREATE TABLE `sPO`; -SHOW CREATE TABLE `sPP`; -SHOW CREATE TABLE `sPQ`; # # Test to distinguish 0x9353 and 0x9373 -# bug #6206 need to be fixed +# Bug#6206 ENUMs are not case sensitive even if declared BINARY +# -#CREATE TABLE t1(c1 enum('S','s')) default character set = sjis; -#INSERT INTO t1 VALUES('S'),('s'); -#SELECT * FROM t1 WHERE c1 LIKE 'S'; -#DROP TABLE t1; +CREATE TABLE t1(c1 enum('S','s')) default character set = sjis; +INSERT INTO t1 VALUES('S'),('s'); +SELECT * FROM t1 WHERE c1 LIKE 'S'; +DROP TABLE t1; DESC `sP`; DESC `sQ`; @@ -135,9 +114,6 @@ DESC `sU`; DESC `sV`; DESC `sW`; DESC `sX`; -DESC `sPO`; -DESC `sPP`; -DESC `sPQ`; DROP TABLE `sP`; DROP TABLE `sQ`; @@ -148,6 +124,3 @@ DROP TABLE `sU`; DROP TABLE `sV`; DROP TABLE `sW`; DROP TABLE `sX`; -DROP TABLE `sPO`; -DROP TABLE `sPP`; -DROP TABLE `sPQ`; diff --git a/mysql-test/suite/jp/t/jp_enum_ucs2-master.opt b/mysql-test/suite/jp/t/jp_enum_ucs2-master.opt new file mode 100644 index 00000000000..9b27aef9bf8 --- /dev/null +++ b/mysql-test/suite/jp/t/jp_enum_ucs2-master.opt @@ -0,0 +1 @@ +--lower_case_table_names=0 diff --git a/mysql-test/suite/jp/t/jp_enum_ucs2.test b/mysql-test/suite/jp/t/jp_enum_ucs2.test index 2239ebab478..a3d7c47705d 100644 --- a/mysql-test/suite/jp/t/jp_enum_ucs2.test +++ b/mysql-test/suite/jp/t/jp_enum_ucs2.test @@ -1,4 +1,5 @@ --source include/have_ucs2.inc +--source include/have_innodb.inc # half-with kana is not handled correctly in 4.1 # because of bug #5174 @@ -14,9 +15,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 `ԣ`; --enable_warnings # @@ -33,12 +31,9 @@ CREATE TABLE `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHAR CREATE TABLE `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = myisam; CREATE TABLE `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = myisam; CREATE TABLE `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = myisam; -CREATE TABLE `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = bdb; -CREATE TABLE `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = bdb; -CREATE TABLE `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = bdb; +CREATE TABLE `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = MEMORY; INSERT INTO `ԣ` VALUES (''),(''),(''); INSERT INTO `ԣ` VALUES (''),(''),(''); @@ -49,9 +44,6 @@ INSERT INTO `ԣ` VALUES (''),(''),(''); INSERT INTO `ԣ` VALUES (''),(''),(''); INSERT INTO `ԣ` VALUES (''),(''),(''); INSERT INTO `ԣ` VALUES (''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''); SELECT * FROM `ԣ`; SELECT * FROM `ԣ`; @@ -62,9 +54,6 @@ SELECT * FROM `ԣ`; SELECT * FROM `ԣ`; SELECT * FROM `ԣ`; SELECT * FROM `ԣ`; -SELECT * FROM `ԣ`; -SELECT * FROM `ԣ`; -SELECT * FROM `ԣ`; SHOW CREATE TABLE `ԣ`; SHOW CREATE TABLE `ԣ`; @@ -75,9 +64,6 @@ SHOW CREATE TABLE `ԣ`; SHOW CREATE TABLE `ԣ`; SHOW CREATE TABLE `ԣ`; SHOW CREATE TABLE `ԣ`; -SHOW CREATE TABLE `ԣ`; -SHOW CREATE TABLE `ԣ`; -SHOW CREATE TABLE `ԣ`; DESC `ԣ`; DESC `ԣ`; @@ -88,52 +74,39 @@ DESC `ԣ`; DESC `ԣ`; DESC `ԣ`; DESC `ԣ`; -DESC `ԣ`; -DESC `ԣ`; -DESC `ԣ`; # # Test problem with enum values after the colum with NOT NULL restriction -# Cannot test until the bug#7302 is fixed +# Bug#7302 UCS2 data in ENUM field get truncated when new column is added +ALTER TABLE `ԣ` ADD `ã` CHAR(1) NOT NULL FIRST; +ALTER TABLE `ԣ` ADD `ã` CHAR(1) NOT NULL FIRST; +ALTER TABLE `ԣ` ADD `ã` CHAR(1) NOT NULL FIRST; +ALTER TABLE `ԣ` ADD `ã` CHAR(1) NOT NULL FIRST; +ALTER TABLE `ԣ` ADD `ã` CHAR(1) NOT NULL FIRST; +ALTER TABLE `ԣ` ADD `ã` CHAR(1) NOT NULL FIRST; +ALTER TABLE `ԣ` ADD `ã` CHAR(1) NOT NULL FIRST; +ALTER TABLE `ԣ` ADD `ã` CHAR(1) NOT NULL FIRST; +ALTER TABLE `ԣ` ADD `ã` CHAR(1) NOT NULL FIRST; -#ALTER TABLE `ԣ` ADD `ã` CHAR(1) NOT NULL FIRST; -#ALTER TABLE `ԣ` ADD `ã` CHAR(1) NOT NULL FIRST; -#ALTER TABLE `ԣ` ADD `ã` CHAR(1) NOT NULL FIRST; -#ALTER TABLE `ԣ` ADD `ã` CHAR(1) NOT NULL FIRST; -#ALTER TABLE `ԣ` ADD `ã` CHAR(1) NOT NULL FIRST; -#ALTER TABLE `ԣ` ADD `ã` CHAR(1) NOT NULL FIRST; -#ALTER TABLE `ԣ` ADD `ã` CHAR(1) NOT NULL FIRST; -#ALTER TABLE `ԣ` ADD `ã` CHAR(1) NOT NULL FIRST; -#ALTER TABLE `ԣ` ADD `ã` CHAR(1) NOT NULL FIRST; -#ALTER TABLE `ԣ` ADD `ã` CHAR(1) NOT NULL FIRST; -#ALTER TABLE `ԣ` ADD `ã` CHAR(1) NOT NULL FIRST; -#ALTER TABLE `ԣ` ADD `ã` CHAR(1) NOT NULL FIRST; - -#SHOW CREATE TABLE `ԣ`; -#SHOW CREATE TABLE `ԣ`; -#SHOW CREATE TABLE `ԣ`; -#SHOW CREATE TABLE `ԣ`; -#SHOW CREATE TABLE `ԣ`; -#SHOW CREATE TABLE `ԣ`; -#SHOW CREATE TABLE `ԣ`; -#SHOW CREATE TABLE `ԣ`; -#SHOW CREATE TABLE `ԣ`; -#SHOW CREATE TABLE `ԣ`; -#SHOW CREATE TABLE `ԣ`; -#SHOW CREATE TABLE `ԣ`; +SHOW CREATE TABLE `ԣ`; +SHOW CREATE TABLE `ԣ`; +SHOW CREATE TABLE `ԣ`; +SHOW CREATE TABLE `ԣ`; +SHOW CREATE TABLE `ԣ`; +SHOW CREATE TABLE `ԣ`; +SHOW CREATE TABLE `ԣ`; +SHOW CREATE TABLE `ԣ`; +SHOW CREATE TABLE `ԣ`; -#DESC `ԣ`; -#DESC `ԣ`; -#DESC `ԣ`; -#DESC `ԣ`; -#DESC `ԣ`; -#DESC `ԣ`; -#DESC `ԣ`; -#DESC `ԣ`; -#DESC `ԣ`; -#DESC `ԣ`; -#DESC `ԣ`; -#DESC `ԣ`; +DESC `ԣ`; +DESC `ԣ`; +DESC `ԣ`; +DESC `ԣ`; +DESC `ԣ`; +DESC `ԣ`; +DESC `ԣ`; +DESC `ԣ`; +DESC `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -144,6 +117,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/t/jp_enum_ujis-master.opt b/mysql-test/suite/jp/t/jp_enum_ujis-master.opt new file mode 100644 index 00000000000..9b27aef9bf8 --- /dev/null +++ b/mysql-test/suite/jp/t/jp_enum_ujis-master.opt @@ -0,0 +1 @@ +--lower_case_table_names=0 diff --git a/mysql-test/suite/jp/t/jp_enum_ujis.test b/mysql-test/suite/jp/t/jp_enum_ujis.test index da41165aad0..17e41e0691e 100644 --- a/mysql-test/suite/jp/t/jp_enum_ujis.test +++ b/mysql-test/suite/jp/t/jp_enum_ujis.test @@ -1,4 +1,5 @@ --source include/have_ujis.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `ԣ`; @@ -10,9 +11,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 `ԣ`; --enable_warnings # @@ -28,12 +26,9 @@ CREATE TABLE `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHAR CREATE TABLE `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = myisam; CREATE TABLE `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = myisam; CREATE TABLE `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = myisam; -CREATE TABLE `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = bdb; -CREATE TABLE `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = bdb; -CREATE TABLE `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = bdb; +CREATE TABLE `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣ` (`ã` ENUM('','',''), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = MEMORY; INSERT INTO `ԣ` VALUES (''),(''),(''); INSERT INTO `ԣ` VALUES (''),(''),(''); @@ -44,9 +39,6 @@ INSERT INTO `ԣ` VALUES (''),(''),(''); INSERT INTO `ԣ` VALUES (''),(''),(''); INSERT INTO `ԣ` VALUES (''),(''),(''); INSERT INTO `ԣ` VALUES (''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''); SELECT * FROM `ԣ`; SELECT * FROM `ԣ`; @@ -57,9 +49,6 @@ SELECT * FROM `ԣ`; SELECT * FROM `ԣ`; SELECT * FROM `ԣ`; SELECT * FROM `ԣ`; -SELECT * FROM `ԣ`; -SELECT * FROM `ԣ`; -SELECT * FROM `ԣ`; SHOW CREATE TABLE `ԣ`; SHOW CREATE TABLE `ԣ`; @@ -70,9 +59,6 @@ SHOW CREATE TABLE `ԣ`; SHOW CREATE TABLE `ԣ`; SHOW CREATE TABLE `ԣ`; SHOW CREATE TABLE `ԣ`; -SHOW CREATE TABLE `ԣ`; -SHOW CREATE TABLE `ԣ`; -SHOW CREATE TABLE `ԣ`; DESC `ԣ`; DESC `ԣ`; @@ -83,9 +69,6 @@ DESC `ԣ`; DESC `ԣ`; DESC `ԣ`; DESC `ԣ`; -DESC `ԣ`; -DESC `ԣ`; -DESC `ԣ`; # # Test problem with enum values after the colum with NOT NULL restriction @@ -100,9 +83,6 @@ ALTER TABLE `ԣ` ADD `ã` CHAR(1) NOT NULL FIRST; ALTER TABLE `ԣ` ADD `ã` CHAR(1) NOT NULL FIRST; ALTER TABLE `ԣ` ADD `ã` CHAR(1) NOT NULL FIRST; ALTER TABLE `ԣ` ADD `ã` CHAR(1) NOT NULL FIRST; -ALTER TABLE `ԣ` ADD `ã` CHAR(1) NOT NULL FIRST; -ALTER TABLE `ԣ` ADD `ã` CHAR(1) NOT NULL FIRST; -ALTER TABLE `ԣ` ADD `ã` CHAR(1) NOT NULL FIRST; SHOW CREATE TABLE `ԣ`; SHOW CREATE TABLE `ԣ`; @@ -113,9 +93,6 @@ SHOW CREATE TABLE `ԣ`; SHOW CREATE TABLE `ԣ`; SHOW CREATE TABLE `ԣ`; SHOW CREATE TABLE `ԣ`; -SHOW CREATE TABLE `ԣ`; -SHOW CREATE TABLE `ԣ`; -SHOW CREATE TABLE `ԣ`; DESC `ԣ`; DESC `ԣ`; @@ -126,9 +103,6 @@ DESC `ԣ`; DESC `ԣ`; DESC `ԣ`; DESC `ԣ`; -DESC `ԣ`; -DESC `ԣ`; -DESC `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -139,6 +113,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/t/jp_enum_utf8-master.opt b/mysql-test/suite/jp/t/jp_enum_utf8-master.opt new file mode 100644 index 00000000000..9b27aef9bf8 --- /dev/null +++ b/mysql-test/suite/jp/t/jp_enum_utf8-master.opt @@ -0,0 +1 @@ +--lower_case_table_names=0 diff --git a/mysql-test/suite/jp/t/jp_enum_utf8.test b/mysql-test/suite/jp/t/jp_enum_utf8.test index 4ce3576b604..ff5978da69c 100644 --- a/mysql-test/suite/jp/t/jp_enum_utf8.test +++ b/mysql-test/suite/jp/t/jp_enum_utf8.test @@ -1,3 +1,5 @@ +--source include/have_utf8.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `Ｔ１`; drop table if exists `Ｔ２`; @@ -8,9 +10,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 `Ｔ１２`; --enable_warnings # @@ -26,12 +25,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` ENUM('龔','龖','龗'), INDEX(`Ｃ１`)) DEFAUL CREATE TABLE `Ｔ４` (`Ｃ１` ENUM('ｱ','ｲ','ｳ'), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam; CREATE TABLE `Ｔ５` (`Ｃ１` ENUM('あ','い','う'), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam; CREATE TABLE `Ｔ６` (`Ｃ１` ENUM('龔','龖','龗'), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam; -CREATE TABLE `Ｔ７` (`Ｃ１` ENUM('ｱ','ｲ','ｳ'), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ８` (`Ｃ１` ENUM('あ','い','う'), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ９` (`Ｃ１` ENUM('龔','龖','龗'), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ１０` (`Ｃ１` ENUM('ｱ','ｲ','ｳ'), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb; -CREATE TABLE `Ｔ１１` (`Ｃ１` ENUM('あ','い','う'), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb; -CREATE TABLE `Ｔ１２` (`Ｃ１` ENUM('龔','龖','龗'), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb; +CREATE TABLE `Ｔ７` (`Ｃ１` ENUM('ｱ','ｲ','ｳ'), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ８` (`Ｃ１` ENUM('あ','い','う'), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ９` (`Ｃ１` ENUM('龔','龖','龗'), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY; INSERT INTO `Ｔ１` VALUES ('ｱ'),('ｲ'),('ｳ'); INSERT INTO `Ｔ２` VALUES ('あ'),('い'),('う'); @@ -42,9 +38,6 @@ INSERT INTO `Ｔ６` VALUES ('龔'),('龖'),('龗'); INSERT INTO `Ｔ７` VALUES ('ｱ'),('ｲ'),('ｳ'); INSERT INTO `Ｔ８` VALUES ('あ'),('い'),('う'); INSERT INTO `Ｔ９` VALUES ('龔'),('龖'),('龗'); -INSERT INTO `Ｔ１０` VALUES ('ｱ'),('ｲ'),('ｳ'); -INSERT INTO `Ｔ１１` VALUES ('あ'),('い'),('う'); -INSERT INTO `Ｔ１２` VALUES ('龔'),('龖'),('龗'); SELECT * FROM `Ｔ１`; SELECT * FROM `Ｔ２`; @@ -55,9 +48,6 @@ SELECT * FROM `Ｔ６`; SELECT * FROM `Ｔ７`; SELECT * FROM `Ｔ８`; SELECT * FROM `Ｔ９`; -SELECT * FROM `Ｔ１０`; -SELECT * FROM `Ｔ１１`; -SELECT * FROM `Ｔ１２`; SHOW CREATE TABLE `Ｔ１`; SHOW CREATE TABLE `Ｔ２`; @@ -68,9 +58,6 @@ SHOW CREATE TABLE `Ｔ６`; SHOW CREATE TABLE `Ｔ７`; SHOW CREATE TABLE `Ｔ８`; SHOW CREATE TABLE `Ｔ９`; -SHOW CREATE TABLE `Ｔ１０`; -SHOW CREATE TABLE `Ｔ１１`; -SHOW CREATE TABLE `Ｔ１２`; DESC `Ｔ１`; DESC `Ｔ２`; @@ -81,9 +68,6 @@ DESC `Ｔ６`; DESC `Ｔ７`; DESC `Ｔ８`; DESC `Ｔ９`; -DESC `Ｔ１０`; -DESC `Ｔ１１`; -DESC `Ｔ１２`; # # Test problem with enum values after the colum with NOT NULL restriction @@ -98,9 +82,6 @@ ALTER TABLE `Ｔ６` ADD `Ｃ２` CHAR(1) NOT NULL FIRST; ALTER TABLE `Ｔ７` ADD `Ｃ２` CHAR(1) NOT NULL FIRST; ALTER TABLE `Ｔ８` ADD `Ｃ２` CHAR(1) NOT NULL FIRST; ALTER TABLE `Ｔ９` ADD `Ｃ２` CHAR(1) NOT NULL FIRST; -ALTER TABLE `Ｔ１０` ADD `Ｃ２` CHAR(1) NOT NULL FIRST; -ALTER TABLE `Ｔ１１` ADD `Ｃ２` CHAR(1) NOT NULL FIRST; -ALTER TABLE `Ｔ１２` ADD `Ｃ２` CHAR(1) NOT NULL FIRST; SHOW CREATE TABLE `Ｔ１`; SHOW CREATE TABLE `Ｔ２`; @@ -111,9 +92,6 @@ SHOW CREATE TABLE `Ｔ６`; SHOW CREATE TABLE `Ｔ７`; SHOW CREATE TABLE `Ｔ８`; SHOW CREATE TABLE `Ｔ９`; -SHOW CREATE TABLE `Ｔ１０`; -SHOW CREATE TABLE `Ｔ１１`; -SHOW CREATE TABLE `Ｔ１２`; DESC `Ｔ１`; DESC `Ｔ２`; @@ -124,9 +102,6 @@ DESC `Ｔ６`; DESC `Ｔ７`; DESC `Ｔ８`; DESC `Ｔ９`; -DESC `Ｔ１０`; -DESC `Ｔ１１`; -DESC `Ｔ１２`; DROP TABLE `Ｔ１`; DROP TABLE `Ｔ２`; @@ -137,6 +112,3 @@ DROP TABLE `Ｔ６`; DROP TABLE `Ｔ７`; DROP TABLE `Ｔ８`; DROP TABLE `Ｔ９`; -DROP TABLE `Ｔ１０`; -DROP TABLE `Ｔ１１`; -DROP TABLE `Ｔ１２`; diff --git a/mysql-test/suite/jp/t/jp_insert_sjis.test b/mysql-test/suite/jp/t/jp_insert_sjis.test index 0266ad1eaca..957798cb042 100644 --- a/mysql-test/suite/jp/t/jp_insert_sjis.test +++ b/mysql-test/suite/jp/t/jp_insert_sjis.test @@ -1,3 +1,5 @@ +--source include/have_sjis.inc +--source include/have_innodb.inc --character_set sjis --disable_warnings drop table if exists `sP`; @@ -9,9 +11,6 @@ drop table if exists `sU`; 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`; --enable_warnings # @@ -27,12 +26,9 @@ CREATE TABLE `sR` (`bP` char(5)) DEFAULT CHARSET = sjis engine = innodb; CREATE TABLE `sS` (`bP` char(5)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sT` (`bP` char(5)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sU` (`bP` char(5)) DEFAULT CHARSET = sjis engine = myisam; -CREATE TABLE `sV` (`bP` char(5)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sW` (`bP` char(5)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sX` (`bP` char(5)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPO` (`bP` char(5)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPP` (`bP` char(5)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPQ` (`bP` char(5)) DEFAULT CHARSET = sjis engine = bdb; +CREATE TABLE `sV` (`bP` char(5)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sW` (`bP` char(5)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sX` (`bP` char(5)) DEFAULT CHARSET = sjis engine = MEMORY; INSERT INTO `sP` VALUES (''); INSERT INTO `sQ` VALUES (''); @@ -43,9 +39,6 @@ INSERT INTO `sU` VALUES ('\\\\\'); INSERT INTO `sV` VALUES (''); INSERT INTO `sW` VALUES (''); INSERT INTO `sX` VALUES ('\\\\\'); -INSERT INTO `sPO` VALUES (''); -INSERT INTO `sPP` VALUES (''); -INSERT INTO `sPQ` VALUES ('\\\\\'); #InnoDB SELECT INSERT(`bP`,1,1,'') FROM `sP`; @@ -201,7 +194,7 @@ SELECT INSERT(`bP`,4,1,'\') FROM `sU`; SELECT INSERT(`bP`,4,2,'\\' ) FROM `sU`; SELECT INSERT(`bP`,5,1,'\') FROM `sU`; -#HEAP +#MEMORY SELECT INSERT(`bP`,1,1,'') FROM `sV`; SELECT INSERT(`bP`,1,2,'') FROM `sV`; SELECT INSERT(`bP`,1,3,'') FROM `sV`; @@ -278,68 +271,6 @@ SELECT INSERT(`bP`,4,1,'\') FROM `sX`; SELECT INSERT(`bP`,4,2,'\\' ) FROM `sX`; SELECT INSERT(`bP`,5,1,'\') FROM `sX`; -#BDB -SELECT INSERT(`bP`,1,1,'') FROM `sPO`; -SELECT INSERT(`bP`,1,2,'') FROM `sPO`; -SELECT INSERT(`bP`,1,3,'') FROM `sPO`; -SELECT INSERT(`bP`,1,4,'') FROM `sPO`; -SELECT INSERT(`bP`,1,5,'') FROM `sPO`; -SELECT INSERT(`bP`,2,1,'') FROM `sPO`; -SELECT INSERT(`bP`,2,2,'') FROM `sPO`; -SELECT INSERT(`bP`,2,3,'') FROM `sPO`; -SELECT INSERT(`bP`,2,4,'') FROM `sPO`; -SELECT INSERT(`bP`,3,1,'') FROM `sPO`; -SELECT INSERT(`bP`,3,2,'') FROM `sPO`; -SELECT INSERT(`bP`,3,3,'') FROM `sPO`; -SELECT INSERT(`bP`,4,1,'') FROM `sPO`; -SELECT INSERT(`bP`,4,2,'') FROM `sPO`; -SELECT INSERT(`bP`,5,1,'') FROM `sPO`; -SELECT INSERT(`bP`,1,1,'') FROM `sPP`; -SELECT INSERT(`bP`,1,2,'') FROM `sPP`; -SELECT INSERT(`bP`,1,3,'') FROM `sPP`; -SELECT INSERT(`bP`,1,4,'') FROM `sPP`; -SELECT INSERT(`bP`,1,5,'') FROM `sPP`; -SELECT INSERT(`bP`,2,1,'') FROM `sPP`; -SELECT INSERT(`bP`,2,2,'') FROM `sPP`; -SELECT INSERT(`bP`,2,3,'') FROM `sPP`; -SELECT INSERT(`bP`,2,4,'') FROM `sPP`; -SELECT INSERT(`bP`,3,1,'') FROM `sPP`; -SELECT INSERT(`bP`,3,2,'') FROM `sPP`; -SELECT INSERT(`bP`,3,3,'') FROM `sPP`; -SELECT INSERT(`bP`,4,1,'') FROM `sPP`; -SELECT INSERT(`bP`,4,2,'') FROM `sPP`; -SELECT INSERT(`bP`,5,1,'') FROM `sPP`; -SELECT INSERT(`bP`,1,1,'@') FROM `sPP`; -SELECT INSERT(`bP`,1,2,'@@') FROM `sPP`; -SELECT INSERT(`bP`,1,3,'@@@') FROM `sPP`; -SELECT INSERT(`bP`,1,4,'@@@@') FROM `sPP`; -SELECT INSERT(`bP`,1,5,'@@@@@') FROM `sPP`; -SELECT INSERT(`bP`,2,1,'@') FROM `sPP`; -SELECT INSERT(`bP`,2,2,'@@') FROM `sPP`; -SELECT INSERT(`bP`,2,3,'@@@') FROM `sPP`; -SELECT INSERT(`bP`,2,4,'@@@@') FROM `sPP`; -SELECT INSERT(`bP`,3,1,'@') FROM `sPP`; -SELECT INSERT(`bP`,3,2,'@@') FROM `sPP`; -SELECT INSERT(`bP`,3,3,'@@@') FROM `sPP`; -SELECT INSERT(`bP`,4,1,'@') FROM `sPP`; -SELECT INSERT(`bP`,4,2,'@@') FROM `sPP`; -SELECT INSERT(`bP`,5,1,'@') FROM `sPP`; -SELECT INSERT(`bP`,1,1,'\') FROM `sPQ`; -SELECT INSERT(`bP`,1,2,'\\') FROM `sPQ`; -SELECT INSERT(`bP`,1,3,'\\\') FROM `sPQ`; -SELECT INSERT(`bP`,1,4,'\\\\') FROM `sPQ`; -SELECT INSERT(`bP`,1,5,'\\\\\') FROM `sPQ`; -SELECT INSERT(`bP`,2,1,'\') FROM `sPQ`; -SELECT INSERT(`bP`,2,2,'\\') FROM `sPQ`; -SELECT INSERT(`bP`,2,3,'\\\') FROM `sPQ`; -SELECT INSERT(`bP`,2,4,'\\\\') FROM `sPQ`; -SELECT INSERT(`bP`,3,1,'\') FROM `sPQ`; -SELECT INSERT(`bP`,3,2,'\\') FROM `sPQ`; -SELECT INSERT(`bP`,3,3,'\\\') FROM `sPQ`; -SELECT INSERT(`bP`,4,1,'\') FROM `sPQ`; -SELECT INSERT(`bP`,4,2,'\\') FROM `sPQ`; -SELECT INSERT(`bP`,5,1,'\') FROM `sPQ`; - DROP TABLE `sP`; DROP TABLE `sQ`; DROP TABLE `sR`; @@ -349,6 +280,3 @@ DROP TABLE `sU`; DROP TABLE `sV`; DROP TABLE `sW`; DROP TABLE `sX`; -DROP TABLE `sPO`; -DROP TABLE `sPP`; -DROP TABLE `sPQ`; diff --git a/mysql-test/suite/jp/t/jp_insert_ucs2.test b/mysql-test/suite/jp/t/jp_insert_ucs2.test index 9b0a02e57d8..0cf29ed3104 100644 --- a/mysql-test/suite/jp/t/jp_insert_ucs2.test +++ b/mysql-test/suite/jp/t/jp_insert_ucs2.test @@ -1,4 +1,5 @@ --source include/have_ucs2.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `ԣ`; @@ -10,9 +11,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 `ԣ`; --enable_warnings # @@ -29,12 +27,9 @@ CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ucs2 engine = innodb; CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ucs2 engine = myisam; CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ucs2 engine = myisam; CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ucs2 engine = myisam; -CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ucs2 engine = bdb; -CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ucs2 engine = bdb; -CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ucs2 engine = bdb; +CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ucs2 engine = MEMORY; INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES (''); @@ -45,9 +40,6 @@ INSERT INTO `ԣ` VALUES ('ݏޏߏ'); INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES ('ݏޏߏ'); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'); #InnoDB SELECT INSERT(`ã`,1,1,'') FROM `ԣ`; @@ -203,7 +195,7 @@ SELECT INSERT(`ã`,4,1,'') FROM `ԣ`; SELECT INSERT(`ã`,4,2,'' ) FROM `ԣ`; SELECT INSERT(`ã`,5,1,'') FROM `ԣ`; -#HEAP +#MEMORY SELECT INSERT(`ã`,1,1,'') FROM `ԣ`; SELECT INSERT(`ã`,1,2,'') FROM `ԣ`; SELECT INSERT(`ã`,1,3,'') FROM `ԣ`; @@ -280,68 +272,6 @@ SELECT INSERT(`ã`,4,1,'') FROM `ԣ`; SELECT INSERT(`ã`,4,2,'' ) FROM `ԣ`; SELECT INSERT(`ã`,5,1,'') FROM `ԣ`; -#BDB -SELECT INSERT(`ã`,1,1,'') FROM `ԣ`; -SELECT INSERT(`ã`,1,2,'') FROM `ԣ`; -SELECT INSERT(`ã`,1,3,'') FROM `ԣ`; -SELECT INSERT(`ã`,1,4,'') FROM `ԣ`; -SELECT INSERT(`ã`,1,5,'') FROM `ԣ`; -SELECT INSERT(`ã`,2,1,'') FROM `ԣ`; -SELECT INSERT(`ã`,2,2,'') FROM `ԣ`; -SELECT INSERT(`ã`,2,3,'') FROM `ԣ`; -SELECT INSERT(`ã`,2,4,'') FROM `ԣ`; -SELECT INSERT(`ã`,3,1,'') FROM `ԣ`; -SELECT INSERT(`ã`,3,2,'') FROM `ԣ`; -SELECT INSERT(`ã`,3,3,'') FROM `ԣ`; -SELECT INSERT(`ã`,4,1,'') FROM `ԣ`; -SELECT INSERT(`ã`,4,2,'') FROM `ԣ`; -SELECT INSERT(`ã`,5,1,'') FROM `ԣ`; -SELECT INSERT(`ã`,1,1,'') FROM `ԣ`; -SELECT INSERT(`ã`,1,2,'') FROM `ԣ`; -SELECT INSERT(`ã`,1,3,'') FROM `ԣ`; -SELECT INSERT(`ã`,1,4,'') FROM `ԣ`; -SELECT INSERT(`ã`,1,5,'') FROM `ԣ`; -SELECT INSERT(`ã`,2,1,'') FROM `ԣ`; -SELECT INSERT(`ã`,2,2,'') FROM `ԣ`; -SELECT INSERT(`ã`,2,3,'') FROM `ԣ`; -SELECT INSERT(`ã`,2,4,'') FROM `ԣ`; -SELECT INSERT(`ã`,3,1,'') FROM `ԣ`; -SELECT INSERT(`ã`,3,2,'') FROM `ԣ`; -SELECT INSERT(`ã`,3,3,'') FROM `ԣ`; -SELECT INSERT(`ã`,4,1,'') FROM `ԣ`; -SELECT INSERT(`ã`,4,2,'') FROM `ԣ`; -SELECT INSERT(`ã`,5,1,'') FROM `ԣ`; -SELECT INSERT(`ã`,1,1,'') FROM `ԣ`; -SELECT INSERT(`ã`,1,2,'') FROM `ԣ`; -SELECT INSERT(`ã`,1,3,'') FROM `ԣ`; -SELECT INSERT(`ã`,1,4,'') FROM `ԣ`; -SELECT INSERT(`ã`,1,5,'') FROM `ԣ`; -SELECT INSERT(`ã`,2,1,'') FROM `ԣ`; -SELECT INSERT(`ã`,2,2,'') FROM `ԣ`; -SELECT INSERT(`ã`,2,3,'') FROM `ԣ`; -SELECT INSERT(`ã`,2,4,'') FROM `ԣ`; -SELECT INSERT(`ã`,3,1,'') FROM `ԣ`; -SELECT INSERT(`ã`,3,2,'') FROM `ԣ`; -SELECT INSERT(`ã`,3,3,'') FROM `ԣ`; -SELECT INSERT(`ã`,4,1,'') FROM `ԣ`; -SELECT INSERT(`ã`,4,2,'') FROM `ԣ`; -SELECT INSERT(`ã`,5,1,'') FROM `ԣ`; -SELECT INSERT(`ã`,1,1,'') FROM `ԣ`; -SELECT INSERT(`ã`,1,2,'') FROM `ԣ`; -SELECT INSERT(`ã`,1,3,'') FROM `ԣ`; -SELECT INSERT(`ã`,1,4,'') FROM `ԣ`; -SELECT INSERT(`ã`,1,5,'') FROM `ԣ`; -SELECT INSERT(`ã`,2,1,'') FROM `ԣ`; -SELECT INSERT(`ã`,2,2,'') FROM `ԣ`; -SELECT INSERT(`ã`,2,3,'') FROM `ԣ`; -SELECT INSERT(`ã`,2,4,'') FROM `ԣ`; -SELECT INSERT(`ã`,3,1,'') FROM `ԣ`; -SELECT INSERT(`ã`,3,2,'') FROM `ԣ`; -SELECT INSERT(`ã`,3,3,'') FROM `ԣ`; -SELECT INSERT(`ã`,4,1,'') FROM `ԣ`; -SELECT INSERT(`ã`,4,2,'') FROM `ԣ`; -SELECT INSERT(`ã`,5,1,'') FROM `ԣ`; - DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -351,6 +281,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/t/jp_insert_ujis.test b/mysql-test/suite/jp/t/jp_insert_ujis.test index 7b6d2838386..ba046df774d 100644 --- a/mysql-test/suite/jp/t/jp_insert_ujis.test +++ b/mysql-test/suite/jp/t/jp_insert_ujis.test @@ -1,4 +1,5 @@ --source include/have_ujis.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `ԣ`; @@ -10,9 +11,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 `ԣ`; --enable_warnings # @@ -29,12 +27,9 @@ CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ujis engine = innodb; CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ujis engine = myisam; CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ujis engine = myisam; CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ujis engine = myisam; -CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ujis engine = bdb; -CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ujis engine = bdb; -CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ujis engine = bdb; +CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ujis engine = MEMORY; INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES (''); @@ -45,9 +40,6 @@ INSERT INTO `ԣ` VALUES ('ݏޏߏ'); INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES ('ݏޏߏ'); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'); #InnoDB SELECT INSERT(`ã`,1,1,'') FROM `ԣ`; @@ -203,7 +195,7 @@ SELECT INSERT(`ã`,4,1,'') FROM `ԣ`; SELECT INSERT(`ã`,4,2,'' ) FROM `ԣ`; SELECT INSERT(`ã`,5,1,'') FROM `ԣ`; -#HEAP +#MEMORY SELECT INSERT(`ã`,1,1,'') FROM `ԣ`; SELECT INSERT(`ã`,1,2,'') FROM `ԣ`; SELECT INSERT(`ã`,1,3,'') FROM `ԣ`; @@ -280,68 +272,6 @@ SELECT INSERT(`ã`,4,1,'') FROM `ԣ`; SELECT INSERT(`ã`,4,2,'' ) FROM `ԣ`; SELECT INSERT(`ã`,5,1,'') FROM `ԣ`; -#BDB -SELECT INSERT(`ã`,1,1,'') FROM `ԣ`; -SELECT INSERT(`ã`,1,2,'') FROM `ԣ`; -SELECT INSERT(`ã`,1,3,'') FROM `ԣ`; -SELECT INSERT(`ã`,1,4,'') FROM `ԣ`; -SELECT INSERT(`ã`,1,5,'') FROM `ԣ`; -SELECT INSERT(`ã`,2,1,'') FROM `ԣ`; -SELECT INSERT(`ã`,2,2,'') FROM `ԣ`; -SELECT INSERT(`ã`,2,3,'') FROM `ԣ`; -SELECT INSERT(`ã`,2,4,'') FROM `ԣ`; -SELECT INSERT(`ã`,3,1,'') FROM `ԣ`; -SELECT INSERT(`ã`,3,2,'') FROM `ԣ`; -SELECT INSERT(`ã`,3,3,'') FROM `ԣ`; -SELECT INSERT(`ã`,4,1,'') FROM `ԣ`; -SELECT INSERT(`ã`,4,2,'') FROM `ԣ`; -SELECT INSERT(`ã`,5,1,'') FROM `ԣ`; -SELECT INSERT(`ã`,1,1,'') FROM `ԣ`; -SELECT INSERT(`ã`,1,2,'') FROM `ԣ`; -SELECT INSERT(`ã`,1,3,'') FROM `ԣ`; -SELECT INSERT(`ã`,1,4,'') FROM `ԣ`; -SELECT INSERT(`ã`,1,5,'') FROM `ԣ`; -SELECT INSERT(`ã`,2,1,'') FROM `ԣ`; -SELECT INSERT(`ã`,2,2,'') FROM `ԣ`; -SELECT INSERT(`ã`,2,3,'') FROM `ԣ`; -SELECT INSERT(`ã`,2,4,'') FROM `ԣ`; -SELECT INSERT(`ã`,3,1,'') FROM `ԣ`; -SELECT INSERT(`ã`,3,2,'') FROM `ԣ`; -SELECT INSERT(`ã`,3,3,'') FROM `ԣ`; -SELECT INSERT(`ã`,4,1,'') FROM `ԣ`; -SELECT INSERT(`ã`,4,2,'') FROM `ԣ`; -SELECT INSERT(`ã`,5,1,'') FROM `ԣ`; -SELECT INSERT(`ã`,1,1,'') FROM `ԣ`; -SELECT INSERT(`ã`,1,2,'') FROM `ԣ`; -SELECT INSERT(`ã`,1,3,'') FROM `ԣ`; -SELECT INSERT(`ã`,1,4,'') FROM `ԣ`; -SELECT INSERT(`ã`,1,5,'') FROM `ԣ`; -SELECT INSERT(`ã`,2,1,'') FROM `ԣ`; -SELECT INSERT(`ã`,2,2,'') FROM `ԣ`; -SELECT INSERT(`ã`,2,3,'') FROM `ԣ`; -SELECT INSERT(`ã`,2,4,'') FROM `ԣ`; -SELECT INSERT(`ã`,3,1,'') FROM `ԣ`; -SELECT INSERT(`ã`,3,2,'') FROM `ԣ`; -SELECT INSERT(`ã`,3,3,'') FROM `ԣ`; -SELECT INSERT(`ã`,4,1,'') FROM `ԣ`; -SELECT INSERT(`ã`,4,2,'') FROM `ԣ`; -SELECT INSERT(`ã`,5,1,'') FROM `ԣ`; -SELECT INSERT(`ã`,1,1,'') FROM `ԣ`; -SELECT INSERT(`ã`,1,2,'') FROM `ԣ`; -SELECT INSERT(`ã`,1,3,'') FROM `ԣ`; -SELECT INSERT(`ã`,1,4,'') FROM `ԣ`; -SELECT INSERT(`ã`,1,5,'') FROM `ԣ`; -SELECT INSERT(`ã`,2,1,'') FROM `ԣ`; -SELECT INSERT(`ã`,2,2,'') FROM `ԣ`; -SELECT INSERT(`ã`,2,3,'') FROM `ԣ`; -SELECT INSERT(`ã`,2,4,'') FROM `ԣ`; -SELECT INSERT(`ã`,3,1,'') FROM `ԣ`; -SELECT INSERT(`ã`,3,2,'') FROM `ԣ`; -SELECT INSERT(`ã`,3,3,'') FROM `ԣ`; -SELECT INSERT(`ã`,4,1,'') FROM `ԣ`; -SELECT INSERT(`ã`,4,2,'') FROM `ԣ`; -SELECT INSERT(`ã`,5,1,'') FROM `ԣ`; - DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -351,6 +281,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/t/jp_insert_utf8.test b/mysql-test/suite/jp/t/jp_insert_utf8.test index ef6acb90063..464f3bca634 100644 --- a/mysql-test/suite/jp/t/jp_insert_utf8.test +++ b/mysql-test/suite/jp/t/jp_insert_utf8.test @@ -1,3 +1,5 @@ +--source include/have_utf8.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `Ｔ１`; drop table if exists `Ｔ２`; @@ -8,9 +10,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 `Ｔ１２`; --enable_warnings # @@ -26,12 +25,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = innodb; CREATE TABLE `Ｔ４` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = myisam; CREATE TABLE `Ｔ５` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = myisam; CREATE TABLE `Ｔ６` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = myisam; -CREATE TABLE `Ｔ７` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ８` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ９` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ１０` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = bdb; -CREATE TABLE `Ｔ１１` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = bdb; -CREATE TABLE `Ｔ１２` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = bdb; +CREATE TABLE `Ｔ７` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ８` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ９` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = MEMORY; INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'); INSERT INTO `Ｔ２` VALUES ('あいうえお'); @@ -42,9 +38,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡'); INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'); INSERT INTO `Ｔ８` VALUES ('あいうえお'); INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡'); -INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'); -INSERT INTO `Ｔ１１` VALUES ('あいうえお'); -INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡'); #InnoDB SELECT INSERT(`Ｃ１`,1,1,'ｶ') FROM `Ｔ１`; @@ -200,7 +193,7 @@ SELECT INSERT(`Ｃ１`,4,1,'丂') FROM `Ｔ６`; SELECT INSERT(`Ｃ１`,4,2,'丂丂' ) FROM `Ｔ６`; SELECT INSERT(`Ｃ１`,5,1,'丂') FROM `Ｔ６`; -#HEAP +#MEMORY SELECT INSERT(`Ｃ１`,1,1,'ｶ') FROM `Ｔ７`; SELECT INSERT(`Ｃ１`,1,2,'ｶｶ') FROM `Ｔ７`; SELECT INSERT(`Ｃ１`,1,3,'ｶｶｶ') FROM `Ｔ７`; @@ -277,68 +270,6 @@ SELECT INSERT(`Ｃ１`,4,1,'丂') FROM `Ｔ９`; SELECT INSERT(`Ｃ１`,4,2,'丂丂' ) FROM `Ｔ９`; SELECT INSERT(`Ｃ１`,5,1,'丂') FROM `Ｔ９`; -#BDB -SELECT INSERT(`Ｃ１`,1,1,'ｶ') FROM `Ｔ１０`; -SELECT INSERT(`Ｃ１`,1,2,'ｶｶ') FROM `Ｔ１０`; -SELECT INSERT(`Ｃ１`,1,3,'ｶｶｶ') FROM `Ｔ１０`; -SELECT INSERT(`Ｃ１`,1,4,'ｶｶｶｶ') FROM `Ｔ１０`; -SELECT INSERT(`Ｃ１`,1,5,'ｶｶｶｶｶ') FROM `Ｔ１０`; -SELECT INSERT(`Ｃ１`,2,1,'ｶ') FROM `Ｔ１０`; -SELECT INSERT(`Ｃ１`,2,2,'ｶｶ') FROM `Ｔ１０`; -SELECT INSERT(`Ｃ１`,2,3,'ｶｶｶ') FROM `Ｔ１０`; -SELECT INSERT(`Ｃ１`,2,4,'ｶｶｶｶ') FROM `Ｔ１０`; -SELECT INSERT(`Ｃ１`,3,1,'ｶ') FROM `Ｔ１０`; -SELECT INSERT(`Ｃ１`,3,2,'ｶｶ') FROM `Ｔ１０`; -SELECT INSERT(`Ｃ１`,3,3,'ｶｶｶ') FROM `Ｔ１０`; -SELECT INSERT(`Ｃ１`,4,1,'ｶ') FROM `Ｔ１０`; -SELECT INSERT(`Ｃ１`,4,2,'ｶｶ') FROM `Ｔ１０`; -SELECT INSERT(`Ｃ１`,5,1,'ｶ') FROM `Ｔ１０`; -SELECT INSERT(`Ｃ１`,1,1,'か') FROM `Ｔ１１`; -SELECT INSERT(`Ｃ１`,1,2,'かか') FROM `Ｔ１１`; -SELECT INSERT(`Ｃ１`,1,3,'かかか') FROM `Ｔ１１`; -SELECT INSERT(`Ｃ１`,1,4,'かかかか') FROM `Ｔ１１`; -SELECT INSERT(`Ｃ１`,1,5,'かかかかか') FROM `Ｔ１１`; -SELECT INSERT(`Ｃ１`,2,1,'か') FROM `Ｔ１１`; -SELECT INSERT(`Ｃ１`,2,2,'かか') FROM `Ｔ１１`; -SELECT INSERT(`Ｃ１`,2,3,'かかか') FROM `Ｔ１１`; -SELECT INSERT(`Ｃ１`,2,4,'かかかか') FROM `Ｔ１１`; -SELECT INSERT(`Ｃ１`,3,1,'か') FROM `Ｔ１１`; -SELECT INSERT(`Ｃ１`,3,2,'かか') FROM `Ｔ１１`; -SELECT INSERT(`Ｃ１`,3,3,'かかか') FROM `Ｔ１１`; -SELECT INSERT(`Ｃ１`,4,1,'か') FROM `Ｔ１１`; -SELECT INSERT(`Ｃ１`,4,2,'かか') FROM `Ｔ１１`; -SELECT INSERT(`Ｃ１`,5,1,'か') FROM `Ｔ１１`; -SELECT INSERT(`Ｃ１`,1,1,' ') FROM `Ｔ１１`; -SELECT INSERT(`Ｃ１`,1,2,' ') FROM `Ｔ１１`; -SELECT INSERT(`Ｃ１`,1,3,' ') FROM `Ｔ１１`; -SELECT INSERT(`Ｃ１`,1,4,' ') FROM `Ｔ１１`; -SELECT INSERT(`Ｃ１`,1,5,' ') FROM `Ｔ１１`; -SELECT INSERT(`Ｃ１`,2,1,' ') FROM `Ｔ１１`; -SELECT INSERT(`Ｃ１`,2,2,' ') FROM `Ｔ１１`; -SELECT INSERT(`Ｃ１`,2,3,' ') FROM `Ｔ１１`; -SELECT INSERT(`Ｃ１`,2,4,' ') FROM `Ｔ１１`; -SELECT INSERT(`Ｃ１`,3,1,' ') FROM `Ｔ１１`; -SELECT INSERT(`Ｃ１`,3,2,' ') FROM `Ｔ１１`; -SELECT INSERT(`Ｃ１`,3,3,' ') FROM `Ｔ１１`; -SELECT INSERT(`Ｃ１`,4,1,' ') FROM `Ｔ１１`; -SELECT INSERT(`Ｃ１`,4,2,' ') FROM `Ｔ１１`; -SELECT INSERT(`Ｃ１`,5,1,' ') FROM `Ｔ１１`; -SELECT INSERT(`Ｃ１`,1,1,'丂') FROM `Ｔ１２`; -SELECT INSERT(`Ｃ１`,1,2,'丂丂') FROM `Ｔ１２`; -SELECT INSERT(`Ｃ１`,1,3,'丂丂丂') FROM `Ｔ１２`; -SELECT INSERT(`Ｃ１`,1,4,'丂丂丂丂') FROM `Ｔ１２`; -SELECT INSERT(`Ｃ１`,1,5,'丂丂丂丂丂') FROM `Ｔ１２`; -SELECT INSERT(`Ｃ１`,2,1,'丂') FROM `Ｔ１２`; -SELECT INSERT(`Ｃ１`,2,2,'丂丂') FROM `Ｔ１２`; -SELECT INSERT(`Ｃ１`,2,3,'丂丂丂') FROM `Ｔ１２`; -SELECT INSERT(`Ｃ１`,2,4,'丂丂丂丂') FROM `Ｔ１２`; -SELECT INSERT(`Ｃ１`,3,1,'丂') FROM `Ｔ１２`; -SELECT INSERT(`Ｃ１`,3,2,'丂丂') FROM `Ｔ１２`; -SELECT INSERT(`Ｃ１`,3,3,'丂丂丂') FROM `Ｔ１２`; -SELECT INSERT(`Ｃ１`,4,1,'丂') FROM `Ｔ１２`; -SELECT INSERT(`Ｃ１`,4,2,'丂丂') FROM `Ｔ１２`; -SELECT INSERT(`Ｃ１`,5,1,'丂') FROM `Ｔ１２`; - DROP TABLE `Ｔ１`; DROP TABLE `Ｔ２`; DROP TABLE `Ｔ３`; @@ -348,6 +279,3 @@ DROP TABLE `Ｔ６`; DROP TABLE `Ｔ７`; DROP TABLE `Ｔ８`; DROP TABLE `Ｔ９`; -DROP TABLE `Ｔ１０`; -DROP TABLE `Ｔ１１`; -DROP TABLE `Ｔ１２`; diff --git a/mysql-test/suite/jp/t/jp_instr_sjis.test b/mysql-test/suite/jp/t/jp_instr_sjis.test index c19b5f2b14c..626429f271b 100644 --- a/mysql-test/suite/jp/t/jp_instr_sjis.test +++ b/mysql-test/suite/jp/t/jp_instr_sjis.test @@ -1,3 +1,5 @@ +--source include/have_sjis.inc +--source include/have_innodb.inc --character_set sjis --disable_warnings drop table if exists `sP`; @@ -9,7 +11,6 @@ drop table if exists `sU`; drop table if exists `sV`; drop table if exists `sW`; drop table if exists `sX`; -drop table if exists `sPO`; --enable_warnings # @@ -25,12 +26,9 @@ CREATE TABLE `sR` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engin CREATE TABLE `sS` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sT` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sU` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; -CREATE TABLE `sV` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sW` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sX` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPO` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPP` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPQ` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; +CREATE TABLE `sV` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sW` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sX` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; INSERT INTO `sP` VALUES (''); INSERT INTO `sQ` VALUES (''); @@ -41,9 +39,6 @@ INSERT INTO `sU` VALUES ('\\\\\'); INSERT INTO `sV` VALUES (''); INSERT INTO `sW` VALUES (''); INSERT INTO `sX` VALUES ('\\\\\'); -INSERT INTO `sPO` VALUES (''); -INSERT INTO `sPP` VALUES (''); -INSERT INTO `sPQ` VALUES ('\\\\\'); #InnoDB SELECT INSTR(`bP`,'') from `sP`; @@ -85,7 +80,7 @@ SELECT INSTR(`bP`,'\') from `sU`; SELECT INSTR(`bP`,'\') from `sU`; SELECT INSTR(`bP`,'\') from `sU`; -#HEAP +#MEMORY SELECT INSTR(`bP`,'') from `sV`; SELECT INSTR(`bP`,'') from `sV`; SELECT INSTR(`bP`,'') from `sV`; @@ -105,26 +100,6 @@ SELECT INSTR(`bP`,'\') from `sX`; SELECT INSTR(`bP`,'\') from `sX`; SELECT INSTR(`bP`,'\') from `sX`; -#BDB -SELECT INSTR(`bP`,'') from `sPO`; -SELECT INSTR(`bP`,'') from `sPO`; -SELECT INSTR(`bP`,'') from `sPO`; -SELECT INSTR(`bP`,'') from `sPO`; -SELECT INSTR(`bP`,'') from `sPO`; -SELECT INSTR(`bP`,'') from `sPO`; -SELECT INSTR(`bP`,'') from `sPP`; -SELECT INSTR(`bP`,'') from `sPP`; -SELECT INSTR(`bP`,'') from `sPP`; -SELECT INSTR(`bP`,'') from `sPP`; -SELECT INSTR(`bP`,'') from `sPP`; -SELECT INSTR(`bP`,'') from `sPP`; -SELECT INSTR(`bP`,'\') from `sPQ`; -SELECT INSTR(`bP`,'\') from `sPQ`; -SELECT INSTR(`bP`,'\') from `sPQ`; -SELECT INSTR(`bP`,'\') from `sPQ`; -SELECT INSTR(`bP`,'\') from `sPQ`; -SELECT INSTR(`bP`,'\') from `sPQ`; - DROP TABLE `sP`; DROP TABLE `sQ`; DROP TABLE `sR`; @@ -134,6 +109,3 @@ DROP TABLE `sU`; DROP TABLE `sV`; DROP TABLE `sW`; DROP TABLE `sX`; -DROP TABLE `sPO`; -DROP TABLE `sPP`; -DROP TABLE `sPQ`; diff --git a/mysql-test/suite/jp/t/jp_instr_ucs2.test b/mysql-test/suite/jp/t/jp_instr_ucs2.test index b8f83961e90..a074e31569f 100644 --- a/mysql-test/suite/jp/t/jp_instr_ucs2.test +++ b/mysql-test/suite/jp/t/jp_instr_ucs2.test @@ -1,4 +1,5 @@ --source include/have_ucs2.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `ԣ`; @@ -10,7 +11,6 @@ drop table if exists `ԣ`; drop table if exists `ԣ`; drop table if exists `ԣ`; drop table if exists `ԣ`; -drop table if exists `ԣ`; --enable_warnings # @@ -27,12 +27,9 @@ CREATE TABLE `ԣ` (`ã` char(5), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engin 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 (''); @@ -43,9 +40,6 @@ INSERT INTO `ԣ` VALUES ('ݏޏߏ'); INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES ('ݏޏߏ'); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'); #InnoDB SELECT INSTR(`ã`,'') from `ԣ`; @@ -87,7 +81,7 @@ SELECT INSTR(`ã`,'') from `ԣ`; SELECT INSTR(`ã`,'') from `ԣ`; SELECT INSTR(`ã`,'') from `ԣ`; -#HEAP +#MEMORY SELECT INSTR(`ã`,'') from `ԣ`; SELECT INSTR(`ã`,'') from `ԣ`; SELECT INSTR(`ã`,'') from `ԣ`; @@ -107,26 +101,6 @@ SELECT INSTR(`ã`,'') from `ԣ`; SELECT INSTR(`ã`,'') from `ԣ`; SELECT INSTR(`ã`,'') from `ԣ`; -#BDB -SELECT INSTR(`ã`,'') from `ԣ`; -SELECT INSTR(`ã`,'') from `ԣ`; -SELECT INSTR(`ã`,'') from `ԣ`; -SELECT INSTR(`ã`,'') from `ԣ`; -SELECT INSTR(`ã`,'') from `ԣ`; -SELECT INSTR(`ã`,'') from `ԣ`; -SELECT INSTR(`ã`,'') from `ԣ`; -SELECT INSTR(`ã`,'') from `ԣ`; -SELECT INSTR(`ã`,'') from `ԣ`; -SELECT INSTR(`ã`,'') from `ԣ`; -SELECT INSTR(`ã`,'') from `ԣ`; -SELECT INSTR(`ã`,'') from `ԣ`; -SELECT INSTR(`ã`,'') from `ԣ`; -SELECT INSTR(`ã`,'') from `ԣ`; -SELECT INSTR(`ã`,'') from `ԣ`; -SELECT INSTR(`ã`,'') from `ԣ`; -SELECT INSTR(`ã`,'') from `ԣ`; -SELECT INSTR(`ã`,'') from `ԣ`; - DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -136,6 +110,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/t/jp_instr_ujis.test b/mysql-test/suite/jp/t/jp_instr_ujis.test index 696e1147372..b2dd233557b 100644 --- a/mysql-test/suite/jp/t/jp_instr_ujis.test +++ b/mysql-test/suite/jp/t/jp_instr_ujis.test @@ -1,4 +1,5 @@ --source include/have_ujis.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `ԣ`; @@ -10,7 +11,6 @@ drop table if exists `ԣ`; drop table if exists `ԣ`; drop table if exists `ԣ`; drop table if exists `ԣ`; -drop table if exists `ԣ`; --enable_warnings # @@ -26,12 +26,9 @@ CREATE TABLE `ԣ` (`ã` char(5), INDEX(`ã`)) DEFAULT CHARSET = ujis engin 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 (''); @@ -42,9 +39,6 @@ INSERT INTO `ԣ` VALUES ('ݏޏߏ'); INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES ('ݏޏߏ'); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'); #InnoDB SELECT INSTR(`ã`,'') from `ԣ`; @@ -86,7 +80,7 @@ SELECT INSTR(`ã`,'') from `ԣ`; SELECT INSTR(`ã`,'') from `ԣ`; SELECT INSTR(`ã`,'') from `ԣ`; -#HEAP +#MEMORY SELECT INSTR(`ã`,'') from `ԣ`; SELECT INSTR(`ã`,'') from `ԣ`; SELECT INSTR(`ã`,'') from `ԣ`; @@ -106,26 +100,6 @@ SELECT INSTR(`ã`,'') from `ԣ`; SELECT INSTR(`ã`,'') from `ԣ`; SELECT INSTR(`ã`,'') from `ԣ`; -#BDB -SELECT INSTR(`ã`,'') from `ԣ`; -SELECT INSTR(`ã`,'') from `ԣ`; -SELECT INSTR(`ã`,'') from `ԣ`; -SELECT INSTR(`ã`,'') from `ԣ`; -SELECT INSTR(`ã`,'') from `ԣ`; -SELECT INSTR(`ã`,'') from `ԣ`; -SELECT INSTR(`ã`,'') from `ԣ`; -SELECT INSTR(`ã`,'') from `ԣ`; -SELECT INSTR(`ã`,'') from `ԣ`; -SELECT INSTR(`ã`,'') from `ԣ`; -SELECT INSTR(`ã`,'') from `ԣ`; -SELECT INSTR(`ã`,'') from `ԣ`; -SELECT INSTR(`ã`,'') from `ԣ`; -SELECT INSTR(`ã`,'') from `ԣ`; -SELECT INSTR(`ã`,'') from `ԣ`; -SELECT INSTR(`ã`,'') from `ԣ`; -SELECT INSTR(`ã`,'') from `ԣ`; -SELECT INSTR(`ã`,'') from `ԣ`; - DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -135,6 +109,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/t/jp_instr_utf8.test b/mysql-test/suite/jp/t/jp_instr_utf8.test index b25b72bc8d0..27c2cb24e6d 100644 --- a/mysql-test/suite/jp/t/jp_instr_utf8.test +++ b/mysql-test/suite/jp/t/jp_instr_utf8.test @@ -1,3 +1,5 @@ +--source include/have_utf8.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `Ｔ１`; drop table if exists `Ｔ２`; @@ -8,7 +10,6 @@ drop table if exists `Ｔ６`; drop table if exists `Ｔ７`; drop table if exists `Ｔ８`; drop table if exists `Ｔ９`; -drop table if exists `Ｔ１０`; --enable_warnings # @@ -24,12 +25,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 ('あいうえお'); @@ -40,9 +38,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡'); INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'); INSERT INTO `Ｔ８` VALUES ('あいうえお'); INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡'); -INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'); -INSERT INTO `Ｔ１１` VALUES ('あいうえお'); -INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡'); #InnoDB SELECT INSTR(`Ｃ１`,'ｱ') from `Ｔ１`; @@ -84,7 +79,7 @@ SELECT INSTR(`Ｃ１`,'龞') from `Ｔ６`; SELECT INSTR(`Ｃ１`,'龡') from `Ｔ６`; SELECT INSTR(`Ｃ１`,'丂') from `Ｔ６`; -#HEAP +#MEMORY SELECT INSTR(`Ｃ１`,'ｱ') from `Ｔ７`; SELECT INSTR(`Ｃ１`,'ｲ') from `Ｔ７`; SELECT INSTR(`Ｃ１`,'ｳ') from `Ｔ７`; @@ -104,26 +99,6 @@ SELECT INSTR(`Ｃ１`,'龞') from `Ｔ９`; SELECT INSTR(`Ｃ１`,'龡') from `Ｔ９`; SELECT INSTR(`Ｃ１`,'丂') from `Ｔ９`; -#BDB -SELECT INSTR(`Ｃ１`,'ｱ') from `Ｔ１０`; -SELECT INSTR(`Ｃ１`,'ｲ') from `Ｔ１０`; -SELECT INSTR(`Ｃ１`,'ｳ') from `Ｔ１０`; -SELECT INSTR(`Ｃ１`,'ｴ') from `Ｔ１０`; -SELECT INSTR(`Ｃ１`,'ｵ') from `Ｔ１０`; -SELECT INSTR(`Ｃ１`,'ﾝ') from `Ｔ１０`; -SELECT INSTR(`Ｃ１`,'あ') from `Ｔ１１`; -SELECT INSTR(`Ｃ１`,'い') from `Ｔ１１`; -SELECT INSTR(`Ｃ１`,'う') from `Ｔ１１`; -SELECT INSTR(`Ｃ１`,'え') from `Ｔ１１`; -SELECT INSTR(`Ｃ１`,'お') from `Ｔ１１`; -SELECT INSTR(`Ｃ１`,'ん') from `Ｔ１１`; -SELECT INSTR(`Ｃ１`,'龔') from `Ｔ１２`; -SELECT INSTR(`Ｃ１`,'龖') from `Ｔ１２`; -SELECT INSTR(`Ｃ１`,'龗') from `Ｔ１２`; -SELECT INSTR(`Ｃ１`,'龞') from `Ｔ１２`; -SELECT INSTR(`Ｃ１`,'龡') from `Ｔ１２`; -SELECT INSTR(`Ｃ１`,'丂') from `Ｔ１２`; - DROP TABLE `Ｔ１`; DROP TABLE `Ｔ２`; DROP TABLE `Ｔ３`; @@ -133,6 +108,3 @@ DROP TABLE `Ｔ６`; DROP TABLE `Ｔ７`; DROP TABLE `Ｔ８`; DROP TABLE `Ｔ９`; -DROP TABLE `Ｔ１０`; -DROP TABLE `Ｔ１１`; -DROP TABLE `Ｔ１２`; diff --git a/mysql-test/suite/jp/t/jp_join_sjis.test b/mysql-test/suite/jp/t/jp_join_sjis.test index 30b23913929..031b6bc8c89 100644 --- a/mysql-test/suite/jp/t/jp_join_sjis.test +++ b/mysql-test/suite/jp/t/jp_join_sjis.test @@ -1,17 +1,25 @@ +--source include/have_sjis.inc +--source include/have_innodb.inc --character_set sjis --disable_warnings -drop table if exists `sP`; -drop table if exists `sQ`; -drop table if exists `sR`; -drop table if exists `sS`; -drop table if exists `sT`; -drop table if exists `sU`; -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`; +DROP TABLE IF EXISTS `sPa`; +DROP TABLE IF EXISTS `sPb`; +DROP TABLE IF EXISTS `sQa`; +DROP TABLE IF EXISTS `sQb`; +DROP TABLE IF EXISTS `sRa`; +DROP TABLE IF EXISTS `sRb`; +DROP TABLE IF EXISTS `sSa`; +DROP TABLE IF EXISTS `sSb`; +DROP TABLE IF EXISTS `sTa`; +DROP TABLE IF EXISTS `sTb`; +DROP TABLE IF EXISTS `sUa`; +DROP TABLE IF EXISTS `sUb`; +DROP TABLE IF EXISTS `sVa`; +DROP TABLE IF EXISTS `sVb`; +DROP TABLE IF EXISTS `sWa`; +DROP TABLE IF EXISTS `sWb`; +DROP TABLE IF EXISTS `sXa`; +DROP TABLE IF EXISTS `sXb`; --enable_warnings # @@ -33,18 +41,12 @@ CREATE TABLE `sTa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine CREATE TABLE `sTb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sUa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sUb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = myisam; -CREATE TABLE `sVa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sVb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sWa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sWb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sXa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sXb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPOa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPOb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPPa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPPb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPQa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPQb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap; +CREATE TABLE `sVa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sVb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sWa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sWb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sXa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sXb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY; #insert the following data in each table # jisx0201 hankaku-katakana data @@ -69,12 +71,6 @@ INSERT INTO `sWa` VALUES (''),(''),(''); INSERT INTO `sWb` VALUES (''); INSERT INTO `sXa` VALUES ('\'),('\'),('\'); INSERT INTO `sXb` VALUES ('\'); -INSERT INTO `sPOa` VALUES (''),(''),(''); -INSERT INTO `sPOb` VALUES (''); -INSERT INTO `sPPa` VALUES (''),(''),(''); -INSERT INTO `sPPb` VALUES (''); -INSERT INTO `sPQa` VALUES ('\'),('\'),('\'); -INSERT INTO `sPQb` VALUES ('\'); #Test for innodb SELECT * FROM `sPa` JOIN `sPb`; @@ -134,7 +130,7 @@ SELECT * FROM `sUa` LEFT JOIN `sUb` ON (`sUa`.`bP` = `sUb`.`bP`); SELECT * FROM `sUb` RIGHT JOIN `sUa` USING (`bP`); SELECT * FROM `sUb` RIGHT JOIN `sUa` ON (`sUa`.`bP` = `sUb`.`bP`); -#Test for heap +#Test for MEMORY SELECT * FROM `sVa` JOIN `sVb`; SELECT * FROM `sVa` INNER JOIN `sVb`; SELECT * FROM `sVa` JOIN `sVb` USING (`bP`); @@ -163,35 +159,6 @@ SELECT * FROM `sXa` LEFT JOIN `sXb` ON (`sXa`.`bP` = `sXb`.`bP`); SELECT * FROM `sXb` RIGHT JOIN `sXa` USING (`bP`); SELECT * FROM `sXb` RIGHT JOIN `sXa` ON (`sXa`.`bP` = `sXb`.`bP`); -#Test for heap -SELECT * FROM `sPOa` JOIN `sPOb`; -SELECT * FROM `sPOa` INNER JOIN `sPOb`; -SELECT * FROM `sPOa` JOIN `sPOb` USING (`bP`); -SELECT * FROM `sPOa` INNER JOIN `sPOb` USING (`bP`); -SELECT * FROM `sPOa` CROSS JOIN `sPOb`; -SELECT * FROM `sPOa` LEFT JOIN `sPOb` USING (`bP`); -SELECT * FROM `sPOa` LEFT JOIN `sPOb` ON (`sPOa`.`bP` = `sPOb`.`bP`); -SELECT * FROM `sPOb` RIGHT JOIN `sPOa` USING (`bP`); -SELECT * FROM `sPOb` RIGHT JOIN `sPOa` ON (`sPOa`.`bP` = `sPOb`.`bP`); -SELECT * FROM `sPPa` JOIN `sPPb`; -SELECT * FROM `sPPa` INNER JOIN `sPPb`; -SELECT * FROM `sPPa` JOIN `sPPb` USING (`bP`); -SELECT * FROM `sPPa` INNER JOIN `sPPb` USING (`bP`); -SELECT * FROM `sPPa` CROSS JOIN `sPPb`; -SELECT * FROM `sPPa` LEFT JOIN `sPPb` USING (`bP`); -SELECT * FROM `sPPa` LEFT JOIN `sPPb` ON (`sPPa`.`bP` = `sPPb`.`bP`); -SELECT * FROM `sPPb` RIGHT JOIN `sPPa` USING (`bP`); -SELECT * FROM `sPPb` RIGHT JOIN `sPPa` ON (`sPPa`.`bP` = `sPPb`.`bP`); -SELECT * FROM `sPQa` JOIN `sPQb`; -SELECT * FROM `sPQa` INNER JOIN `sPQb`; -SELECT * FROM `sPQa` JOIN `sPQb` USING (`bP`); -SELECT * FROM `sPQa` INNER JOIN `sPQb` USING (`bP`); -SELECT * FROM `sPQa` CROSS JOIN `sPQb`; -SELECT * FROM `sPQa` LEFT JOIN `sPQb` USING (`bP`); -SELECT * FROM `sPQa` LEFT JOIN `sPQb` ON (`sPQa`.`bP` = `sPQb`.`bP`); -SELECT * FROM `sPQb` RIGHT JOIN `sPQa` USING (`bP`); -SELECT * FROM `sPQb` RIGHT JOIN `sPQa` ON (`sPQa`.`bP` = `sPQb`.`bP`); - DROP TABLE `sPa`; DROP TABLE `sPb`; DROP TABLE `sQa`; @@ -210,9 +177,3 @@ DROP TABLE `sWa`; DROP TABLE `sWb`; DROP TABLE `sXa`; DROP TABLE `sXb`; -DROP TABLE `sPOa`; -DROP TABLE `sPOb`; -DROP TABLE `sPPa`; -DROP TABLE `sPPb`; -DROP TABLE `sPQa`; -DROP TABLE `sPQb`; diff --git a/mysql-test/suite/jp/t/jp_join_ucs2.test b/mysql-test/suite/jp/t/jp_join_ucs2.test index 27e49203dd2..2c3a9c241a2 100644 --- a/mysql-test/suite/jp/t/jp_join_ucs2.test +++ b/mysql-test/suite/jp/t/jp_join_ucs2.test @@ -1,18 +1,25 @@ --source include/have_ucs2.inc +--source include/have_innodb.inc --disable_warnings -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 `ԣ`; -drop table if exists `ԣ`; -drop table if exists `ԣ`; -drop table if exists `ԣ`; -drop table if exists `ԣ`; -drop table if exists `ԣ`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; --enable_warnings # @@ -29,24 +36,18 @@ CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb; CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb; CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb; +CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MyISAM; +CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MyISAM; +CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MyISAM; +CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MyISAM; +CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MyISAM; +CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MyISAM; +CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY; #insert the following data in each table # jisx0201 hankaku-katakana data @@ -71,12 +72,6 @@ INSERT INTO `ԣa` VALUES (''),(''),(''); INSERT INTO `ԣb` VALUES (''); INSERT INTO `ԣa` VALUES (''),(''),(''); INSERT INTO `ԣb` VALUES (''); -INSERT INTO `ԣa` VALUES (''),(''),(''); -INSERT INTO `ԣb` VALUES (''); -INSERT INTO `ԣa` VALUES (''),(''),(''); -INSERT INTO `ԣb` VALUES (''); -INSERT INTO `ԣa` VALUES (''),(''),(''); -INSERT INTO `ԣb` VALUES (''); #Test for innodb SELECT * FROM `ԣa` JOIN `ԣb`; @@ -136,7 +131,7 @@ SELECT * FROM `ԣa` LEFT JOIN `ԣb` ON (`ԣa`.`ã` = `ԣb`.`ã`); SELECT * FROM `ԣb` RIGHT JOIN `ԣa` USING (`ã`); SELECT * FROM `ԣb` RIGHT JOIN `ԣa` ON (`ԣa`.`ã` = `ԣb`.`ã`); -#Test for heap +#Test for MEMORY SELECT * FROM `ԣa` JOIN `ԣb`; SELECT * FROM `ԣa` INNER JOIN `ԣb`; SELECT * FROM `ԣa` JOIN `ԣb` USING (`ã`); @@ -165,35 +160,6 @@ SELECT * FROM `ԣa` LEFT JOIN `ԣb` ON (`ԣa`.`ã` = `ԣb`.`ã`); SELECT * FROM `ԣb` RIGHT JOIN `ԣa` USING (`ã`); SELECT * FROM `ԣb` RIGHT JOIN `ԣa` ON (`ԣa`.`ã` = `ԣb`.`ã`); -#Test for heap -SELECT * FROM `ԣa` JOIN `ԣb`; -SELECT * FROM `ԣa` INNER JOIN `ԣb`; -SELECT * FROM `ԣa` JOIN `ԣb` USING (`ã`); -SELECT * FROM `ԣa` INNER JOIN `ԣb` USING (`ã`); -SELECT * FROM `ԣa` CROSS JOIN `ԣb`; -SELECT * FROM `ԣa` LEFT JOIN `ԣb` USING (`ã`); -SELECT * FROM `ԣa` LEFT JOIN `ԣb` ON (`ԣa`.`ã` = `ԣb`.`ã`); -SELECT * FROM `ԣb` RIGHT JOIN `ԣa` USING (`ã`); -SELECT * FROM `ԣb` RIGHT JOIN `ԣa` ON (`ԣa`.`ã` = `ԣb`.`ã`); -SELECT * FROM `ԣa` JOIN `ԣb`; -SELECT * FROM `ԣa` INNER JOIN `ԣb`; -SELECT * FROM `ԣa` JOIN `ԣb` USING (`ã`); -SELECT * FROM `ԣa` INNER JOIN `ԣb` USING (`ã`); -SELECT * FROM `ԣa` CROSS JOIN `ԣb`; -SELECT * FROM `ԣa` LEFT JOIN `ԣb` USING (`ã`); -SELECT * FROM `ԣa` LEFT JOIN `ԣb` ON (`ԣa`.`ã` = `ԣb`.`ã`); -SELECT * FROM `ԣb` RIGHT JOIN `ԣa` USING (`ã`); -SELECT * FROM `ԣb` RIGHT JOIN `ԣa` ON (`ԣa`.`ã` = `ԣb`.`ã`); -SELECT * FROM `ԣa` JOIN `ԣb`; -SELECT * FROM `ԣa` INNER JOIN `ԣb`; -SELECT * FROM `ԣa` JOIN `ԣb` USING (`ã`); -SELECT * FROM `ԣa` INNER JOIN `ԣb` USING (`ã`); -SELECT * FROM `ԣa` CROSS JOIN `ԣb`; -SELECT * FROM `ԣa` LEFT JOIN `ԣb` USING (`ã`); -SELECT * FROM `ԣa` LEFT JOIN `ԣb` ON (`ԣa`.`ã` = `ԣb`.`ã`); -SELECT * FROM `ԣb` RIGHT JOIN `ԣa` USING (`ã`); -SELECT * FROM `ԣb` RIGHT JOIN `ԣa` ON (`ԣa`.`ã` = `ԣb`.`ã`); - DROP TABLE `ԣa`; DROP TABLE `ԣb`; DROP TABLE `ԣa`; @@ -212,9 +178,3 @@ DROP TABLE `ԣa`; DROP TABLE `ԣb`; DROP TABLE `ԣa`; DROP TABLE `ԣb`; -DROP TABLE `ԣa`; -DROP TABLE `ԣb`; -DROP TABLE `ԣa`; -DROP TABLE `ԣb`; -DROP TABLE `ԣa`; -DROP TABLE `ԣb`; diff --git a/mysql-test/suite/jp/t/jp_join_ujis.test b/mysql-test/suite/jp/t/jp_join_ujis.test index 079f260cc26..973c46695c3 100644 --- a/mysql-test/suite/jp/t/jp_join_ujis.test +++ b/mysql-test/suite/jp/t/jp_join_ujis.test @@ -1,18 +1,25 @@ --source include/have_ujis.inc +--source include/have_innodb.inc --disable_warnings -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 `ԣ`; -drop table if exists `ԣ`; -drop table if exists `ԣ`; -drop table if exists `ԣ`; -drop table if exists `ԣ`; -drop table if exists `ԣ`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; --enable_warnings # @@ -28,24 +35,18 @@ CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb; CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb; CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb; +CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = myisam; +CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = myisam; +CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = myisam; +CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = myisam; +CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = myisam; +CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = myisam; +CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = memory; +CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = memory; +CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = memory; +CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = memory; +CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = memory; +CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = memory; #insert the following data in each table # jisx0201 hankaku-katakana data @@ -70,12 +71,6 @@ INSERT INTO `ԣa` VALUES (''),(''),(''); INSERT INTO `ԣb` VALUES (''); INSERT INTO `ԣa` VALUES (''),(''),(''); INSERT INTO `ԣb` VALUES (''); -INSERT INTO `ԣa` VALUES (''),(''),(''); -INSERT INTO `ԣb` VALUES (''); -INSERT INTO `ԣa` VALUES (''),(''),(''); -INSERT INTO `ԣb` VALUES (''); -INSERT INTO `ԣa` VALUES (''),(''),(''); -INSERT INTO `ԣb` VALUES (''); #Test for innodb SELECT * FROM `ԣa` JOIN `ԣb`; @@ -135,7 +130,7 @@ SELECT * FROM `ԣa` LEFT JOIN `ԣb` ON (`ԣa`.`ã` = `ԣb`.`ã`); SELECT * FROM `ԣb` RIGHT JOIN `ԣa` USING (`ã`); SELECT * FROM `ԣb` RIGHT JOIN `ԣa` ON (`ԣa`.`ã` = `ԣb`.`ã`); -#Test for heap +#Test for MEMORY SELECT * FROM `ԣa` JOIN `ԣb`; SELECT * FROM `ԣa` INNER JOIN `ԣb`; SELECT * FROM `ԣa` JOIN `ԣb` USING (`ã`); @@ -164,35 +159,6 @@ SELECT * FROM `ԣa` LEFT JOIN `ԣb` ON (`ԣa`.`ã` = `ԣb`.`ã`); SELECT * FROM `ԣb` RIGHT JOIN `ԣa` USING (`ã`); SELECT * FROM `ԣb` RIGHT JOIN `ԣa` ON (`ԣa`.`ã` = `ԣb`.`ã`); -#Test for heap -SELECT * FROM `ԣa` JOIN `ԣb`; -SELECT * FROM `ԣa` INNER JOIN `ԣb`; -SELECT * FROM `ԣa` JOIN `ԣb` USING (`ã`); -SELECT * FROM `ԣa` INNER JOIN `ԣb` USING (`ã`); -SELECT * FROM `ԣa` CROSS JOIN `ԣb`; -SELECT * FROM `ԣa` LEFT JOIN `ԣb` USING (`ã`); -SELECT * FROM `ԣa` LEFT JOIN `ԣb` ON (`ԣa`.`ã` = `ԣb`.`ã`); -SELECT * FROM `ԣb` RIGHT JOIN `ԣa` USING (`ã`); -SELECT * FROM `ԣb` RIGHT JOIN `ԣa` ON (`ԣa`.`ã` = `ԣb`.`ã`); -SELECT * FROM `ԣa` JOIN `ԣb`; -SELECT * FROM `ԣa` INNER JOIN `ԣb`; -SELECT * FROM `ԣa` JOIN `ԣb` USING (`ã`); -SELECT * FROM `ԣa` INNER JOIN `ԣb` USING (`ã`); -SELECT * FROM `ԣa` CROSS JOIN `ԣb`; -SELECT * FROM `ԣa` LEFT JOIN `ԣb` USING (`ã`); -SELECT * FROM `ԣa` LEFT JOIN `ԣb` ON (`ԣa`.`ã` = `ԣb`.`ã`); -SELECT * FROM `ԣb` RIGHT JOIN `ԣa` USING (`ã`); -SELECT * FROM `ԣb` RIGHT JOIN `ԣa` ON (`ԣa`.`ã` = `ԣb`.`ã`); -SELECT * FROM `ԣa` JOIN `ԣb`; -SELECT * FROM `ԣa` INNER JOIN `ԣb`; -SELECT * FROM `ԣa` JOIN `ԣb` USING (`ã`); -SELECT * FROM `ԣa` INNER JOIN `ԣb` USING (`ã`); -SELECT * FROM `ԣa` CROSS JOIN `ԣb`; -SELECT * FROM `ԣa` LEFT JOIN `ԣb` USING (`ã`); -SELECT * FROM `ԣa` LEFT JOIN `ԣb` ON (`ԣa`.`ã` = `ԣb`.`ã`); -SELECT * FROM `ԣb` RIGHT JOIN `ԣa` USING (`ã`); -SELECT * FROM `ԣb` RIGHT JOIN `ԣa` ON (`ԣa`.`ã` = `ԣb`.`ã`); - DROP TABLE `ԣa`; DROP TABLE `ԣb`; DROP TABLE `ԣa`; @@ -211,9 +177,3 @@ DROP TABLE `ԣa`; DROP TABLE `ԣb`; DROP TABLE `ԣa`; DROP TABLE `ԣb`; -DROP TABLE `ԣa`; -DROP TABLE `ԣb`; -DROP TABLE `ԣa`; -DROP TABLE `ԣb`; -DROP TABLE `ԣa`; -DROP TABLE `ԣb`; diff --git a/mysql-test/suite/jp/t/jp_join_utf8.test b/mysql-test/suite/jp/t/jp_join_utf8.test index 0b2f033f8bb..d4e25691866 100644 --- a/mysql-test/suite/jp/t/jp_join_utf8.test +++ b/mysql-test/suite/jp/t/jp_join_utf8.test @@ -1,16 +1,24 @@ +--source include/have_utf8.inc +--source include/have_innodb.inc --disable_warnings -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 `Ｔ７`; -drop table if exists `Ｔ８`; -drop table if exists `Ｔ９`; -drop table if exists `Ｔ１０`; -drop table if exists `Ｔ１１`; -drop table if exists `Ｔ１２`; +drop table if exists `Ｔ１a`; +drop table if exists `Ｔ１b`; +drop table if exists `Ｔ２a`; +drop table if exists `Ｔ２b`; +drop table if exists `Ｔ３a`; +drop table if exists `Ｔ３b`; +drop table if exists `Ｔ４a`; +drop table if exists `Ｔ４b`; +drop table if exists `Ｔ５a`; +drop table if exists `Ｔ５b`; +drop table if exists `Ｔ６a`; +drop table if exists `Ｔ６b`; +drop table if exists `Ｔ７a`; +drop table if exists `Ｔ７b`; +drop table if exists `Ｔ８a`; +drop table if exists `Ｔ８b`; +drop table if exists `Ｔ９a`; +drop table if exists `Ｔ９b`; --enable_warnings # @@ -20,30 +28,24 @@ drop table if exists `Ｔ１２`; SET NAMES utf8; SET character_set_database = utf8; -CREATE TABLE `Ｔ１a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb; -CREATE TABLE `Ｔ１b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb; -CREATE TABLE `Ｔ２a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb; -CREATE TABLE `Ｔ２b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb; -CREATE TABLE `Ｔ３a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb; -CREATE TABLE `Ｔ３b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb; -CREATE TABLE `Ｔ４a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb; -CREATE TABLE `Ｔ４b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb; -CREATE TABLE `Ｔ５a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb; -CREATE TABLE `Ｔ５b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb; -CREATE TABLE `Ｔ６a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb; -CREATE TABLE `Ｔ６b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb; -CREATE TABLE `Ｔ７a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb; -CREATE TABLE `Ｔ７b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb; -CREATE TABLE `Ｔ８a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb; -CREATE TABLE `Ｔ８b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb; -CREATE TABLE `Ｔ９a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb; -CREATE TABLE `Ｔ９b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb; -CREATE TABLE `Ｔ１０a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb; -CREATE TABLE `Ｔ１０b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb; -CREATE TABLE `Ｔ１１a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb; -CREATE TABLE `Ｔ１１b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb; -CREATE TABLE `Ｔ１２a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb; -CREATE TABLE `Ｔ１２b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = innodb; +CREATE TABLE `Ｔ１a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = InnoDB; +CREATE TABLE `Ｔ１b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = InnoDB; +CREATE TABLE `Ｔ２a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = InnoDB; +CREATE TABLE `Ｔ２b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = InnoDB; +CREATE TABLE `Ｔ３a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = InnoDB; +CREATE TABLE `Ｔ３b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = InnoDB; +CREATE TABLE `Ｔ４a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MyISAM; +CREATE TABLE `Ｔ４b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MyISAM; +CREATE TABLE `Ｔ５a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MyISAM; +CREATE TABLE `Ｔ５b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MyISAM; +CREATE TABLE `Ｔ６a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MyISAM; +CREATE TABLE `Ｔ６b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MyISAM; +CREATE TABLE `Ｔ７a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ７b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ８a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ８b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ９a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ９b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MEMORY; #insert the following data in each table # jisx0201 hankaku-katakana data @@ -68,14 +70,8 @@ INSERT INTO `Ｔ８a` VALUES ('あ'),('か'),('さ'); INSERT INTO `Ｔ８b` VALUES ('あ'); INSERT INTO `Ｔ９a` VALUES ('龔'),('龖'),('龗'); INSERT INTO `Ｔ９b` VALUES ('龔'); -INSERT INTO `Ｔ１０a` VALUES ('ｱ'),('ｶ'),('ｻ'); -INSERT INTO `Ｔ１０b` VALUES ('ｱ'); -INSERT INTO `Ｔ１１a` VALUES ('あ'),('か'),('さ'); -INSERT INTO `Ｔ１１b` VALUES ('あ'); -INSERT INTO `Ｔ１２a` VALUES ('龔'),('龖'),('龗'); -INSERT INTO `Ｔ１２b` VALUES ('龔'); -#Test for innodb +#Test for InnoDB SELECT * FROM `Ｔ１a` JOIN `Ｔ１b`; SELECT * FROM `Ｔ１a` INNER JOIN `Ｔ１b`; SELECT * FROM `Ｔ１a` JOIN `Ｔ１b` USING (`Ｃ１`); @@ -133,7 +129,7 @@ SELECT * FROM `Ｔ６a` LEFT JOIN `Ｔ６b` ON (`Ｔ６a`.`Ｃ１` = `Ｔ６b`.` SELECT * FROM `Ｔ６b` RIGHT JOIN `Ｔ６a` USING (`Ｃ１`); SELECT * FROM `Ｔ６b` RIGHT JOIN `Ｔ６a` ON (`Ｔ６a`.`Ｃ１` = `Ｔ６b`.`Ｃ１`); -#Test for heap +#Test for MEMORY SELECT * FROM `Ｔ７a` JOIN `Ｔ７b`; SELECT * FROM `Ｔ７a` INNER JOIN `Ｔ７b`; SELECT * FROM `Ｔ７a` JOIN `Ｔ７b` USING (`Ｃ１`); @@ -162,35 +158,6 @@ SELECT * FROM `Ｔ９a` LEFT JOIN `Ｔ９b` ON (`Ｔ９a`.`Ｃ１` = `Ｔ９b`.` SELECT * FROM `Ｔ９b` RIGHT JOIN `Ｔ９a` USING (`Ｃ１`); SELECT * FROM `Ｔ９b` RIGHT JOIN `Ｔ９a` ON (`Ｔ９a`.`Ｃ１` = `Ｔ９b`.`Ｃ１`); -#Test for heap -SELECT * FROM `Ｔ１０a` JOIN `Ｔ１０b`; -SELECT * FROM `Ｔ１０a` INNER JOIN `Ｔ１０b`; -SELECT * FROM `Ｔ１０a` JOIN `Ｔ１０b` USING (`Ｃ１`); -SELECT * FROM `Ｔ１０a` INNER JOIN `Ｔ１０b` USING (`Ｃ１`); -SELECT * FROM `Ｔ１０a` CROSS JOIN `Ｔ１０b`; -SELECT * FROM `Ｔ１０a` LEFT JOIN `Ｔ１０b` USING (`Ｃ１`); -SELECT * FROM `Ｔ１０a` LEFT JOIN `Ｔ１０b` ON (`Ｔ１０a`.`Ｃ１` = `Ｔ１０b`.`Ｃ１`); -SELECT * FROM `Ｔ１０b` RIGHT JOIN `Ｔ１０a` USING (`Ｃ１`); -SELECT * FROM `Ｔ１０b` RIGHT JOIN `Ｔ１０a` ON (`Ｔ１０a`.`Ｃ１` = `Ｔ１０b`.`Ｃ１`); -SELECT * FROM `Ｔ１１a` JOIN `Ｔ１１b`; -SELECT * FROM `Ｔ１１a` INNER JOIN `Ｔ１１b`; -SELECT * FROM `Ｔ１１a` JOIN `Ｔ１１b` USING (`Ｃ１`); -SELECT * FROM `Ｔ１１a` INNER JOIN `Ｔ１１b` USING (`Ｃ１`); -SELECT * FROM `Ｔ１１a` CROSS JOIN `Ｔ１１b`; -SELECT * FROM `Ｔ１１a` LEFT JOIN `Ｔ１１b` USING (`Ｃ１`); -SELECT * FROM `Ｔ１１a` LEFT JOIN `Ｔ１１b` ON (`Ｔ１１a`.`Ｃ１` = `Ｔ１１b`.`Ｃ１`); -SELECT * FROM `Ｔ１１b` RIGHT JOIN `Ｔ１１a` USING (`Ｃ１`); -SELECT * FROM `Ｔ１１b` RIGHT JOIN `Ｔ１１a` ON (`Ｔ１１a`.`Ｃ１` = `Ｔ１１b`.`Ｃ１`); -SELECT * FROM `Ｔ１２a` JOIN `Ｔ１２b`; -SELECT * FROM `Ｔ１２a` INNER JOIN `Ｔ１２b`; -SELECT * FROM `Ｔ１２a` JOIN `Ｔ１２b` USING (`Ｃ１`); -SELECT * FROM `Ｔ１２a` INNER JOIN `Ｔ１２b` USING (`Ｃ１`); -SELECT * FROM `Ｔ１２a` CROSS JOIN `Ｔ１２b`; -SELECT * FROM `Ｔ１２a` LEFT JOIN `Ｔ１２b` USING (`Ｃ１`); -SELECT * FROM `Ｔ１２a` LEFT JOIN `Ｔ１２b` ON (`Ｔ１２a`.`Ｃ１` = `Ｔ１２b`.`Ｃ１`); -SELECT * FROM `Ｔ１２b` RIGHT JOIN `Ｔ１２a` USING (`Ｃ１`); -SELECT * FROM `Ｔ１２b` RIGHT JOIN `Ｔ１２a` ON (`Ｔ１２a`.`Ｃ１` = `Ｔ１２b`.`Ｃ１`); - DROP TABLE `Ｔ１a`; DROP TABLE `Ｔ１b`; DROP TABLE `Ｔ２a`; @@ -209,9 +176,3 @@ DROP TABLE `Ｔ８a`; DROP TABLE `Ｔ８b`; DROP TABLE `Ｔ９a`; DROP TABLE `Ｔ９b`; -DROP TABLE `Ｔ１０a`; -DROP TABLE `Ｔ１０b`; -DROP TABLE `Ｔ１１a`; -DROP TABLE `Ｔ１１b`; -DROP TABLE `Ｔ１２a`; -DROP TABLE `Ｔ１２b`; diff --git a/mysql-test/suite/jp/t/jp_left_sjis.test b/mysql-test/suite/jp/t/jp_left_sjis.test index 5d69d9892e2..0d718ccc3a0 100644 --- a/mysql-test/suite/jp/t/jp_left_sjis.test +++ b/mysql-test/suite/jp/t/jp_left_sjis.test @@ -1,3 +1,5 @@ +--source include/have_sjis.inc +--source include/have_innodb.inc --character_set sjis --disable_warnings drop table if exists `sP`; @@ -9,9 +11,6 @@ drop table if exists `sU`; 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`; --enable_warnings # @@ -27,12 +26,9 @@ CREATE TABLE `sR` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engin CREATE TABLE `sS` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sT` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sU` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; -CREATE TABLE `sV` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sW` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sX` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPO` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPP` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPQ` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; +CREATE TABLE `sV` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sW` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sX` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; INSERT INTO `sP` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `sQ` VALUES (''),(''),(''),(''),(''),(''); @@ -43,9 +39,6 @@ INSERT INTO `sU` VALUES ('\\\\\'),('\\\\'),('\\\'),('\\'),('\') INSERT INTO `sV` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `sW` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `sX` VALUES ('\\\\\'),('\\\\'),('\\\'),('\\'),('\'),(''); -INSERT INTO `sPO` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `sPP` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `sPQ` VALUES ('\\\\\'),('\\\\'),('\\\'),('\\'),('\'),(''); #InnoDB SELECT `bP`, LEFT(`bP`,0) FROM `sP`; @@ -87,7 +80,7 @@ SELECT `bP`, LEFT(`bP`,3) FROM `sU`; SELECT `bP`, LEFT(`bP`,4) FROM `sU`; SELECT `bP`, LEFT(`bP`,5) FROM `sU`; -#HEAP +#MEMORY SELECT `bP`, LEFT(`bP`,0) FROM `sV`; SELECT `bP`, LEFT(`bP`,1) FROM `sV`; SELECT `bP`, LEFT(`bP`,2) FROM `sV`; @@ -107,26 +100,6 @@ SELECT `bP`, LEFT(`bP`,3) FROM `sX`; SELECT `bP`, LEFT(`bP`,4) FROM `sX`; SELECT `bP`, LEFT(`bP`,5) FROM `sX`; -#BDB -SELECT `bP`, LEFT(`bP`,0) FROM `sPO`; -SELECT `bP`, LEFT(`bP`,1) FROM `sPO`; -SELECT `bP`, LEFT(`bP`,2) FROM `sPO`; -SELECT `bP`, LEFT(`bP`,3) FROM `sPO`; -SELECT `bP`, LEFT(`bP`,4) FROM `sPO`; -SELECT `bP`, LEFT(`bP`,5) FROM `sPO`; -SELECT `bP`, LEFT(`bP`,0) FROM `sPP`; -SELECT `bP`, LEFT(`bP`,1) FROM `sPP`; -SELECT `bP`, LEFT(`bP`,2) FROM `sPP`; -SELECT `bP`, LEFT(`bP`,3) FROM `sPP`; -SELECT `bP`, LEFT(`bP`,4) FROM `sPP`; -SELECT `bP`, LEFT(`bP`,5) FROM `sPP`; -SELECT `bP`, LEFT(`bP`,0) FROM `sPQ`; -SELECT `bP`, LEFT(`bP`,1) FROM `sPQ`; -SELECT `bP`, LEFT(`bP`,2) FROM `sPQ`; -SELECT `bP`, LEFT(`bP`,3) FROM `sPQ`; -SELECT `bP`, LEFT(`bP`,4) FROM `sPQ`; -SELECT `bP`, LEFT(`bP`,5) FROM `sPQ`; - DROP TABLE `sP`; DROP TABLE `sQ`; DROP TABLE `sR`; @@ -136,6 +109,3 @@ DROP TABLE `sU`; DROP TABLE `sV`; DROP TABLE `sW`; DROP TABLE `sX`; -DROP TABLE `sPO`; -DROP TABLE `sPP`; -DROP TABLE `sPQ`; diff --git a/mysql-test/suite/jp/t/jp_left_ucs2.test b/mysql-test/suite/jp/t/jp_left_ucs2.test index 59d10b7d736..3d55283c6ac 100644 --- a/mysql-test/suite/jp/t/jp_left_ucs2.test +++ b/mysql-test/suite/jp/t/jp_left_ucs2.test @@ -1,4 +1,5 @@ --source include/have_ucs2.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `ԣ`; @@ -10,9 +11,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 `ԣ`; --enable_warnings # @@ -29,12 +27,9 @@ CREATE TABLE `ԣ` (`ã` char(5), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engin 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 (''),(''),(''),(''),(''),(''); @@ -45,9 +40,6 @@ INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(' INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(''),(''),(''); #InnoDB SELECT `ã`, LEFT(`ã`,0) FROM `ԣ`; @@ -89,7 +81,7 @@ SELECT `ã`, LEFT(`ã`,3) FROM `ԣ`; SELECT `ã`, LEFT(`ã`,4) FROM `ԣ`; SELECT `ã`, LEFT(`ã`,5) FROM `ԣ`; -#HEAP +#MEMORY SELECT `ã`, LEFT(`ã`,0) FROM `ԣ`; SELECT `ã`, LEFT(`ã`,1) FROM `ԣ`; SELECT `ã`, LEFT(`ã`,2) FROM `ԣ`; @@ -109,26 +101,6 @@ SELECT `ã`, LEFT(`ã`,3) FROM `ԣ`; SELECT `ã`, LEFT(`ã`,4) FROM `ԣ`; SELECT `ã`, LEFT(`ã`,5) FROM `ԣ`; -#BDB -SELECT `ã`, LEFT(`ã`,0) FROM `ԣ`; -SELECT `ã`, LEFT(`ã`,1) FROM `ԣ`; -SELECT `ã`, LEFT(`ã`,2) FROM `ԣ`; -SELECT `ã`, LEFT(`ã`,3) FROM `ԣ`; -SELECT `ã`, LEFT(`ã`,4) FROM `ԣ`; -SELECT `ã`, LEFT(`ã`,5) FROM `ԣ`; -SELECT `ã`, LEFT(`ã`,0) FROM `ԣ`; -SELECT `ã`, LEFT(`ã`,1) FROM `ԣ`; -SELECT `ã`, LEFT(`ã`,2) FROM `ԣ`; -SELECT `ã`, LEFT(`ã`,3) FROM `ԣ`; -SELECT `ã`, LEFT(`ã`,4) FROM `ԣ`; -SELECT `ã`, LEFT(`ã`,5) FROM `ԣ`; -SELECT `ã`, LEFT(`ã`,0) FROM `ԣ`; -SELECT `ã`, LEFT(`ã`,1) FROM `ԣ`; -SELECT `ã`, LEFT(`ã`,2) FROM `ԣ`; -SELECT `ã`, LEFT(`ã`,3) FROM `ԣ`; -SELECT `ã`, LEFT(`ã`,4) FROM `ԣ`; -SELECT `ã`, LEFT(`ã`,5) FROM `ԣ`; - DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -138,6 +110,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/t/jp_left_ujis.test b/mysql-test/suite/jp/t/jp_left_ujis.test index 718639cd8a4..04619fa26bb 100644 --- a/mysql-test/suite/jp/t/jp_left_ujis.test +++ b/mysql-test/suite/jp/t/jp_left_ujis.test @@ -1,4 +1,5 @@ --source include/have_ujis.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `ԣ`; @@ -10,9 +11,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 `ԣ`; --enable_warnings # @@ -28,12 +26,9 @@ CREATE TABLE `ԣ` (`ã` char(5), INDEX(`ã`)) DEFAULT CHARSET = ujis engin 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 (''),(''),(''),(''),(''),(''); @@ -44,9 +39,6 @@ INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(' INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(''),(''),(''); #InnoDB SELECT `ã`, LEFT(`ã`,0) FROM `ԣ`; @@ -88,7 +80,7 @@ SELECT `ã`, LEFT(`ã`,3) FROM `ԣ`; SELECT `ã`, LEFT(`ã`,4) FROM `ԣ`; SELECT `ã`, LEFT(`ã`,5) FROM `ԣ`; -#HEAP +#MEMORY SELECT `ã`, LEFT(`ã`,0) FROM `ԣ`; SELECT `ã`, LEFT(`ã`,1) FROM `ԣ`; SELECT `ã`, LEFT(`ã`,2) FROM `ԣ`; @@ -108,26 +100,6 @@ SELECT `ã`, LEFT(`ã`,3) FROM `ԣ`; SELECT `ã`, LEFT(`ã`,4) FROM `ԣ`; SELECT `ã`, LEFT(`ã`,5) FROM `ԣ`; -#BDB -SELECT `ã`, LEFT(`ã`,0) FROM `ԣ`; -SELECT `ã`, LEFT(`ã`,1) FROM `ԣ`; -SELECT `ã`, LEFT(`ã`,2) FROM `ԣ`; -SELECT `ã`, LEFT(`ã`,3) FROM `ԣ`; -SELECT `ã`, LEFT(`ã`,4) FROM `ԣ`; -SELECT `ã`, LEFT(`ã`,5) FROM `ԣ`; -SELECT `ã`, LEFT(`ã`,0) FROM `ԣ`; -SELECT `ã`, LEFT(`ã`,1) FROM `ԣ`; -SELECT `ã`, LEFT(`ã`,2) FROM `ԣ`; -SELECT `ã`, LEFT(`ã`,3) FROM `ԣ`; -SELECT `ã`, LEFT(`ã`,4) FROM `ԣ`; -SELECT `ã`, LEFT(`ã`,5) FROM `ԣ`; -SELECT `ã`, LEFT(`ã`,0) FROM `ԣ`; -SELECT `ã`, LEFT(`ã`,1) FROM `ԣ`; -SELECT `ã`, LEFT(`ã`,2) FROM `ԣ`; -SELECT `ã`, LEFT(`ã`,3) FROM `ԣ`; -SELECT `ã`, LEFT(`ã`,4) FROM `ԣ`; -SELECT `ã`, LEFT(`ã`,5) FROM `ԣ`; - DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -137,6 +109,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/t/jp_left_utf8.test b/mysql-test/suite/jp/t/jp_left_utf8.test index f9c99718e0f..0f77c1709d4 100644 --- a/mysql-test/suite/jp/t/jp_left_utf8.test +++ b/mysql-test/suite/jp/t/jp_left_utf8.test @@ -1,3 +1,5 @@ +--source include/have_utf8.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `Ｔ１`; drop table if exists `Ｔ２`; @@ -8,9 +10,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 `Ｔ１２`; --enable_warnings # @@ -26,12 +25,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 ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),(''); @@ -42,9 +38,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),( INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),(''); INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),(''); INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),(''); -INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),(''); -INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),(''); -INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),(''); #InnoDB SELECT `Ｃ１`, LEFT(`Ｃ１`,0) FROM `Ｔ１`; @@ -86,7 +79,7 @@ SELECT `Ｃ１`, LEFT(`Ｃ１`,3) FROM `Ｔ６`; SELECT `Ｃ１`, LEFT(`Ｃ１`,4) FROM `Ｔ６`; SELECT `Ｃ１`, LEFT(`Ｃ１`,5) FROM `Ｔ６`; -#HEAP +#MEMORY SELECT `Ｃ１`, LEFT(`Ｃ１`,0) FROM `Ｔ７`; SELECT `Ｃ１`, LEFT(`Ｃ１`,1) FROM `Ｔ７`; SELECT `Ｃ１`, LEFT(`Ｃ１`,2) FROM `Ｔ７`; @@ -106,26 +99,6 @@ SELECT `Ｃ１`, LEFT(`Ｃ１`,3) FROM `Ｔ９`; SELECT `Ｃ１`, LEFT(`Ｃ１`,4) FROM `Ｔ９`; SELECT `Ｃ１`, LEFT(`Ｃ１`,5) FROM `Ｔ９`; -#BDB -SELECT `Ｃ１`, LEFT(`Ｃ１`,0) FROM `Ｔ１０`; -SELECT `Ｃ１`, LEFT(`Ｃ１`,1) FROM `Ｔ１０`; -SELECT `Ｃ１`, LEFT(`Ｃ１`,2) FROM `Ｔ１０`; -SELECT `Ｃ１`, LEFT(`Ｃ１`,3) FROM `Ｔ１０`; -SELECT `Ｃ１`, LEFT(`Ｃ１`,4) FROM `Ｔ１０`; -SELECT `Ｃ１`, LEFT(`Ｃ１`,5) FROM `Ｔ１０`; -SELECT `Ｃ１`, LEFT(`Ｃ１`,0) FROM `Ｔ１１`; -SELECT `Ｃ１`, LEFT(`Ｃ１`,1) FROM `Ｔ１１`; -SELECT `Ｃ１`, LEFT(`Ｃ１`,2) FROM `Ｔ１１`; -SELECT `Ｃ１`, LEFT(`Ｃ１`,3) FROM `Ｔ１１`; -SELECT `Ｃ１`, LEFT(`Ｃ１`,4) FROM `Ｔ１１`; -SELECT `Ｃ１`, LEFT(`Ｃ１`,5) FROM `Ｔ１１`; -SELECT `Ｃ１`, LEFT(`Ｃ１`,0) FROM `Ｔ１２`; -SELECT `Ｃ１`, LEFT(`Ｃ１`,1) FROM `Ｔ１２`; -SELECT `Ｃ１`, LEFT(`Ｃ１`,2) FROM `Ｔ１２`; -SELECT `Ｃ１`, LEFT(`Ｃ１`,3) FROM `Ｔ１２`; -SELECT `Ｃ１`, LEFT(`Ｃ１`,4) FROM `Ｔ１２`; -SELECT `Ｃ１`, LEFT(`Ｃ１`,5) FROM `Ｔ１２`; - DROP TABLE `Ｔ１`; DROP TABLE `Ｔ２`; DROP TABLE `Ｔ３`; @@ -135,6 +108,3 @@ DROP TABLE `Ｔ６`; DROP TABLE `Ｔ７`; DROP TABLE `Ｔ８`; DROP TABLE `Ｔ９`; -DROP TABLE `Ｔ１０`; -DROP TABLE `Ｔ１１`; -DROP TABLE `Ｔ１２`; diff --git a/mysql-test/suite/jp/t/jp_length_sjis.test b/mysql-test/suite/jp/t/jp_length_sjis.test index 7023891b7f0..acc6be975ae 100644 --- a/mysql-test/suite/jp/t/jp_length_sjis.test +++ b/mysql-test/suite/jp/t/jp_length_sjis.test @@ -1,3 +1,5 @@ +--source include/have_sjis.inc +--source include/have_innodb.inc --character_set sjis --disable_warnings drop table if exists `sP`; @@ -9,9 +11,6 @@ drop table if exists `sU`; 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`; --enable_warnings # @@ -27,12 +26,9 @@ CREATE TABLE `sR` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engin CREATE TABLE `sS` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sT` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sU` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; -CREATE TABLE `sV` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sW` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sX` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPO` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPP` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPQ` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; +CREATE TABLE `sV` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sW` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sX` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; INSERT INTO `sP` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `sQ` VALUES (''),(''),(''),(''),(''),(''); @@ -43,9 +39,6 @@ INSERT INTO `sU` VALUES ('\\\\\'),('\\\\'),('\\\'),('\\'),('\') INSERT INTO `sV` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `sW` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `sX` VALUES ('\\\\\'),('\\\\'),('\\\'),('\\'),('\'),(''); -INSERT INTO `sPO` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `sPP` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `sPQ` VALUES ('\\\\\'),('\\\\'),('\\\'),('\\'),('\'),(''); #InnoDB SELECT `bP`, LENGTH(`bP`) FROM `sP`; @@ -57,16 +50,11 @@ SELECT `bP`, LENGTH(`bP`) FROM `sS`; SELECT `bP`, LENGTH(`bP`) FROM `sT`; SELECT `bP`, LENGTH(`bP`) FROM `sU`; -#HEAP +#MEMORY SELECT `bP`, LENGTH(`bP`) FROM `sV`; SELECT `bP`, LENGTH(`bP`) FROM `sW`; SELECT `bP`, LENGTH(`bP`) FROM `sX`; -#BDB -SELECT `bP`, LENGTH(`bP`) FROM `sPO`; -SELECT `bP`, LENGTH(`bP`) FROM `sPP`; -SELECT `bP`, LENGTH(`bP`) FROM `sPQ`; - DROP TABLE `sP`; DROP TABLE `sQ`; DROP TABLE `sR`; @@ -76,6 +64,3 @@ DROP TABLE `sU`; DROP TABLE `sV`; DROP TABLE `sW`; DROP TABLE `sX`; -DROP TABLE `sPO`; -DROP TABLE `sPP`; -DROP TABLE `sPQ`; diff --git a/mysql-test/suite/jp/t/jp_length_ucs2.test b/mysql-test/suite/jp/t/jp_length_ucs2.test index 9951c9b6cd1..41fd81713bf 100644 --- a/mysql-test/suite/jp/t/jp_length_ucs2.test +++ b/mysql-test/suite/jp/t/jp_length_ucs2.test @@ -1,4 +1,5 @@ --source include/have_ucs2.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `ԣ`; @@ -10,9 +11,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 `ԣ`; --enable_warnings # @@ -29,12 +27,9 @@ CREATE TABLE `ԣ` (`ã` char(5), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engin 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 (''),(''),(''),(''),(''),(''); @@ -45,9 +40,6 @@ INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(' INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(''),(''),(''); #InnoDB SELECT `ã`, LENGTH(`ã`) FROM `ԣ`; @@ -59,16 +51,11 @@ SELECT `ã`, LENGTH(`ã`) FROM `ԣ`; SELECT `ã`, LENGTH(`ã`) FROM `ԣ`; SELECT `ã`, LENGTH(`ã`) FROM `ԣ`; -#HEAP +#MEMORY SELECT `ã`, LENGTH(`ã`) FROM `ԣ`; SELECT `ã`, LENGTH(`ã`) FROM `ԣ`; SELECT `ã`, LENGTH(`ã`) FROM `ԣ`; -#BDB -SELECT `ã`, LENGTH(`ã`) FROM `ԣ`; -SELECT `ã`, LENGTH(`ã`) FROM `ԣ`; -SELECT `ã`, LENGTH(`ã`) FROM `ԣ`; - DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -78,6 +65,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/t/jp_length_ujis.test b/mysql-test/suite/jp/t/jp_length_ujis.test index ac3aef2c768..33a0baa43a9 100644 --- a/mysql-test/suite/jp/t/jp_length_ujis.test +++ b/mysql-test/suite/jp/t/jp_length_ujis.test @@ -1,4 +1,5 @@ --source include/have_ujis.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `ԣ`; @@ -10,9 +11,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 `ԣ`; --enable_warnings # @@ -28,12 +26,9 @@ CREATE TABLE `ԣ` (`ã` char(5), INDEX(`ã`)) DEFAULT CHARSET = ujis engin 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 (''),(''),(''),(''),(''),(''); @@ -44,9 +39,6 @@ INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(' INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(''),(''),(''); #InnoDB SELECT `ã`, LENGTH(`ã`) FROM `ԣ`; @@ -58,16 +50,11 @@ SELECT `ã`, LENGTH(`ã`) FROM `ԣ`; SELECT `ã`, LENGTH(`ã`) FROM `ԣ`; SELECT `ã`, LENGTH(`ã`) FROM `ԣ`; -#HEAP +#MEMORY SELECT `ã`, LENGTH(`ã`) FROM `ԣ`; SELECT `ã`, LENGTH(`ã`) FROM `ԣ`; SELECT `ã`, LENGTH(`ã`) FROM `ԣ`; -#BDB -SELECT `ã`, LENGTH(`ã`) FROM `ԣ`; -SELECT `ã`, LENGTH(`ã`) FROM `ԣ`; -SELECT `ã`, LENGTH(`ã`) FROM `ԣ`; - DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -77,6 +64,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/t/jp_length_utf8.test b/mysql-test/suite/jp/t/jp_length_utf8.test index 5c5021f37be..ffb5b4fdb5b 100644 --- a/mysql-test/suite/jp/t/jp_length_utf8.test +++ b/mysql-test/suite/jp/t/jp_length_utf8.test @@ -1,3 +1,5 @@ +--source include/have_utf8.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `Ｔ１`; drop table if exists `Ｔ２`; @@ -8,9 +10,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 `Ｔ１２`; --enable_warnings # @@ -26,12 +25,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 ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),(''); @@ -42,9 +38,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),( INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),(''); INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),(''); INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),(''); -INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),(''); -INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),(''); -INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),(''); #InnoDB SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ１`; @@ -56,16 +49,11 @@ SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ４`; SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ５`; SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ６`; -#HEAP +#MEMORY SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ７`; SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ８`; SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ９`; -#BDB -SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ１０`; -SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ１１`; -SELECT `Ｃ１`, LENGTH(`Ｃ１`) FROM `Ｔ１２`; - DROP TABLE `Ｔ１`; DROP TABLE `Ｔ２`; DROP TABLE `Ｔ３`; @@ -75,6 +63,3 @@ DROP TABLE `Ｔ６`; DROP TABLE `Ｔ７`; DROP TABLE `Ｔ８`; DROP TABLE `Ｔ９`; -DROP TABLE `Ｔ１０`; -DROP TABLE `Ｔ１１`; -DROP TABLE `Ｔ１２`; diff --git a/mysql-test/suite/jp/t/jp_like_sjis.test b/mysql-test/suite/jp/t/jp_like_sjis.test index 5c41b9ff7ef..6cb6092852a 100644 --- a/mysql-test/suite/jp/t/jp_like_sjis.test +++ b/mysql-test/suite/jp/t/jp_like_sjis.test @@ -1,4 +1,5 @@ --character_set sjis +--source include/have_innodb.inc --disable_warnings drop table if exists `sP`; drop table if exists `sQ`; @@ -9,9 +10,6 @@ drop table if exists `sU`; 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`; --enable_warnings # @@ -27,12 +25,9 @@ CREATE TABLE `sR` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engi CREATE TABLE `sS` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sT` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sU` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; -CREATE TABLE `sV` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sW` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sX` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPO` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPP` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPQ` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; +CREATE TABLE `sV` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sW` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sX` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; #Load the following data in each table # jisx0201 hankaku-katakana data @@ -47,9 +42,6 @@ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `sU`; 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`; #InnoDB SELECT * FROM `sP` WHERE `bP` LIKE ' %'; @@ -103,7 +95,7 @@ SELECT * FROM `sU` WHERE `bP` LIKE '\\\\\\\\\\\\\\\\\\\\ SELECT * FROM `sU` WHERE `bP` LIKE '%\\\\\\\\\\\\\\\\\\\\%'; SELECT * FROM `sU` WHERE `bP` LIKE '%\\\\\\\\\\\\\\\\\\\\'; -#Heap +#MEMORY SELECT * FROM `sV` WHERE `bP` LIKE ' %'; SELECT * FROM `sV` WHERE `bP` LIKE '% %'; SELECT * FROM `sV` WHERE `bP` LIKE '% '; @@ -128,31 +120,6 @@ SELECT * FROM `sX` WHERE `bP` LIKE '%\'; SELECT * FROM `sX` WHERE `bP` LIKE '\\\\\\\\\\\\\\\\\\\\%'; SELECT * FROM `sX` WHERE `bP` LIKE '%\\\\\\\\\\\\\\\\\\\\%'; SELECT * FROM `sX` WHERE `bP` LIKE '%\\\\\\\\\\\\\\\\\\\\'; -#BDB -SELECT * FROM `sPO` WHERE `bP` LIKE ' %'; -SELECT * FROM `sPO` WHERE `bP` LIKE '% %'; -SELECT * FROM `sPO` WHERE `bP` LIKE '% '; -SELECT * FROM `sPO` WHERE `bP` LIKE '%'; -SELECT * FROM `sPO` WHERE `bP` LIKE '%%'; -SELECT * FROM `sPO` WHERE `bP` LIKE '%'; -#SELECT * FROM `sPO` WHERE `bP` LIKE '%'; -#SELECT * FROM `sPO` WHERE `bP` LIKE '%%'; -SELECT * FROM `sPO` WHERE `bP` LIKE '%'; -SELECT * FROM `sPP` WHERE `bP` LIKE '@%'; -SELECT * FROM `sPP` WHERE `bP` LIKE '%@%'; -SELECT * FROM `sPP` WHERE `bP` LIKE '%@'; -SELECT * FROM `sPP` WHERE `bP` LIKE '%'; -SELECT * FROM `sPP` WHERE `bP` LIKE '%%'; -SELECT * FROM `sPP` WHERE `bP` LIKE '%'; -#SELECT * FROM `sPP` WHERE `bP` LIKE 'E%'; -#SELECT * FROM `sPP` WHERE `bP` LIKE '%E%'; -#SELECT * FROM `sPP` WHERE `bP` LIKE '%E'; -SELECT * FROM `sPQ` WHERE `bP` LIKE '\%'; -SELECT * FROM `sPQ` WHERE `bP` LIKE '%\%'; -SELECT * FROM `sPQ` WHERE `bP` LIKE '%\'; -#SELECT * FROM `sPQ` WHERE `bP` LIKE '\\\\\\\\\\\\\\\\\\\\%'; -#SELECT * FROM `sPQ` WHERE `bP` LIKE '%\\\\\\\\\\\\\\\\\\\\%'; -#SELECT * FROM `sPQ` WHERE `bP` LIKE '%\\\\\\\\\\\\\\\\\\\\'; DROP TABLE `sP`; DROP TABLE `sQ`; @@ -163,6 +130,3 @@ DROP TABLE `sU`; DROP TABLE `sV`; DROP TABLE `sW`; DROP TABLE `sX`; -DROP TABLE `sPO`; -DROP TABLE `sPP`; -DROP TABLE `sPQ`; diff --git a/mysql-test/suite/jp/t/jp_like_ucs2.test b/mysql-test/suite/jp/t/jp_like_ucs2.test index feae40de49e..1fd7d559e86 100644 --- a/mysql-test/suite/jp/t/jp_like_ucs2.test +++ b/mysql-test/suite/jp/t/jp_like_ucs2.test @@ -1,4 +1,5 @@ --source include/have_ucs2.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `ԣ`; @@ -10,9 +11,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 `ԣ`; --enable_warnings # @@ -29,12 +27,9 @@ CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engi CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = myisam; CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = myisam; CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = myisam; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = bdb; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = bdb; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = bdb; +CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = MEMORY; #Insert the following data in each table # jisx0201 hankaku-katakana data @@ -125,34 +120,6 @@ INSERT INTO `ԣ` VALUES ,('ÏďŏƏ') ,('ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ'); -INSERT INTO `ԣ` VALUES - ('PQRSTUVWXYZ[\\]^_') -,(' ') -,('') -,('ÎĎŎƎǎȎɎʎˎ͎̎Ύ') -,('ЎюҎӎԎՎ֎؎َڎێݎގ'); - -INSERT INTO `ԣ` VALUES - ('') -,('¡áġšơ') -,('ȡɡʡˡ̡͡ΡϡСѡҡӡԡա֡סء١ڡ') -,('') -,('Ȥɤʤˤ̤ͤΤϤФѤҤӤԤդ֤פؤ٤ڤ') -,('ܤݤޤߤ') -,('') -,('') -,('СТУФХЦЧШЩЪЫЬЭЮЯабвг') -,(''); - -INSERT INTO `ԣ` VALUES - ('Ïġ') -,('ÏďŏƏ') -,('ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ') -,('ݏޏߏᏰ⏰㏰䏰台揰珰菰鏰ꏰ돰쏰폰') -,('') -,('ÏďŏƏ') -,('ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ'); - #INNODB SELECT * FROM `ԣ` WHERE `ã` LIKE ' %'; SELECT * FROM `ԣ` WHERE `ã` LIKE '% %'; @@ -205,7 +172,7 @@ SELECT * FROM `ԣ` WHERE `ã` LIKE ' SELECT * FROM `ԣ` WHERE `ã` LIKE '%ÏďŏƏ%'; SELECT * FROM `ԣ` WHERE `ã` LIKE '%ÏďŏƏ'; -#Heap +#MEMORY SELECT * FROM `ԣ` WHERE `ã` LIKE ' %'; SELECT * FROM `ԣ` WHERE `ã` LIKE '% %'; SELECT * FROM `ԣ` WHERE `ã` LIKE '% '; @@ -231,32 +198,6 @@ SELECT * FROM `ԣ` WHERE `ã` LIKE ' SELECT * FROM `ԣ` WHERE `ã` LIKE '%ÏďŏƏ%'; SELECT * FROM `ԣ` WHERE `ã` LIKE '%ÏďŏƏ'; -#BDB -SELECT * FROM `ԣ` WHERE `ã` LIKE ' %'; -SELECT * FROM `ԣ` WHERE `ã` LIKE '% %'; -SELECT * FROM `ԣ` WHERE `ã` LIKE '% '; -SELECT * FROM `ԣ` WHERE `ã` LIKE '%'; -SELECT * FROM `ԣ` WHERE `ã` LIKE '%%'; -SELECT * FROM `ԣ` WHERE `ã` LIKE '%'; -SELECT * FROM `ԣ` WHERE `ã` LIKE '%'; -SELECT * FROM `ԣ` WHERE `ã` LIKE '%%'; -SELECT * FROM `ԣ` WHERE `ã` LIKE '%'; -SELECT * FROM `ԣ` WHERE `ã` LIKE '%'; -SELECT * FROM `ԣ` WHERE `ã` LIKE '%%'; -SELECT * FROM `ԣ` WHERE `ã` LIKE '%'; -SELECT * FROM `ԣ` WHERE `ã` LIKE '%'; -SELECT * FROM `ԣ` WHERE `ã` LIKE '%%'; -SELECT * FROM `ԣ` WHERE `ã` LIKE '%'; -SELECT * FROM `ԣ` WHERE `ã` LIKE '%'; -SELECT * FROM `ԣ` WHERE `ã` LIKE '%%'; -SELECT * FROM `ԣ` WHERE `ã` LIKE '%'; -SELECT * FROM `ԣ` WHERE `ã` LIKE '%'; -SELECT * FROM `ԣ` WHERE `ã` LIKE '%%'; -SELECT * FROM `ԣ` WHERE `ã` LIKE '%'; -SELECT * FROM `ԣ` WHERE `ã` LIKE 'ÏďŏƏ%'; -SELECT * FROM `ԣ` WHERE `ã` LIKE '%ÏďŏƏ%'; -SELECT * FROM `ԣ` WHERE `ã` LIKE '%ÏďŏƏ'; - DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -266,6 +207,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/t/jp_like_ujis.test b/mysql-test/suite/jp/t/jp_like_ujis.test index 29ef7c5d48b..dccb49d07d1 100644 --- a/mysql-test/suite/jp/t/jp_like_ujis.test +++ b/mysql-test/suite/jp/t/jp_like_ujis.test @@ -1,4 +1,5 @@ --source include/have_ujis.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `ԣ`; @@ -10,9 +11,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 `ԣ`; --enable_warnings # @@ -28,12 +26,9 @@ CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engi CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = myisam; CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = myisam; CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = myisam; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = bdb; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = bdb; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = bdb; +CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = MEMORY; #Load the following data in each table # jisx0201 hankaku-katakana data @@ -49,9 +44,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 `ԣ`; #InnoDB SELECT * FROM `ԣ` WHERE `ã` LIKE ' %'; @@ -105,7 +97,7 @@ SELECT * FROM `ԣ` WHERE `ã` LIKE ' SELECT * FROM `ԣ` WHERE `ã` LIKE '%ÏďŏƏ%'; SELECT * FROM `ԣ` WHERE `ã` LIKE '%ÏďŏƏ'; -#Heap +#MEMORY SELECT * FROM `ԣ` WHERE `ã` LIKE ' %'; SELECT * FROM `ԣ` WHERE `ã` LIKE '% %'; SELECT * FROM `ԣ` WHERE `ã` LIKE '% '; @@ -130,31 +122,6 @@ SELECT * FROM `ԣ` WHERE `ã` LIKE '%'; SELECT * FROM `ԣ` WHERE `ã` LIKE 'ÏďŏƏ%'; SELECT * FROM `ԣ` WHERE `ã` LIKE '%ÏďŏƏ%'; SELECT * FROM `ԣ` WHERE `ã` LIKE '%ÏďŏƏ'; -#BDB -SELECT * FROM `ԣ` WHERE `ã` LIKE ' %'; -SELECT * FROM `ԣ` WHERE `ã` LIKE '% %'; -SELECT * FROM `ԣ` WHERE `ã` LIKE '% '; -SELECT * FROM `ԣ` WHERE `ã` LIKE '%'; -SELECT * FROM `ԣ` WHERE `ã` LIKE '%%'; -SELECT * FROM `ԣ` WHERE `ã` LIKE '%'; -#SELECT * FROM `ԣ` WHERE `ã` LIKE '%'; -#SELECT * FROM `ԣ` WHERE `ã` LIKE '%%'; -SELECT * FROM `ԣ` WHERE `ã` LIKE '%'; -SELECT * FROM `ԣ` WHERE `ã` LIKE '%'; -SELECT * FROM `ԣ` WHERE `ã` LIKE '%%'; -SELECT * FROM `ԣ` WHERE `ã` LIKE '%'; -SELECT * FROM `ԣ` WHERE `ã` LIKE '%'; -SELECT * FROM `ԣ` WHERE `ã` LIKE '%%'; -SELECT * FROM `ԣ` WHERE `ã` LIKE '%'; -#SELECT * FROM `ԣ` WHERE `ã` LIKE '%'; -#SELECT * FROM `ԣ` WHERE `ã` LIKE '%%'; -#SELECT * FROM `ԣ` WHERE `ã` LIKE '%'; -SELECT * FROM `ԣ` WHERE `ã` LIKE '%'; -SELECT * FROM `ԣ` WHERE `ã` LIKE '%%'; -SELECT * FROM `ԣ` WHERE `ã` LIKE '%'; -#SELECT * FROM `ԣ` WHERE `ã` LIKE 'ÏďŏƏ%'; -#SELECT * FROM `ԣ` WHERE `ã` LIKE '%ÏďŏƏ%'; -#SELECT * FROM `ԣ` WHERE `ã` LIKE '%ÏďŏƏ'; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -165,6 +132,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/t/jp_like_utf8.test b/mysql-test/suite/jp/t/jp_like_utf8.test index 4247242029d..4332922f831 100644 --- a/mysql-test/suite/jp/t/jp_like_utf8.test +++ b/mysql-test/suite/jp/t/jp_like_utf8.test @@ -1,3 +1,5 @@ +--source include/have_utf8.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `Ｔ１`; drop table if exists `Ｔ２`; @@ -8,9 +10,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 `Ｔ１２`; --enable_warnings # @@ -26,12 +25,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf CREATE TABLE `Ｔ４` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam; CREATE TABLE `Ｔ５` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam; CREATE TABLE `Ｔ６` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam; -CREATE TABLE `Ｔ７` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ８` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ９` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ１０` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb; -CREATE TABLE `Ｔ１１` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb; -CREATE TABLE `Ｔ１２` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb; +CREATE TABLE `Ｔ７` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ８` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ９` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY; #Load the following data in each table # jisx0201 hankaku-katakana data @@ -47,9 +43,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 `Ｔ１２`; #InnoDB SELECT * FROM `Ｔ１` WHERE `Ｃ１` LIKE ' %'; @@ -103,7 +96,7 @@ SELECT * FROM `Ｔ６` WHERE `Ｃ１` LIKE '鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁 SELECT * FROM `Ｔ６` WHERE `Ｃ１` LIKE '%鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖%'; SELECT * FROM `Ｔ６` WHERE `Ｃ１` LIKE '%鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖'; -#Heap +#MEMORY SELECT * FROM `Ｔ７` WHERE `Ｃ１` LIKE ' %'; SELECT * FROM `Ｔ７` WHERE `Ｃ１` LIKE '% %'; SELECT * FROM `Ｔ７` WHERE `Ｃ１` LIKE '% '; @@ -128,31 +121,6 @@ SELECT * FROM `Ｔ９` WHERE `Ｃ１` LIKE '%齖'; SELECT * FROM `Ｔ９` WHERE `Ｃ１` LIKE '鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖%'; SELECT * FROM `Ｔ９` WHERE `Ｃ１` LIKE '%鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖%'; SELECT * FROM `Ｔ９` WHERE `Ｃ１` LIKE '%鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖'; -#BDB -SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE ' %'; -SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE '% %'; -SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE '% '; -SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE 'ﾀ%'; -SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE '%ﾗﾘ%'; -SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE '%ｿ'; -#SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE 'ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ%'; -#SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE '%ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ%'; -#SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE '%ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ'; -SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE ' %'; -SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '% %'; -SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '% '; -SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE 'と%'; -SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '%あ%'; -SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '%わ'; -#SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '・ぁあぃいぅうぇえぉおかがきぎくぐけげこ%'; -#SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '%・ぁあぃいぅうぇえぉおかがきぎくぐけげこ%'; -#SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '%・ぁあぃいぅうぇえぉおかがきぎくぐけげこ'; -SELECT * FROM `Ｔ１２` WHERE `Ｃ１` LIKE '鼫%'; -SELECT * FROM `Ｔ１２` WHERE `Ｃ１` LIKE '%鼺%'; -SELECT * FROM `Ｔ１２` WHERE `Ｃ１` LIKE '%齖'; -#SELECT * FROM `Ｔ１２` WHERE `Ｃ１` LIKE '鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖%'; -#SELECT * FROM `Ｔ１２` WHERE `Ｃ１` LIKE '%鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖%'; -#SELECT * FROM `Ｔ１２` WHERE `Ｃ１` LIKE '%鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖'; DROP TABLE `Ｔ１`; DROP TABLE `Ｔ２`; @@ -163,6 +131,3 @@ DROP TABLE `Ｔ６`; DROP TABLE `Ｔ７`; DROP TABLE `Ｔ８`; DROP TABLE `Ｔ９`; -DROP TABLE `Ｔ１０`; -DROP TABLE `Ｔ１１`; -DROP TABLE `Ｔ１２`; diff --git a/mysql-test/suite/jp/t/jp_locate_sjis.test b/mysql-test/suite/jp/t/jp_locate_sjis.test index 92c671199b6..e7a21e0e014 100644 --- a/mysql-test/suite/jp/t/jp_locate_sjis.test +++ b/mysql-test/suite/jp/t/jp_locate_sjis.test @@ -1,3 +1,5 @@ +--source include/have_sjis.inc +--source include/have_innodb.inc --character_set sjis --disable_warnings drop table if exists `sP`; @@ -9,7 +11,6 @@ drop table if exists `sU`; drop table if exists `sV`; drop table if exists `sW`; drop table if exists `sX`; -drop table if exists `sPO`; --enable_warnings # @@ -24,12 +25,9 @@ CREATE TABLE `sR` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engin CREATE TABLE `sS` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sT` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sU` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; -CREATE TABLE `sV` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sW` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sX` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPO` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPP` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPQ` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; +CREATE TABLE `sV` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sW` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sX` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; INSERT INTO `sP` VALUES (''); INSERT INTO `sQ` VALUES (''); @@ -40,9 +38,6 @@ INSERT INTO `sU` VALUES ('\\\\\'); INSERT INTO `sV` VALUES (''); INSERT INTO `sW` VALUES (''); INSERT INTO `sX` VALUES ('\\\\\'); -INSERT INTO `sPO` VALUES (''); -INSERT INTO `sPP` VALUES (''); -INSERT INTO `sPQ` VALUES ('\\\\\'); #InnoDB SELECT LOCATE('',`bP`) from `sP`; @@ -85,7 +80,7 @@ SELECT LOCATE('\',`bP`) from `sU`; SELECT LOCATE('\',`bP`) from `sU`; -#HEAP +#MEMORY SELECT LOCATE('',`bP`) from `sV`; SELECT LOCATE('',`bP`) from `sV`; SELECT LOCATE('',`bP`) from `sV`; @@ -106,27 +101,6 @@ SELECT LOCATE('\',`bP`) from `sX`; SELECT LOCATE('\',`bP`) from `sX`; -#BDB -SELECT LOCATE('',`bP`) from `sPO`; -SELECT LOCATE('',`bP`) from `sPO`; -SELECT LOCATE('',`bP`) from `sPO`; -SELECT LOCATE('',`bP`) from `sPO`; -SELECT LOCATE('',`bP`) from `sPO`; -SELECT LOCATE('',`bP`) from `sPO`; -SELECT LOCATE('',`bP`) from `sPP`; -SELECT LOCATE('',`bP`) from `sPP`; -SELECT LOCATE('',`bP`) from `sPP`; -SELECT LOCATE('',`bP`) from `sPP`; -SELECT LOCATE('',`bP`) from `sPP`; -SELECT LOCATE('',`bP`) from `sPP`; -SELECT LOCATE('\',`bP`) from `sPQ`; -SELECT LOCATE('\',`bP`) from `sPQ`; -SELECT LOCATE('\',`bP`) from `sPQ`; -SELECT LOCATE('\',`bP`) from `sPQ`; -SELECT LOCATE('\',`bP`) from `sPQ`; -SELECT LOCATE('\',`bP`) from `sPQ`; - - DROP TABLE `sP`; DROP TABLE `sQ`; DROP TABLE `sR`; @@ -136,6 +110,3 @@ DROP TABLE `sU`; DROP TABLE `sV`; DROP TABLE `sW`; DROP TABLE `sX`; -DROP TABLE `sPO`; -DROP TABLE `sPP`; -DROP TABLE `sPQ`; diff --git a/mysql-test/suite/jp/t/jp_locate_ucs2.test b/mysql-test/suite/jp/t/jp_locate_ucs2.test index d00ad67235a..02b95a20eda 100644 --- a/mysql-test/suite/jp/t/jp_locate_ucs2.test +++ b/mysql-test/suite/jp/t/jp_locate_ucs2.test @@ -1,4 +1,5 @@ --source include/have_ucs2.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `ԣ`; @@ -10,7 +11,6 @@ drop table if exists `ԣ`; drop table if exists `ԣ`; drop table if exists `ԣ`; drop table if exists `ԣ`; -drop table if exists `ԣ`; --enable_warnings # @@ -27,12 +27,9 @@ CREATE TABLE `ԣ` (`ã` char(5), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engin 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 (''); @@ -43,9 +40,6 @@ INSERT INTO `ԣ` VALUES ('ݏޏߏ'); INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES ('ݏޏߏ'); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'); #InnoDB SELECT LOCATE('',`ã`) from `ԣ`; @@ -88,7 +82,7 @@ SELECT LOCATE('',`ã`) from `ԣ`; SELECT LOCATE('',`ã`) from `ԣ`; -#HEAP +#MEMORY SELECT LOCATE('',`ã`) from `ԣ`; SELECT LOCATE('',`ã`) from `ԣ`; SELECT LOCATE('',`ã`) from `ԣ`; @@ -109,27 +103,6 @@ SELECT LOCATE('',`ã`) from `ԣ`; SELECT LOCATE('',`ã`) from `ԣ`; -#BDB -SELECT LOCATE('',`ã`) from `ԣ`; -SELECT LOCATE('',`ã`) from `ԣ`; -SELECT LOCATE('',`ã`) from `ԣ`; -SELECT LOCATE('',`ã`) from `ԣ`; -SELECT LOCATE('',`ã`) from `ԣ`; -SELECT LOCATE('',`ã`) from `ԣ`; -SELECT LOCATE('',`ã`) from `ԣ`; -SELECT LOCATE('',`ã`) from `ԣ`; -SELECT LOCATE('',`ã`) from `ԣ`; -SELECT LOCATE('',`ã`) from `ԣ`; -SELECT LOCATE('',`ã`) from `ԣ`; -SELECT LOCATE('',`ã`) from `ԣ`; -SELECT LOCATE('',`ã`) from `ԣ`; -SELECT LOCATE('',`ã`) from `ԣ`; -SELECT LOCATE('',`ã`) from `ԣ`; -SELECT LOCATE('',`ã`) from `ԣ`; -SELECT LOCATE('',`ã`) from `ԣ`; -SELECT LOCATE('',`ã`) from `ԣ`; - - DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -139,6 +112,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/t/jp_locate_ujis.test b/mysql-test/suite/jp/t/jp_locate_ujis.test index 5375fad75db..21e3fa1dbbb 100644 --- a/mysql-test/suite/jp/t/jp_locate_ujis.test +++ b/mysql-test/suite/jp/t/jp_locate_ujis.test @@ -1,4 +1,5 @@ --source include/have_ujis.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `ԣ`; @@ -10,7 +11,6 @@ drop table if exists `ԣ`; drop table if exists `ԣ`; drop table if exists `ԣ`; drop table if exists `ԣ`; -drop table if exists `ԣ`; --enable_warnings # @@ -26,12 +26,9 @@ CREATE TABLE `ԣ` (`ã` char(5), INDEX(`ã`)) DEFAULT CHARSET = ujis engin 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 (''); @@ -42,9 +39,6 @@ INSERT INTO `ԣ` VALUES ('ݏޏߏ'); INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES ('ݏޏߏ'); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'); #InnoDB SELECT LOCATE('',`ã`) from `ԣ`; @@ -87,7 +81,7 @@ SELECT LOCATE('',`ã`) from `ԣ`; SELECT LOCATE('',`ã`) from `ԣ`; -#HEAP +#MEMORY SELECT LOCATE('',`ã`) from `ԣ`; SELECT LOCATE('',`ã`) from `ԣ`; SELECT LOCATE('',`ã`) from `ԣ`; @@ -108,27 +102,6 @@ SELECT LOCATE('',`ã`) from `ԣ`; SELECT LOCATE('',`ã`) from `ԣ`; -#BDB -SELECT LOCATE('',`ã`) from `ԣ`; -SELECT LOCATE('',`ã`) from `ԣ`; -SELECT LOCATE('',`ã`) from `ԣ`; -SELECT LOCATE('',`ã`) from `ԣ`; -SELECT LOCATE('',`ã`) from `ԣ`; -SELECT LOCATE('',`ã`) from `ԣ`; -SELECT LOCATE('',`ã`) from `ԣ`; -SELECT LOCATE('',`ã`) from `ԣ`; -SELECT LOCATE('',`ã`) from `ԣ`; -SELECT LOCATE('',`ã`) from `ԣ`; -SELECT LOCATE('',`ã`) from `ԣ`; -SELECT LOCATE('',`ã`) from `ԣ`; -SELECT LOCATE('',`ã`) from `ԣ`; -SELECT LOCATE('',`ã`) from `ԣ`; -SELECT LOCATE('',`ã`) from `ԣ`; -SELECT LOCATE('',`ã`) from `ԣ`; -SELECT LOCATE('',`ã`) from `ԣ`; -SELECT LOCATE('',`ã`) from `ԣ`; - - DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -138,6 +111,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/t/jp_locate_utf8.test b/mysql-test/suite/jp/t/jp_locate_utf8.test index cbf6714e322..6e965eaffa9 100644 --- a/mysql-test/suite/jp/t/jp_locate_utf8.test +++ b/mysql-test/suite/jp/t/jp_locate_utf8.test @@ -1,3 +1,5 @@ +--source include/have_utf8.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `Ｔ１`; drop table if exists `Ｔ２`; @@ -8,7 +10,6 @@ drop table if exists `Ｔ６`; drop table if exists `Ｔ７`; drop table if exists `Ｔ８`; drop table if exists `Ｔ９`; -drop table if exists `Ｔ１０`; --enable_warnings # @@ -24,12 +25,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 ('あいうえお'); @@ -40,9 +38,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡'); INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'); INSERT INTO `Ｔ８` VALUES ('あいうえお'); INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡'); -INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'); -INSERT INTO `Ｔ１１` VALUES ('あいうえお'); -INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡'); #InnoDB SELECT LOCATE('ｱ',`Ｃ１`) from `Ｔ１`; @@ -85,7 +80,7 @@ SELECT LOCATE('龡',`Ｃ１`) from `Ｔ６`; SELECT LOCATE('丂',`Ｃ１`) from `Ｔ６`; -#HEAP +#MEMORY SELECT LOCATE('ｱ',`Ｃ１`) from `Ｔ７`; SELECT LOCATE('ｲ',`Ｃ１`) from `Ｔ７`; SELECT LOCATE('ｳ',`Ｃ１`) from `Ｔ７`; @@ -106,27 +101,6 @@ SELECT LOCATE('龡',`Ｃ１`) from `Ｔ９`; SELECT LOCATE('丂',`Ｃ１`) from `Ｔ９`; -#BDB -SELECT LOCATE('ｱ',`Ｃ１`) from `Ｔ１０`; -SELECT LOCATE('ｲ',`Ｃ１`) from `Ｔ１０`; -SELECT LOCATE('ｳ',`Ｃ１`) from `Ｔ１０`; -SELECT LOCATE('ｴ',`Ｃ１`) from `Ｔ１０`; -SELECT LOCATE('ｵ',`Ｃ１`) from `Ｔ１０`; -SELECT LOCATE('ﾝ',`Ｃ１`) from `Ｔ１０`; -SELECT LOCATE('あ',`Ｃ１`) from `Ｔ１１`; -SELECT LOCATE('い',`Ｃ１`) from `Ｔ１１`; -SELECT LOCATE('う',`Ｃ１`) from `Ｔ１１`; -SELECT LOCATE('え',`Ｃ１`) from `Ｔ１１`; -SELECT LOCATE('お',`Ｃ１`) from `Ｔ１１`; -SELECT LOCATE('ん',`Ｃ１`) from `Ｔ１１`; -SELECT LOCATE('龔',`Ｃ１`) from `Ｔ１２`; -SELECT LOCATE('龖',`Ｃ１`) from `Ｔ１２`; -SELECT LOCATE('龗',`Ｃ１`) from `Ｔ１２`; -SELECT LOCATE('龞',`Ｃ１`) from `Ｔ１２`; -SELECT LOCATE('龡',`Ｃ１`) from `Ｔ１２`; -SELECT LOCATE('丂',`Ｃ１`) from `Ｔ１２`; - - DROP TABLE `Ｔ１`; DROP TABLE `Ｔ２`; DROP TABLE `Ｔ３`; @@ -136,6 +110,3 @@ DROP TABLE `Ｔ６`; DROP TABLE `Ｔ７`; DROP TABLE `Ｔ８`; DROP TABLE `Ｔ９`; -DROP TABLE `Ｔ１０`; -DROP TABLE `Ｔ１１`; -DROP TABLE `Ｔ１２`; diff --git a/mysql-test/suite/jp/t/jp_lpad_sjis.test b/mysql-test/suite/jp/t/jp_lpad_sjis.test index 7038112cbc8..1516acc14d2 100644 --- a/mysql-test/suite/jp/t/jp_lpad_sjis.test +++ b/mysql-test/suite/jp/t/jp_lpad_sjis.test @@ -1,3 +1,5 @@ +--source include/have_sjis.inc +--source include/have_innodb.inc --character_set sjis --disable_warnings drop table if exists `sP`; @@ -9,9 +11,6 @@ drop table if exists `sU`; 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`; --enable_warnings # @@ -27,12 +26,9 @@ CREATE TABLE `sR` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engin CREATE TABLE `sS` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sT` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sU` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; -CREATE TABLE `sV` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sW` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sX` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPO` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPP` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPQ` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; +CREATE TABLE `sV` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sW` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sX` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; INSERT INTO `sP` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `sQ` VALUES (''),(''),(''),(''),(''),(''); @@ -43,9 +39,6 @@ INSERT INTO `sU` VALUES ('\\\\\'),('\\\\'),('\\\'),('\\'),('\') INSERT INTO `sV` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `sW` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `sX` VALUES ('\\\\\'),('\\\\'),('\\\'),('\\'),('\'),(''); -INSERT INTO `sPO` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `sPP` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `sPQ` VALUES ('\\\\\'),('\\\\'),('\\\'),('\\'),('\'),(''); #InnoDB SELECT `bP`, LPAD(`bP`,5,'') FROM `sP`; @@ -57,16 +50,11 @@ SELECT `bP`, LPAD(`bP`,5,'') FROM `sS`; SELECT `bP`, LPAD(`bP`,5,'w') FROM `sT`; SELECT `bP`, LPAD(`bP`,5,'\' ) FROM `sU`; -#HEAP +#MEMORY SELECT `bP`, LPAD(`bP`,5,'') FROM `sV`; SELECT `bP`, LPAD(`bP`,5,'w') FROM `sW`; SELECT `bP`, LPAD(`bP`,5,'\' ) FROM `sX`; -#BDB -SELECT `bP`, LPAD(`bP`,5,'') FROM `sPO`; -SELECT `bP`, LPAD(`bP`,5,'w') FROM `sPP`; -SELECT `bP`, LPAD(`bP`,5,'\' ) FROM `sPQ`; - DROP TABLE `sP`; DROP TABLE `sQ`; DROP TABLE `sR`; @@ -76,6 +64,3 @@ DROP TABLE `sU`; DROP TABLE `sV`; DROP TABLE `sW`; DROP TABLE `sX`; -DROP TABLE `sPO`; -DROP TABLE `sPP`; -DROP TABLE `sPQ`; diff --git a/mysql-test/suite/jp/t/jp_lpad_ucs2.test b/mysql-test/suite/jp/t/jp_lpad_ucs2.test index e3bead0855a..3f8e9fd9eb6 100644 --- a/mysql-test/suite/jp/t/jp_lpad_ucs2.test +++ b/mysql-test/suite/jp/t/jp_lpad_ucs2.test @@ -1,4 +1,5 @@ --source include/have_ucs2.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `ԣ`; @@ -10,9 +11,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 `ԣ`; --enable_warnings # @@ -29,12 +27,9 @@ CREATE TABLE `ԣ` (`ã` char(5), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engin 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 (''),(''),(''),(''),(''),(''); @@ -45,9 +40,6 @@ INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(' INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(''),(''),(''); #InnoDB SELECT `ã`, LPAD(`ã`,5,'') FROM `ԣ`; @@ -59,16 +51,11 @@ SELECT `ã`, LPAD(`ã`,5,'') FROM `ԣ`; SELECT `ã`, LPAD(`ã`,5,'') FROM `ԣ`; SELECT `ã`, LPAD(`ã`,5,'' ) FROM `ԣ`; -#HEAP +#MEMORY SELECT `ã`, LPAD(`ã`,5,'') FROM `ԣ`; SELECT `ã`, LPAD(`ã`,5,'') FROM `ԣ`; SELECT `ã`, LPAD(`ã`,5,'' ) FROM `ԣ`; -#BDB -SELECT `ã`, LPAD(`ã`,5,'') FROM `ԣ`; -SELECT `ã`, LPAD(`ã`,5,'') FROM `ԣ`; -SELECT `ã`, LPAD(`ã`,5,'' ) FROM `ԣ`; - DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -78,6 +65,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/t/jp_lpad_ujis.test b/mysql-test/suite/jp/t/jp_lpad_ujis.test index eea4877ec3a..9d4ef185b47 100644 --- a/mysql-test/suite/jp/t/jp_lpad_ujis.test +++ b/mysql-test/suite/jp/t/jp_lpad_ujis.test @@ -1,4 +1,5 @@ --source include/have_ujis.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `ԣ`; @@ -10,9 +11,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 `ԣ`; --enable_warnings # @@ -28,12 +26,9 @@ CREATE TABLE `ԣ` (`ã` char(5), INDEX(`ã`)) DEFAULT CHARSET = ujis engin 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 (''),(''),(''),(''),(''),(''); @@ -44,9 +39,6 @@ INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(' INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(''),(''),(''); #InnoDB SELECT `ã`, LPAD(`ã`,5,'') FROM `ԣ`; @@ -58,16 +50,11 @@ SELECT `ã`, LPAD(`ã`,5,'') FROM `ԣ`; SELECT `ã`, LPAD(`ã`,5,'') FROM `ԣ`; SELECT `ã`, LPAD(`ã`,5,'' ) FROM `ԣ`; -#HEAP +#MEMORY SELECT `ã`, LPAD(`ã`,5,'') FROM `ԣ`; SELECT `ã`, LPAD(`ã`,5,'') FROM `ԣ`; SELECT `ã`, LPAD(`ã`,5,'' ) FROM `ԣ`; -#BDB -SELECT `ã`, LPAD(`ã`,5,'') FROM `ԣ`; -SELECT `ã`, LPAD(`ã`,5,'') FROM `ԣ`; -SELECT `ã`, LPAD(`ã`,5,'' ) FROM `ԣ`; - DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -77,6 +64,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/t/jp_lpad_utf8.test b/mysql-test/suite/jp/t/jp_lpad_utf8.test index 599bf5eba28..b629751d184 100644 --- a/mysql-test/suite/jp/t/jp_lpad_utf8.test +++ b/mysql-test/suite/jp/t/jp_lpad_utf8.test @@ -1,3 +1,5 @@ +--source include/have_utf8.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `Ｔ１`; drop table if exists `Ｔ２`; @@ -8,9 +10,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 `Ｔ１２`; --enable_warnings # @@ -26,12 +25,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 ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),(''); @@ -42,9 +38,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),( INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),(''); INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),(''); INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),(''); -INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),(''); -INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),(''); -INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),(''); #InnoDB SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'｡') FROM `Ｔ１`; @@ -56,16 +49,11 @@ SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'｡') FROM `Ｔ４`; SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'Ｘ') FROM `Ｔ５`; SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'丄' ) FROM `Ｔ６`; -#HEAP +#MEMORY SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'｡') FROM `Ｔ７`; SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'Ｘ') FROM `Ｔ８`; SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'丄' ) FROM `Ｔ９`; -#BDB -SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'｡') FROM `Ｔ１０`; -SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'Ｘ') FROM `Ｔ１１`; -SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'丄' ) FROM `Ｔ１２`; - DROP TABLE `Ｔ１`; DROP TABLE `Ｔ２`; DROP TABLE `Ｔ３`; @@ -75,6 +63,3 @@ DROP TABLE `Ｔ６`; DROP TABLE `Ｔ７`; DROP TABLE `Ｔ８`; DROP TABLE `Ｔ９`; -DROP TABLE `Ｔ１０`; -DROP TABLE `Ｔ１１`; -DROP TABLE `Ｔ１２`; diff --git a/mysql-test/suite/jp/t/jp_ltrim_sjis.test b/mysql-test/suite/jp/t/jp_ltrim_sjis.test index 864238df07c..4a02fcdc0bd 100644 --- a/mysql-test/suite/jp/t/jp_ltrim_sjis.test +++ b/mysql-test/suite/jp/t/jp_ltrim_sjis.test @@ -1,3 +1,5 @@ +--source include/have_sjis.inc +--source include/have_innodb.inc --character_set sjis --disable_warnings drop table if exists `sP`; @@ -9,7 +11,6 @@ drop table if exists `sU`; drop table if exists `sV`; drop table if exists `sW`; drop table if exists `sX`; -drop table if exists `sPO`; --enable_warnings # @@ -25,12 +26,9 @@ CREATE TABLE `sR` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engin CREATE TABLE `sS` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sT` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sU` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; -CREATE TABLE `sV` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sW` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sX` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPO` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPP` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPQ` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; +CREATE TABLE `sV` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sW` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sX` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; INSERT INTO `sP` VALUES (''); INSERT INTO `sP` VALUES (' '); @@ -104,30 +102,6 @@ INSERT INTO `sX` VALUES (' \\\\\'); INSERT INTO `sX` VALUES ('@\\\\\'); INSERT INTO `sX` VALUES ('@@\\\\\'); INSERT INTO `sX` VALUES ('@@@\\\\\'); -INSERT INTO `sPO` VALUES (''); -INSERT INTO `sPO` VALUES (' '); -INSERT INTO `sPO` VALUES (' '); -INSERT INTO `sPO` VALUES (' '); -# Double byte spaces are not supposed to be trimed -INSERT INTO `sPO` VALUES ('@'); -INSERT INTO `sPO` VALUES ('@@'); -INSERT INTO `sPO` VALUES ('@@@'); -INSERT INTO `sPP` VALUES (''); -INSERT INTO `sPP` VALUES (' '); -INSERT INTO `sPP` VALUES (' '); -INSERT INTO `sPP` VALUES (' '); -# Double byte spaces are not supposed to be trimed -INSERT INTO `sPP` VALUES ('@'); -INSERT INTO `sPP` VALUES ('@@'); -INSERT INTO `sPP` VALUES ('@@@'); -INSERT INTO `sPQ` VALUES ('\\\\\'); -INSERT INTO `sPQ` VALUES (' \\\\\'); -INSERT INTO `sPQ` VALUES (' \\\\\'); -INSERT INTO `sPQ` VALUES (' \\\\\'); -# Double byte spaces are not supposed to be trimed -INSERT INTO `sPQ` VALUES ('@\\\\\'); -INSERT INTO `sPQ` VALUES ('@@\\\\\'); -INSERT INTO `sPQ` VALUES ('@@@\\\\\'); #InnoDB SELECT LTRIM(`bP`) from `sP`; @@ -139,16 +113,11 @@ SELECT LTRIM(`bP`) from `sS`; SELECT LTRIM(`bP`) from `sT`; SELECT LTRIM(`bP`) from `sU`; -#HEAP +#MEMORY SELECT LTRIM(`bP`) from `sV`; SELECT LTRIM(`bP`) from `sW`; SELECT LTRIM(`bP`) from `sX`; -#BDB -SELECT LTRIM(`bP`) from `sPO`; -SELECT LTRIM(`bP`) from `sPP`; -SELECT LTRIM(`bP`) from `sPQ`; - DROP TABLE `sP`; DROP TABLE `sQ`; DROP TABLE `sR`; @@ -158,6 +127,3 @@ DROP TABLE `sU`; DROP TABLE `sV`; DROP TABLE `sW`; DROP TABLE `sX`; -DROP TABLE `sPO`; -DROP TABLE `sPP`; -DROP TABLE `sPQ`; diff --git a/mysql-test/suite/jp/t/jp_ltrim_ucs2.test b/mysql-test/suite/jp/t/jp_ltrim_ucs2.test index 0ae647f5222..65ea8d01610 100644 --- a/mysql-test/suite/jp/t/jp_ltrim_ucs2.test +++ b/mysql-test/suite/jp/t/jp_ltrim_ucs2.test @@ -1,4 +1,5 @@ --source include/have_ucs2.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `ԣ`; @@ -10,7 +11,6 @@ drop table if exists `ԣ`; drop table if exists `ԣ`; drop table if exists `ԣ`; drop table if exists `ԣ`; -drop table if exists `ԣ`; --enable_warnings # @@ -27,12 +27,9 @@ CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engin CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = myisam; CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = myisam; CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = myisam; -CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = bdb; -CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = bdb; -CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = bdb; +CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = MEMORY; INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES (' '); @@ -106,30 +103,6 @@ INSERT INTO `ԣ` VALUES (' ݏޏߏ'); INSERT INTO `ԣ` VALUES ('ݏޏߏ'); INSERT INTO `ԣ` VALUES ('ݏޏߏ'); INSERT INTO `ԣ` VALUES ('ݏޏߏ'); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES (' '); -INSERT INTO `ԣ` VALUES (' '); -INSERT INTO `ԣ` VALUES (' '); -# Double byte spaces are not supposed to be trimed -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES (' '); -INSERT INTO `ԣ` VALUES (' '); -INSERT INTO `ԣ` VALUES (' '); -# Double byte spaces are not supposed to be trimed -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'); -INSERT INTO `ԣ` VALUES (' ݏޏߏ'); -INSERT INTO `ԣ` VALUES (' ݏޏߏ'); -INSERT INTO `ԣ` VALUES (' ݏޏߏ'); -# Double byte spaces are not supposed to be trimed -INSERT INTO `ԣ` VALUES ('ݏޏߏ'); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'); #InnoDB SELECT LTRIM(`ã`) from `ԣ`; @@ -141,16 +114,11 @@ SELECT LTRIM(`ã`) from `ԣ`; SELECT LTRIM(`ã`) from `ԣ`; SELECT LTRIM(`ã`) from `ԣ`; -#HEAP +#MEMORY SELECT LTRIM(`ã`) from `ԣ`; SELECT LTRIM(`ã`) from `ԣ`; SELECT LTRIM(`ã`) from `ԣ`; -#BDB -SELECT LTRIM(`ã`) from `ԣ`; -SELECT LTRIM(`ã`) from `ԣ`; -SELECT LTRIM(`ã`) from `ԣ`; - DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -160,6 +128,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/t/jp_ltrim_ujis.test b/mysql-test/suite/jp/t/jp_ltrim_ujis.test index 64363aa330b..9c5487a3c62 100644 --- a/mysql-test/suite/jp/t/jp_ltrim_ujis.test +++ b/mysql-test/suite/jp/t/jp_ltrim_ujis.test @@ -1,4 +1,5 @@ --source include/have_ujis.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `ԣ`; @@ -10,7 +11,6 @@ drop table if exists `ԣ`; drop table if exists `ԣ`; drop table if exists `ԣ`; drop table if exists `ԣ`; -drop table if exists `ԣ`; --enable_warnings # @@ -26,12 +26,9 @@ CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engin CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = myisam; CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = myisam; CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = myisam; -CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = bdb; -CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = bdb; -CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = bdb; +CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = MEMORY; INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES (' '); @@ -105,30 +102,6 @@ INSERT INTO `ԣ` VALUES (' ݏޏߏ'); INSERT INTO `ԣ` VALUES ('ݏޏߏ'); INSERT INTO `ԣ` VALUES ('ݏޏߏ'); INSERT INTO `ԣ` VALUES ('ݏޏߏ'); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES (' '); -INSERT INTO `ԣ` VALUES (' '); -INSERT INTO `ԣ` VALUES (' '); -# Double byte spaces are not supposed to be trimed -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES (' '); -INSERT INTO `ԣ` VALUES (' '); -INSERT INTO `ԣ` VALUES (' '); -# Double byte spaces are not supposed to be trimed -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'); -INSERT INTO `ԣ` VALUES (' ݏޏߏ'); -INSERT INTO `ԣ` VALUES (' ݏޏߏ'); -INSERT INTO `ԣ` VALUES (' ݏޏߏ'); -# Double byte spaces are not supposed to be trimed -INSERT INTO `ԣ` VALUES ('ݏޏߏ'); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'); #InnoDB SELECT LTRIM(`ã`) from `ԣ`; @@ -140,16 +113,11 @@ SELECT LTRIM(`ã`) from `ԣ`; SELECT LTRIM(`ã`) from `ԣ`; SELECT LTRIM(`ã`) from `ԣ`; -#HEAP +#MEMORY SELECT LTRIM(`ã`) from `ԣ`; SELECT LTRIM(`ã`) from `ԣ`; SELECT LTRIM(`ã`) from `ԣ`; -#BDB -SELECT LTRIM(`ã`) from `ԣ`; -SELECT LTRIM(`ã`) from `ԣ`; -SELECT LTRIM(`ã`) from `ԣ`; - DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -159,6 +127,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/t/jp_ltrim_utf8.test b/mysql-test/suite/jp/t/jp_ltrim_utf8.test index 846ce11163b..3fcd5cbdc66 100644 --- a/mysql-test/suite/jp/t/jp_ltrim_utf8.test +++ b/mysql-test/suite/jp/t/jp_ltrim_utf8.test @@ -1,3 +1,5 @@ +--source include/have_utf8.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `Ｔ１`; drop table if exists `Ｔ２`; @@ -8,7 +10,6 @@ drop table if exists `Ｔ６`; drop table if exists `Ｔ７`; drop table if exists `Ｔ８`; drop table if exists `Ｔ９`; -drop table if exists `Ｔ１０`; --enable_warnings # @@ -24,12 +25,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 CREATE TABLE `Ｔ４` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam; CREATE TABLE `Ｔ５` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam; CREATE TABLE `Ｔ６` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam; -CREATE TABLE `Ｔ７` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ８` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ９` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ１０` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb; -CREATE TABLE `Ｔ１１` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb; -CREATE TABLE `Ｔ１２` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb; +CREATE TABLE `Ｔ７` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ８` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ９` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY; INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'); INSERT INTO `Ｔ１` VALUES (' ｱｲｳｴｵ'); @@ -103,30 +101,6 @@ INSERT INTO `Ｔ９` VALUES (' 龔龖龗龞龡'); INSERT INTO `Ｔ９` VALUES (' 龔龖龗龞龡'); INSERT INTO `Ｔ９` VALUES (' 龔龖龗龞龡'); INSERT INTO `Ｔ９` VALUES (' 龔龖龗龞龡'); -INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'); -INSERT INTO `Ｔ１０` VALUES (' ｱｲｳｴｵ'); -INSERT INTO `Ｔ１０` VALUES (' ｱｲｳｴｵ'); -INSERT INTO `Ｔ１０` VALUES (' ｱｲｳｴｵ'); -# Double byte spaces are not supposed to be trimed -INSERT INTO `Ｔ１０` VALUES (' ｱｲｳｴｵ'); -INSERT INTO `Ｔ１０` VALUES (' ｱｲｳｴｵ'); -INSERT INTO `Ｔ１０` VALUES (' ｱｲｳｴｵ'); -INSERT INTO `Ｔ１１` VALUES ('あいうえお'); -INSERT INTO `Ｔ１１` VALUES (' あいうえお'); -INSERT INTO `Ｔ１１` VALUES (' あいうえお'); -INSERT INTO `Ｔ１１` VALUES (' あいうえお'); -# Double byte spaces are not supposed to be trimed -INSERT INTO `Ｔ１１` VALUES (' あいうえお'); -INSERT INTO `Ｔ１１` VALUES (' あいうえお'); -INSERT INTO `Ｔ１１` VALUES (' あいうえお'); -INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡'); -INSERT INTO `Ｔ１２` VALUES (' 龔龖龗龞龡'); -INSERT INTO `Ｔ１２` VALUES (' 龔龖龗龞龡'); -INSERT INTO `Ｔ１２` VALUES (' 龔龖龗龞龡'); -# Double byte spaces are not supposed to be trimed -INSERT INTO `Ｔ１２` VALUES (' 龔龖龗龞龡'); -INSERT INTO `Ｔ１２` VALUES (' 龔龖龗龞龡'); -INSERT INTO `Ｔ１２` VALUES (' 龔龖龗龞龡'); #InnoDB SELECT LTRIM(`Ｃ１`) from `Ｔ１`; @@ -138,16 +112,11 @@ SELECT LTRIM(`Ｃ１`) from `Ｔ４`; SELECT LTRIM(`Ｃ１`) from `Ｔ５`; SELECT LTRIM(`Ｃ１`) from `Ｔ６`; -#HEAP +#MEMORY SELECT LTRIM(`Ｃ１`) from `Ｔ７`; SELECT LTRIM(`Ｃ１`) from `Ｔ８`; SELECT LTRIM(`Ｃ１`) from `Ｔ９`; -#BDB -SELECT LTRIM(`Ｃ１`) from `Ｔ１０`; -SELECT LTRIM(`Ｃ１`) from `Ｔ１１`; -SELECT LTRIM(`Ｃ１`) from `Ｔ１２`; - DROP TABLE `Ｔ１`; DROP TABLE `Ｔ２`; DROP TABLE `Ｔ３`; @@ -157,6 +126,3 @@ DROP TABLE `Ｔ６`; DROP TABLE `Ｔ７`; DROP TABLE `Ｔ８`; DROP TABLE `Ｔ９`; -DROP TABLE `Ｔ１０`; -DROP TABLE `Ｔ１１`; -DROP TABLE `Ｔ１２`; diff --git a/mysql-test/suite/jp/t/jp_ps_sjis.test b/mysql-test/suite/jp/t/jp_ps_sjis.test index cc93dca2a79..123ac904e50 100644 --- a/mysql-test/suite/jp/t/jp_ps_sjis.test +++ b/mysql-test/suite/jp/t/jp_ps_sjis.test @@ -1,3 +1,6 @@ +--source include/have_sjis.inc +--source include/have_innodb.inc + --character_set sjis --disable_warnings DROP TABLE IF EXISTS t1; @@ -234,15 +237,15 @@ DROP TABLE t2; DROP TABLE t3; DROP TABLE t4; -### Test HEAP ### -CREATE TABLE t1(c1 char(3)) DEFAULT CHARSET = sjis ENGINE = HEAP; -CREATE TABLE t2(c1 char(3)) DEFAULT CHARSET = sjis ENGINE = HEAP; +### Test MEMORY ### +CREATE TABLE t1(c1 char(3)) DEFAULT CHARSET = sjis ENGINE = MEMORY; +CREATE TABLE t2(c1 char(3)) DEFAULT CHARSET = sjis ENGINE = MEMORY; CREATE TABLE t3( `` char(1), `` char(1), `\` char(1) -)DEFAULT CHARSET = sjis ENGINE = HEAP; -CREATE TABLE t4(c1 char(1)) DEFAULT CHARSET = sjis ENGINE =HEAP; +)DEFAULT CHARSET = sjis ENGINE = MEMORY; +CREATE TABLE t4(c1 char(1)) DEFAULT CHARSET = sjis ENGINE =MEMORY; INSERT INTO t1 VALUES ('xxx'); INSERT INTO t2 VALUES ('\'); @@ -343,112 +346,3 @@ DROP TABLE t1; DROP TABLE t2; DROP TABLE t3; DROP TABLE t4; - -### Test BDB ### -CREATE TABLE t1(c1 char(3)) DEFAULT CHARSET = sjis ENGINE = BDB; -CREATE TABLE t2(c1 char(3)) DEFAULT CHARSET = sjis ENGINE = BDB; -CREATE TABLE t3( - `` char(1), - `` char(1), - `\` char(1) -)DEFAULT CHARSET = sjis ENGINE = BDB; -CREATE TABLE t4(c1 char(1)) DEFAULT CHARSET = sjis ENGINE = BDB; -INSERT INTO t1 VALUES ('xxx'); -INSERT INTO t2 VALUES ('\'); -INSERT INTO t3 VALUES ('x','x','x'),('x','x','x'),('y','y','y'),('y','y','y'),('z','z','z'),('z','z','z'); -INSERT INTO t4 VALUES (''),(''),('\' ); - -# Japanese parameter for column name -PREPARE stmt1 FROM 'SELECT ? FROM t3'; -PREPARE stmt2 FROM 'SELECT * FROM t3 ORDER BY ?'; -PREPARE stmt3 FROM 'SELECT COUNT(*) FROM t3 GROUP BY ?'; -# Japanese parameter for function argument -PREPARE stmt4 FROM 'SELECT CHAR_LENGTH(?)'; -PREPARE stmt5 FROM 'SELECT CHARSET(?)'; -PREPARE stmt6 FROM 'SELECT INSERT(c1,1,1,?) FROM t1'; -PREPARE stmt7 FROM 'SELECT INSTR(c1,?) FROM t2'; -PREPARE stmt8 FROM 'SELECT LOCATE(?,c1) FROM t2'; -PREPARE stmt9 FROM 'SELECT LPAD(c1,10,?) FROM t1'; -PREPARE stmt10 FROM 'SELECT REPLACE(c1,?,\'x\') FROM t2'; -PREPARE stmt11 FROM 'SELECT REPLACE(c1,\'x\',?) FROM t1'; -PREPARE stmt12 FROM 'SELECT RPAD(c1,10,?) FROM t1'; -# Japanese parameter for UPDATE -PREPARE stmt13 FROM 'UPDATE t4 SET c1=\'x\' WHERE c1=?'; -PREPARE stmt14 FROM 'UPDATE t4 SET c1=? WHERE c1=\'x\''; - -## Test jisx0201 ## -SET @arg = ''; -EXECUTE stmt1 USING @arg; -EXECUTE stmt2 USING @arg; -EXECUTE stmt3 USING @arg; -EXECUTE stmt4 USING @arg; -EXECUTE stmt5 USING @arg; -EXECUTE stmt6 USING @arg; -EXECUTE stmt7 USING @arg; -EXECUTE stmt8 USING @arg; -EXECUTE stmt9 USING @arg; -EXECUTE stmt10 USING @arg; -EXECUTE stmt11 USING @arg; -EXECUTE stmt12 USING @arg; -EXECUTE stmt13 USING @arg; -SELECT * FROM t3; -EXECUTE stmt14 USING @arg; -SELECT * FROM t3; - -## Test jisx0208 ## -SET @arg = ''; -EXECUTE stmt1 USING @arg; -EXECUTE stmt2 USING @arg; -EXECUTE stmt3 USING @arg; -EXECUTE stmt4 USING @arg; -EXECUTE stmt5 USING @arg; -EXECUTE stmt6 USING @arg; -EXECUTE stmt7 USING @arg; -EXECUTE stmt8 USING @arg; -EXECUTE stmt9 USING @arg; -EXECUTE stmt10 USING @arg; -EXECUTE stmt11 USING @arg; -EXECUTE stmt12 USING @arg; -EXECUTE stmt13 USING @arg; -SELECT * FROM t4; -EXECUTE stmt14 USING @arg; -SELECT * FROM t4; - -##Test jisx0212 ## -SET @arg = '\'; -EXECUTE stmt1 USING @arg; -EXECUTE stmt2 USING @arg; -EXECUTE stmt3 USING @arg; -EXECUTE stmt4 USING @arg; -EXECUTE stmt5 USING @arg; -EXECUTE stmt6 USING @arg; -EXECUTE stmt7 USING @arg; -EXECUTE stmt8 USING @arg; -EXECUTE stmt9 USING @arg; -EXECUTE stmt10 USING @arg; -EXECUTE stmt11 USING @arg; -EXECUTE stmt12 USING @arg; -EXECUTE stmt13 USING @arg; -SELECT * FROM t4; -EXECUTE stmt14 USING @arg; -SELECT * FROM t4; - -DEALLOCATE PREPARE stmt1; -DEALLOCATE PREPARE stmt2; -DEALLOCATE PREPARE stmt3; -DEALLOCATE PREPARE stmt4; -DEALLOCATE PREPARE stmt5; -DEALLOCATE PREPARE stmt6; -DEALLOCATE PREPARE stmt7; -DEALLOCATE PREPARE stmt8; -DEALLOCATE PREPARE stmt9; -DEALLOCATE PREPARE stmt10; -DEALLOCATE PREPARE stmt11; -DEALLOCATE PREPARE stmt12; -DEALLOCATE PREPARE stmt13; -DEALLOCATE PREPARE stmt14; - -DROP TABLE t1; -DROP TABLE t2; -DROP TABLE t3; -DROP TABLE t4; diff --git a/mysql-test/suite/jp/t/jp_ps_ujis.test b/mysql-test/suite/jp/t/jp_ps_ujis.test index 7d61c12e496..78b86ad57b6 100644 --- a/mysql-test/suite/jp/t/jp_ps_ujis.test +++ b/mysql-test/suite/jp/t/jp_ps_ujis.test @@ -1,4 +1,5 @@ --source include/have_ujis.inc +--source include/have_innodb.inc --disable_warnings DROP TABLE IF EXISTS t1; @@ -235,15 +236,15 @@ DROP TABLE t2; DROP TABLE t3; DROP TABLE t4; -### Test HEAP ### -CREATE TABLE t1(c1 char(3)) DEFAULT CHARSET = ujis ENGINE = HEAP; -CREATE TABLE t2(c1 char(3)) DEFAULT CHARSET = ujis ENGINE = HEAP; +### Test MEMORY ### +CREATE TABLE t1(c1 char(3)) DEFAULT CHARSET = ujis ENGINE = MEMORY; +CREATE TABLE t2(c1 char(3)) DEFAULT CHARSET = ujis ENGINE = MEMORY; CREATE TABLE t3( `` char(1), `` char(1), `` char(1) -)DEFAULT CHARSET = ujis ENGINE = HEAP; -CREATE TABLE t4(c1 char(1)) DEFAULT CHARSET = ujis ENGINE =HEAP; +)DEFAULT CHARSET = ujis ENGINE = MEMORY; +CREATE TABLE t4(c1 char(1)) DEFAULT CHARSET = ujis ENGINE =MEMORY; INSERT INTO t1 VALUES ('xxx'); INSERT INTO t2 VALUES (''); @@ -344,112 +345,3 @@ DROP TABLE t1; DROP TABLE t2; DROP TABLE t3; DROP TABLE t4; - -### Test BDB ### -CREATE TABLE t1(c1 char(3)) DEFAULT CHARSET = ujis ENGINE = BDB; -CREATE TABLE t2(c1 char(3)) DEFAULT CHARSET = ujis ENGINE = BDB; -CREATE TABLE t3( - `` char(1), - `` char(1), - `` char(1) -)DEFAULT CHARSET = ujis ENGINE = BDB; -CREATE TABLE t4(c1 char(1)) DEFAULT CHARSET = ujis ENGINE = BDB; -INSERT INTO t1 VALUES ('xxx'); -INSERT INTO t2 VALUES (''); -INSERT INTO t3 VALUES ('x','x','x'),('x','x','x'),('y','y','y'),('y','y','y'),('z','z','z'),('z','z','z'); -INSERT INTO t4 VALUES (''),(''),('' ); - -# Japanese parameter for column name -PREPARE stmt1 FROM 'SELECT ? FROM t3'; -PREPARE stmt2 FROM 'SELECT * FROM t3 ORDER BY ?'; -PREPARE stmt3 FROM 'SELECT COUNT(*) FROM t3 GROUP BY ?'; -# Japanese parameter for function argument -PREPARE stmt4 FROM 'SELECT CHAR_LENGTH(?)'; -PREPARE stmt5 FROM 'SELECT CHARSET(?)'; -PREPARE stmt6 FROM 'SELECT INSERT(c1,1,1,?) FROM t1'; -PREPARE stmt7 FROM 'SELECT INSTR(c1,?) FROM t2'; -PREPARE stmt8 FROM 'SELECT LOCATE(?,c1) FROM t2'; -PREPARE stmt9 FROM 'SELECT LPAD(c1,9,?) FROM t1'; -PREPARE stmt10 FROM 'SELECT REPLACE(c1,?,\'x\') FROM t2'; -PREPARE stmt11 FROM 'SELECT REPLACE(c1,\'x\',?) FROM t1'; -PREPARE stmt12 FROM 'SELECT RPAD(c1,9,?) FROM t1'; -# Japanese parameter for UPDATE -PREPARE stmt13 FROM 'UPDATE t4 SET c1=\'x\' WHERE c1=?'; -PREPARE stmt14 FROM 'UPDATE t4 SET c1=? WHERE c1=\'x\''; - -## Test jisx0201 ## -SET @arg = ''; -EXECUTE stmt1 USING @arg; -EXECUTE stmt2 USING @arg; -EXECUTE stmt3 USING @arg; -EXECUTE stmt4 USING @arg; -EXECUTE stmt5 USING @arg; -EXECUTE stmt6 USING @arg; -EXECUTE stmt7 USING @arg; -EXECUTE stmt8 USING @arg; -EXECUTE stmt9 USING @arg; -EXECUTE stmt10 USING @arg; -EXECUTE stmt11 USING @arg; -EXECUTE stmt12 USING @arg; -EXECUTE stmt13 USING @arg; -SELECT * FROM t3; -EXECUTE stmt14 USING @arg; -SELECT * FROM t3; - -## Test jisx0208 ## -SET @arg = ''; -EXECUTE stmt1 USING @arg; -EXECUTE stmt2 USING @arg; -EXECUTE stmt3 USING @arg; -EXECUTE stmt4 USING @arg; -EXECUTE stmt5 USING @arg; -EXECUTE stmt6 USING @arg; -EXECUTE stmt7 USING @arg; -EXECUTE stmt8 USING @arg; -EXECUTE stmt9 USING @arg; -EXECUTE stmt10 USING @arg; -EXECUTE stmt11 USING @arg; -EXECUTE stmt12 USING @arg; -EXECUTE stmt13 USING @arg; -SELECT * FROM t4; -EXECUTE stmt14 USING @arg; -SELECT * FROM t4; - -##Test jisx0212 ## -SET @arg = ''; -EXECUTE stmt1 USING @arg; -EXECUTE stmt2 USING @arg; -EXECUTE stmt3 USING @arg; -EXECUTE stmt4 USING @arg; -EXECUTE stmt5 USING @arg; -EXECUTE stmt6 USING @arg; -EXECUTE stmt7 USING @arg; -EXECUTE stmt8 USING @arg; -EXECUTE stmt9 USING @arg; -EXECUTE stmt10 USING @arg; -EXECUTE stmt11 USING @arg; -EXECUTE stmt12 USING @arg; -EXECUTE stmt13 USING @arg; -SELECT * FROM t4; -EXECUTE stmt14 USING @arg; -SELECT * FROM t4; - -DEALLOCATE PREPARE stmt1; -DEALLOCATE PREPARE stmt2; -DEALLOCATE PREPARE stmt3; -DEALLOCATE PREPARE stmt4; -DEALLOCATE PREPARE stmt5; -DEALLOCATE PREPARE stmt6; -DEALLOCATE PREPARE stmt7; -DEALLOCATE PREPARE stmt8; -DEALLOCATE PREPARE stmt9; -DEALLOCATE PREPARE stmt10; -DEALLOCATE PREPARE stmt11; -DEALLOCATE PREPARE stmt12; -DEALLOCATE PREPARE stmt13; -DEALLOCATE PREPARE stmt14; - -DROP TABLE t1; -DROP TABLE t2; -DROP TABLE t3; -DROP TABLE t4; diff --git a/mysql-test/suite/jp/t/jp_replace_sjis.test b/mysql-test/suite/jp/t/jp_replace_sjis.test index 811d3350a34..ab29b87545d 100644 --- a/mysql-test/suite/jp/t/jp_replace_sjis.test +++ b/mysql-test/suite/jp/t/jp_replace_sjis.test @@ -1,3 +1,5 @@ +--source include/have_sjis.inc +--source include/have_innodb.inc --character_set sjis --disable_warnings drop table if exists `sP`; @@ -9,9 +11,6 @@ drop table if exists `sU`; 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`; --enable_warnings # @@ -27,12 +26,9 @@ CREATE TABLE `sR` (`bP` char(5)) DEFAULT CHARSET = sjis engine = innodb; CREATE TABLE `sS` (`bP` char(5)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sT` (`bP` char(5)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sU` (`bP` char(5)) DEFAULT CHARSET = sjis engine = myisam; -CREATE TABLE `sV` (`bP` char(5)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sW` (`bP` char(5)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sX` (`bP` char(5)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPO` (`bP` char(5)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPP` (`bP` char(5)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPQ` (`bP` char(5)) DEFAULT CHARSET = sjis engine = bdb; +CREATE TABLE `sV` (`bP` char(5)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sW` (`bP` char(5)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sX` (`bP` char(5)) DEFAULT CHARSET = sjis engine = MEMORY; INSERT INTO `sP` VALUES (''); INSERT INTO `sQ` VALUES (''); @@ -43,9 +39,6 @@ INSERT INTO `sU` VALUES ('\\\\\'); INSERT INTO `sV` VALUES (''); INSERT INTO `sW` VALUES (''); INSERT INTO `sX` VALUES ('\\\\\'); -INSERT INTO `sPO` VALUES (''); -INSERT INTO `sPP` VALUES (''); -INSERT INTO `sPQ` VALUES ('\\\\\'); #InnoDB SELECT REPLACE(`bP`,'','') FROM `sP`; @@ -81,7 +74,7 @@ SELECT REPLACE(`bP`,'\','\\') FROM `sU`; SELECT REPLACE(`bP`,'\','\\') FROM `sU`; SELECT REPLACE(`bP`,'\','\\') FROM `sU`; -#HEAP +#MEMORY SELECT REPLACE(`bP`,'','') FROM `sV`; SELECT REPLACE(`bP`,'','') FROM `sV`; SELECT REPLACE(`bP`,'','') FROM `sV`; @@ -98,23 +91,6 @@ SELECT REPLACE(`bP`,'\','\\') FROM `sX`; SELECT REPLACE(`bP`,'\','\\') FROM `sX`; SELECT REPLACE(`bP`,'\','\\') FROM `sX`; -#BDB -SELECT REPLACE(`bP`,'','') FROM `sPO`; -SELECT REPLACE(`bP`,'','') FROM `sPO`; -SELECT REPLACE(`bP`,'','') FROM `sPO`; -SELECT REPLACE(`bP`,'','') FROM `sPO`; -SELECT REPLACE(`bP`,'','') FROM `sPO`; -SELECT REPLACE(`bP`,'','') FROM `sPP`; -SELECT REPLACE(`bP`,'','') FROM `sPP`; -SELECT REPLACE(`bP`,'','') FROM `sPP`; -SELECT REPLACE(`bP`,'','') FROM `sPP`; -SELECT REPLACE(`bP`,'','') FROM `sPP`; -SELECT REPLACE(`bP`,'\','\\') FROM `sPQ`; -SELECT REPLACE(`bP`,'\','\\') FROM `sPQ`; -SELECT REPLACE(`bP`,'\','\\') FROM `sPQ`; -SELECT REPLACE(`bP`,'\','\\') FROM `sPQ`; -SELECT REPLACE(`bP`,'\','\\') FROM `sPQ`; - DROP TABLE `sP`; DROP TABLE `sQ`; DROP TABLE `sR`; @@ -124,6 +100,3 @@ DROP TABLE `sU`; DROP TABLE `sV`; DROP TABLE `sW`; DROP TABLE `sX`; -DROP TABLE `sPO`; -DROP TABLE `sPP`; -DROP TABLE `sPQ`; diff --git a/mysql-test/suite/jp/t/jp_replace_ucs2.test b/mysql-test/suite/jp/t/jp_replace_ucs2.test index 7739a30cd9c..fc9982ca6a7 100644 --- a/mysql-test/suite/jp/t/jp_replace_ucs2.test +++ b/mysql-test/suite/jp/t/jp_replace_ucs2.test @@ -1,4 +1,5 @@ --source include/have_ucs2.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `ԣ`; @@ -10,9 +11,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 `ԣ`; --enable_warnings # @@ -29,12 +27,9 @@ CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ucs2 engine = innodb; CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ucs2 engine = myisam; CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ucs2 engine = myisam; CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ucs2 engine = myisam; -CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ucs2 engine = bdb; -CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ucs2 engine = bdb; -CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ucs2 engine = bdb; +CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ucs2 engine = MEMORY; INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES (''); @@ -45,9 +40,6 @@ INSERT INTO `ԣ` VALUES ('ݏޏߏ'); INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES ('ݏޏߏ'); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'); #InnoDB SELECT REPLACE(`ã`,'','') FROM `ԣ`; @@ -83,7 +75,7 @@ SELECT REPLACE(`ã`,'','ޏ') FROM `ԣ`; SELECT REPLACE(`ã`,'','ߏ') FROM `ԣ`; SELECT REPLACE(`ã`,'','') FROM `ԣ`; -#HEAP +#MEMORY SELECT REPLACE(`ã`,'','') FROM `ԣ`; SELECT REPLACE(`ã`,'','') FROM `ԣ`; SELECT REPLACE(`ã`,'','') FROM `ԣ`; @@ -100,23 +92,6 @@ SELECT REPLACE(`ã`,'','ޏ') FROM `ԣ`; SELECT REPLACE(`ã`,'','ߏ') FROM `ԣ`; SELECT REPLACE(`ã`,'','') FROM `ԣ`; -#BDB -SELECT REPLACE(`ã`,'','') FROM `ԣ`; -SELECT REPLACE(`ã`,'','') FROM `ԣ`; -SELECT REPLACE(`ã`,'','') FROM `ԣ`; -SELECT REPLACE(`ã`,'','') FROM `ԣ`; -SELECT REPLACE(`ã`,'','') FROM `ԣ`; -SELECT REPLACE(`ã`,'','') FROM `ԣ`; -SELECT REPLACE(`ã`,'','') FROM `ԣ`; -SELECT REPLACE(`ã`,'','') FROM `ԣ`; -SELECT REPLACE(`ã`,'','') FROM `ԣ`; -SELECT REPLACE(`ã`,'','') FROM `ԣ`; -SELECT REPLACE(`ã`,'','') FROM `ԣ`; -SELECT REPLACE(`ã`,'','ݏ') FROM `ԣ`; -SELECT REPLACE(`ã`,'','ޏ') FROM `ԣ`; -SELECT REPLACE(`ã`,'','ߏ') FROM `ԣ`; -SELECT REPLACE(`ã`,'','') FROM `ԣ`; - DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -126,6 +101,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/t/jp_replace_ujis.test b/mysql-test/suite/jp/t/jp_replace_ujis.test index 3d8724e63d5..a830dcd9435 100644 --- a/mysql-test/suite/jp/t/jp_replace_ujis.test +++ b/mysql-test/suite/jp/t/jp_replace_ujis.test @@ -1,4 +1,5 @@ --source include/have_ujis.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `ԣ`; @@ -10,9 +11,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 `ԣ`; --enable_warnings # @@ -28,12 +26,9 @@ CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ujis engine = innodb; CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ujis engine = myisam; CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ujis engine = myisam; CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ujis engine = myisam; -CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ujis engine = bdb; -CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ujis engine = bdb; -CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ujis engine = bdb; +CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(5)) DEFAULT CHARSET = ujis engine = MEMORY; INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES (''); @@ -44,9 +39,6 @@ INSERT INTO `ԣ` VALUES ('ݏޏߏ'); INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES ('ݏޏߏ'); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'); #InnoDB SELECT REPLACE(`ã`,'','') FROM `ԣ`; @@ -82,7 +74,7 @@ SELECT REPLACE(`ã`,'','ޏ') FROM `ԣ`; SELECT REPLACE(`ã`,'','ߏ') FROM `ԣ`; SELECT REPLACE(`ã`,'','') FROM `ԣ`; -#HEAP +#MEMORY SELECT REPLACE(`ã`,'','') FROM `ԣ`; SELECT REPLACE(`ã`,'','') FROM `ԣ`; SELECT REPLACE(`ã`,'','') FROM `ԣ`; @@ -99,23 +91,6 @@ SELECT REPLACE(`ã`,'','ޏ') FROM `ԣ`; SELECT REPLACE(`ã`,'','ߏ') FROM `ԣ`; SELECT REPLACE(`ã`,'','') FROM `ԣ`; -#BDB -SELECT REPLACE(`ã`,'','') FROM `ԣ`; -SELECT REPLACE(`ã`,'','') FROM `ԣ`; -SELECT REPLACE(`ã`,'','') FROM `ԣ`; -SELECT REPLACE(`ã`,'','') FROM `ԣ`; -SELECT REPLACE(`ã`,'','') FROM `ԣ`; -SELECT REPLACE(`ã`,'','') FROM `ԣ`; -SELECT REPLACE(`ã`,'','') FROM `ԣ`; -SELECT REPLACE(`ã`,'','') FROM `ԣ`; -SELECT REPLACE(`ã`,'','') FROM `ԣ`; -SELECT REPLACE(`ã`,'','') FROM `ԣ`; -SELECT REPLACE(`ã`,'','') FROM `ԣ`; -SELECT REPLACE(`ã`,'','ݏ') FROM `ԣ`; -SELECT REPLACE(`ã`,'','ޏ') FROM `ԣ`; -SELECT REPLACE(`ã`,'','ߏ') FROM `ԣ`; -SELECT REPLACE(`ã`,'','') FROM `ԣ`; - DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -125,6 +100,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/t/jp_replace_utf8.test b/mysql-test/suite/jp/t/jp_replace_utf8.test index 1d89a43648b..fe5d3167be8 100644 --- a/mysql-test/suite/jp/t/jp_replace_utf8.test +++ b/mysql-test/suite/jp/t/jp_replace_utf8.test @@ -1,3 +1,5 @@ +--source include/have_utf8.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `Ｔ１`; drop table if exists `Ｔ２`; @@ -8,9 +10,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 `Ｔ１２`; --enable_warnings # @@ -26,12 +25,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = innodb; CREATE TABLE `Ｔ４` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = myisam; CREATE TABLE `Ｔ５` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = myisam; CREATE TABLE `Ｔ６` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = myisam; -CREATE TABLE `Ｔ７` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ８` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ９` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ１０` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = bdb; -CREATE TABLE `Ｔ１１` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = bdb; -CREATE TABLE `Ｔ１２` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = bdb; +CREATE TABLE `Ｔ７` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ８` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ９` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = MEMORY; INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'); INSERT INTO `Ｔ２` VALUES ('あいうえお'); @@ -42,9 +38,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡'); INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'); INSERT INTO `Ｔ８` VALUES ('あいうえお'); INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡'); -INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'); -INSERT INTO `Ｔ１１` VALUES ('あいうえお'); -INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡'); #InnoDB SELECT REPLACE(`Ｃ１`,'ｱ','ｱｱ') FROM `Ｔ１`; @@ -80,7 +73,7 @@ SELECT REPLACE(`Ｃ１`,'龗','龗龗') FROM `Ｔ６`; SELECT REPLACE(`Ｃ１`,'龞','龞龞') FROM `Ｔ６`; SELECT REPLACE(`Ｃ１`,'龡','龡龡') FROM `Ｔ６`; -#HEAP +#MEMORY SELECT REPLACE(`Ｃ１`,'ｱ','ｱｱ') FROM `Ｔ７`; SELECT REPLACE(`Ｃ１`,'ｲ','ｲｲ') FROM `Ｔ７`; SELECT REPLACE(`Ｃ１`,'ｳ','ｳｳ') FROM `Ｔ７`; @@ -97,23 +90,6 @@ SELECT REPLACE(`Ｃ１`,'龗','龗龗') FROM `Ｔ９`; SELECT REPLACE(`Ｃ１`,'龞','龞龞') FROM `Ｔ９`; SELECT REPLACE(`Ｃ１`,'龡','龡龡') FROM `Ｔ９`; -#BDB -SELECT REPLACE(`Ｃ１`,'ｱ','ｱｱ') FROM `Ｔ１０`; -SELECT REPLACE(`Ｃ１`,'ｲ','ｲｲ') FROM `Ｔ１０`; -SELECT REPLACE(`Ｃ１`,'ｳ','ｳｳ') FROM `Ｔ１０`; -SELECT REPLACE(`Ｃ１`,'ｴ','ｴｴ') FROM `Ｔ１０`; -SELECT REPLACE(`Ｃ１`,'ｵ','ｵｵ') FROM `Ｔ１０`; -SELECT REPLACE(`Ｃ１`,'あ','ああ') FROM `Ｔ１１`; -SELECT REPLACE(`Ｃ１`,'い','いい') FROM `Ｔ１１`; -SELECT REPLACE(`Ｃ１`,'う','うう') FROM `Ｔ１１`; -SELECT REPLACE(`Ｃ１`,'え','ええ') FROM `Ｔ１１`; -SELECT REPLACE(`Ｃ１`,'お','おお') FROM `Ｔ１１`; -SELECT REPLACE(`Ｃ１`,'龔','龔龔') FROM `Ｔ１２`; -SELECT REPLACE(`Ｃ１`,'龖','龖龖') FROM `Ｔ１２`; -SELECT REPLACE(`Ｃ１`,'龗','龗龗') FROM `Ｔ１２`; -SELECT REPLACE(`Ｃ１`,'龞','龞龞') FROM `Ｔ１２`; -SELECT REPLACE(`Ｃ１`,'龡','龡龡') FROM `Ｔ１２`; - DROP TABLE `Ｔ１`; DROP TABLE `Ｔ２`; DROP TABLE `Ｔ３`; @@ -123,6 +99,3 @@ DROP TABLE `Ｔ６`; DROP TABLE `Ｔ７`; DROP TABLE `Ｔ８`; DROP TABLE `Ｔ９`; -DROP TABLE `Ｔ１０`; -DROP TABLE `Ｔ１１`; -DROP TABLE `Ｔ１２`; diff --git a/mysql-test/suite/jp/t/jp_reverse_sjis.test b/mysql-test/suite/jp/t/jp_reverse_sjis.test index c1e2b2a17ca..2acc9bf9f59 100644 --- a/mysql-test/suite/jp/t/jp_reverse_sjis.test +++ b/mysql-test/suite/jp/t/jp_reverse_sjis.test @@ -1,3 +1,5 @@ +--source include/have_sjis.inc +--source include/have_innodb.inc --character_set sjis --disable_warnings drop table if exists `sP`; @@ -9,9 +11,6 @@ drop table if exists `sU`; 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`; --enable_warnings # @@ -27,12 +26,9 @@ CREATE TABLE `sR` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engin CREATE TABLE `sS` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sT` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sU` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; -CREATE TABLE `sV` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sW` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sX` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPO` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPP` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPQ` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; +CREATE TABLE `sV` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sW` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sX` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; INSERT INTO `sP` VALUES (''); INSERT INTO `sQ` VALUES (''); @@ -43,9 +39,6 @@ INSERT INTO `sU` VALUES ('\\\\\'); INSERT INTO `sV` VALUES (''); INSERT INTO `sW` VALUES (''); INSERT INTO `sX` VALUES ('\\\\\'); -INSERT INTO `sPO` VALUES (''); -INSERT INTO `sPP` VALUES (''); -INSERT INTO `sPQ` VALUES ('\\\\\'); #InnoDB SELECT REVERSE(`bP`) FROM `sP`; @@ -57,16 +50,11 @@ SELECT REVERSE(`bP`) FROM `sS`; SELECT REVERSE(`bP`) FROM `sT`; SELECT REVERSE(`bP`) FROM `sU`; -#HEAP +#MEMORY SELECT REVERSE(`bP`) FROM `sV`; SELECT REVERSE(`bP`) FROM `sW`; SELECT REVERSE(`bP`) FROM `sX`; -#BDB -SELECT REVERSE(`bP`) FROM `sPO`; -SELECT REVERSE(`bP`) FROM `sPP`; -SELECT REVERSE(`bP`) FROM `sPQ`; - DROP TABLE `sP`; DROP TABLE `sQ`; DROP TABLE `sR`; @@ -76,6 +64,3 @@ DROP TABLE `sU`; DROP TABLE `sV`; DROP TABLE `sW`; DROP TABLE `sX`; -DROP TABLE `sPO`; -DROP TABLE `sPP`; -DROP TABLE `sPQ`; diff --git a/mysql-test/suite/jp/t/jp_reverse_ucs2.test b/mysql-test/suite/jp/t/jp_reverse_ucs2.test index d91ec7f70e8..3bf2d49285f 100644 --- a/mysql-test/suite/jp/t/jp_reverse_ucs2.test +++ b/mysql-test/suite/jp/t/jp_reverse_ucs2.test @@ -1,4 +1,5 @@ --source include/have_ucs2.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `ԣ`; @@ -10,9 +11,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 `ԣ`; --enable_warnings # @@ -29,12 +27,9 @@ CREATE TABLE `ԣ` (`ã` char(5), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engin 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 (''); @@ -45,9 +40,6 @@ INSERT INTO `ԣ` VALUES ('ݏޏߏ'); INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES ('ݏޏߏ'); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'); #InnoDB SELECT REVERSE(`ã`) FROM `ԣ`; @@ -59,16 +51,11 @@ SELECT REVERSE(`ã`) FROM `ԣ`; SELECT REVERSE(`ã`) FROM `ԣ`; SELECT REVERSE(`ã`) FROM `ԣ`; -#HEAP +#MEMORY SELECT REVERSE(`ã`) FROM `ԣ`; SELECT REVERSE(`ã`) FROM `ԣ`; SELECT REVERSE(`ã`) FROM `ԣ`; -#BDB -SELECT REVERSE(`ã`) FROM `ԣ`; -SELECT REVERSE(`ã`) FROM `ԣ`; -SELECT REVERSE(`ã`) FROM `ԣ`; - DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -78,6 +65,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/t/jp_reverse_ujis.test b/mysql-test/suite/jp/t/jp_reverse_ujis.test index d37d363f59a..0e6ea60e9f6 100644 --- a/mysql-test/suite/jp/t/jp_reverse_ujis.test +++ b/mysql-test/suite/jp/t/jp_reverse_ujis.test @@ -1,4 +1,5 @@ --source include/have_ujis.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `ԣ`; @@ -10,9 +11,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 `ԣ`; --enable_warnings # @@ -28,12 +26,9 @@ CREATE TABLE `ԣ` (`ã` char(5), INDEX(`ã`)) DEFAULT CHARSET = ujis engin 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 (''); @@ -44,9 +39,6 @@ INSERT INTO `ԣ` VALUES ('ݏޏߏ'); INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES ('ݏޏߏ'); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'); #InnoDB SELECT REVERSE(`ã`) FROM `ԣ`; @@ -58,16 +50,11 @@ SELECT REVERSE(`ã`) FROM `ԣ`; SELECT REVERSE(`ã`) FROM `ԣ`; SELECT REVERSE(`ã`) FROM `ԣ`; -#HEAP +#MEMORY SELECT REVERSE(`ã`) FROM `ԣ`; SELECT REVERSE(`ã`) FROM `ԣ`; SELECT REVERSE(`ã`) FROM `ԣ`; -#BDB -SELECT REVERSE(`ã`) FROM `ԣ`; -SELECT REVERSE(`ã`) FROM `ԣ`; -SELECT REVERSE(`ã`) FROM `ԣ`; - DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -77,6 +64,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/t/jp_reverse_utf8.test b/mysql-test/suite/jp/t/jp_reverse_utf8.test index 4e53d4be049..ce49b571294 100644 --- a/mysql-test/suite/jp/t/jp_reverse_utf8.test +++ b/mysql-test/suite/jp/t/jp_reverse_utf8.test @@ -1,3 +1,5 @@ +--source include/have_utf8.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `Ｔ１`; drop table if exists `Ｔ２`; @@ -8,9 +10,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 `Ｔ１２`; --enable_warnings # @@ -26,12 +25,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 ('あいうえお'); @@ -42,9 +38,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡'); INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'); INSERT INTO `Ｔ８` VALUES ('あいうえお'); INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡'); -INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'); -INSERT INTO `Ｔ１１` VALUES ('あいうえお'); -INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡'); #InnoDB SELECT REVERSE(`Ｃ１`) FROM `Ｔ１`; @@ -56,16 +49,11 @@ SELECT REVERSE(`Ｃ１`) FROM `Ｔ４`; SELECT REVERSE(`Ｃ１`) FROM `Ｔ５`; SELECT REVERSE(`Ｃ１`) FROM `Ｔ６`; -#HEAP +#MEMORY SELECT REVERSE(`Ｃ１`) FROM `Ｔ７`; SELECT REVERSE(`Ｃ１`) FROM `Ｔ８`; SELECT REVERSE(`Ｃ１`) FROM `Ｔ９`; -#BDB -SELECT REVERSE(`Ｃ１`) FROM `Ｔ１０`; -SELECT REVERSE(`Ｃ１`) FROM `Ｔ１１`; -SELECT REVERSE(`Ｃ１`) FROM `Ｔ１２`; - DROP TABLE `Ｔ１`; DROP TABLE `Ｔ２`; DROP TABLE `Ｔ３`; @@ -75,6 +63,3 @@ DROP TABLE `Ｔ６`; DROP TABLE `Ｔ７`; DROP TABLE `Ｔ８`; DROP TABLE `Ｔ９`; -DROP TABLE `Ｔ１０`; -DROP TABLE `Ｔ１１`; -DROP TABLE `Ｔ１２`; diff --git a/mysql-test/suite/jp/t/jp_right_sjis.test b/mysql-test/suite/jp/t/jp_right_sjis.test index f481ec532ec..8cde42333c6 100644 --- a/mysql-test/suite/jp/t/jp_right_sjis.test +++ b/mysql-test/suite/jp/t/jp_right_sjis.test @@ -1,3 +1,5 @@ +--source include/have_sjis.inc +--source include/have_innodb.inc --character_set sjis --disable_warnings drop table if exists `sP`; @@ -9,9 +11,6 @@ drop table if exists `sU`; 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`; --enable_warnings # @@ -27,12 +26,9 @@ CREATE TABLE `sR` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engin CREATE TABLE `sS` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sT` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sU` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; -CREATE TABLE `sV` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sW` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sX` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPO` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPP` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPQ` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; +CREATE TABLE `sV` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sW` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sX` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; INSERT INTO `sP` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `sQ` VALUES (''),(''),(''),(''),(''),(''); @@ -43,9 +39,6 @@ INSERT INTO `sU` VALUES ('\\\\\'),('\\\\'),('\\\'),('\\'),('\') INSERT INTO `sV` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `sW` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `sX` VALUES ('\\\\\'),('\\\\'),('\\\'),('\\'),('\'),(''); -INSERT INTO `sPO` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `sPP` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `sPQ` VALUES ('\\\\\'),('\\\\'),('\\\'),('\\'),('\'),(''); #InnoDB SELECT `bP`, RIGHT(`bP`,0) FROM `sP`; @@ -87,7 +80,7 @@ SELECT `bP`, RIGHT(`bP`,3) FROM `sU`; SELECT `bP`, RIGHT(`bP`,4) FROM `sU`; SELECT `bP`, RIGHT(`bP`,5) FROM `sU`; -#HEAP +#MEMORY SELECT `bP`, RIGHT(`bP`,0) FROM `sV`; SELECT `bP`, RIGHT(`bP`,1) FROM `sV`; SELECT `bP`, RIGHT(`bP`,2) FROM `sV`; @@ -107,26 +100,6 @@ SELECT `bP`, RIGHT(`bP`,3) FROM `sX`; SELECT `bP`, RIGHT(`bP`,4) FROM `sX`; SELECT `bP`, RIGHT(`bP`,5) FROM `sX`; -#BDB -SELECT `bP`, RIGHT(`bP`,0) FROM `sPO`; -SELECT `bP`, RIGHT(`bP`,1) FROM `sPO`; -SELECT `bP`, RIGHT(`bP`,2) FROM `sPO`; -SELECT `bP`, RIGHT(`bP`,3) FROM `sPO`; -SELECT `bP`, RIGHT(`bP`,4) FROM `sPO`; -SELECT `bP`, RIGHT(`bP`,5) FROM `sPO`; -SELECT `bP`, RIGHT(`bP`,0) FROM `sPP`; -SELECT `bP`, RIGHT(`bP`,1) FROM `sPP`; -SELECT `bP`, RIGHT(`bP`,2) FROM `sPP`; -SELECT `bP`, RIGHT(`bP`,3) FROM `sPP`; -SELECT `bP`, RIGHT(`bP`,4) FROM `sPP`; -SELECT `bP`, RIGHT(`bP`,5) FROM `sPP`; -SELECT `bP`, RIGHT(`bP`,0) FROM `sPQ`; -SELECT `bP`, RIGHT(`bP`,1) FROM `sPQ`; -SELECT `bP`, RIGHT(`bP`,2) FROM `sPQ`; -SELECT `bP`, RIGHT(`bP`,3) FROM `sPQ`; -SELECT `bP`, RIGHT(`bP`,4) FROM `sPQ`; -SELECT `bP`, RIGHT(`bP`,5) FROM `sPQ`; - DROP TABLE `sP`; DROP TABLE `sQ`; DROP TABLE `sR`; @@ -136,6 +109,3 @@ DROP TABLE `sU`; DROP TABLE `sV`; DROP TABLE `sW`; DROP TABLE `sX`; -DROP TABLE `sPO`; -DROP TABLE `sPP`; -DROP TABLE `sPQ`; diff --git a/mysql-test/suite/jp/t/jp_right_ucs2.test b/mysql-test/suite/jp/t/jp_right_ucs2.test index 23ca2fa4fae..bb914787f81 100644 --- a/mysql-test/suite/jp/t/jp_right_ucs2.test +++ b/mysql-test/suite/jp/t/jp_right_ucs2.test @@ -1,4 +1,5 @@ --source include/have_ucs2.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `ԣ`; @@ -10,9 +11,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 `ԣ`; --enable_warnings # @@ -29,12 +27,9 @@ CREATE TABLE `ԣ` (`ã` char(5), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engin 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 (''),(''),(''),(''),(''),(''); @@ -45,9 +40,6 @@ INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(' INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(''),(''),(''); #InnoDB SELECT `ã`, RIGHT(`ã`,0) FROM `ԣ`; @@ -89,7 +81,7 @@ SELECT `ã`, RIGHT(`ã`,3) FROM `ԣ`; SELECT `ã`, RIGHT(`ã`,4) FROM `ԣ`; SELECT `ã`, RIGHT(`ã`,5) FROM `ԣ`; -#HEAP +#MEMORY SELECT `ã`, RIGHT(`ã`,0) FROM `ԣ`; SELECT `ã`, RIGHT(`ã`,1) FROM `ԣ`; SELECT `ã`, RIGHT(`ã`,2) FROM `ԣ`; @@ -109,26 +101,6 @@ SELECT `ã`, RIGHT(`ã`,3) FROM `ԣ`; SELECT `ã`, RIGHT(`ã`,4) FROM `ԣ`; SELECT `ã`, RIGHT(`ã`,5) FROM `ԣ`; -#BDB -SELECT `ã`, RIGHT(`ã`,0) FROM `ԣ`; -SELECT `ã`, RIGHT(`ã`,1) FROM `ԣ`; -SELECT `ã`, RIGHT(`ã`,2) FROM `ԣ`; -SELECT `ã`, RIGHT(`ã`,3) FROM `ԣ`; -SELECT `ã`, RIGHT(`ã`,4) FROM `ԣ`; -SELECT `ã`, RIGHT(`ã`,5) FROM `ԣ`; -SELECT `ã`, RIGHT(`ã`,0) FROM `ԣ`; -SELECT `ã`, RIGHT(`ã`,1) FROM `ԣ`; -SELECT `ã`, RIGHT(`ã`,2) FROM `ԣ`; -SELECT `ã`, RIGHT(`ã`,3) FROM `ԣ`; -SELECT `ã`, RIGHT(`ã`,4) FROM `ԣ`; -SELECT `ã`, RIGHT(`ã`,5) FROM `ԣ`; -SELECT `ã`, RIGHT(`ã`,0) FROM `ԣ`; -SELECT `ã`, RIGHT(`ã`,1) FROM `ԣ`; -SELECT `ã`, RIGHT(`ã`,2) FROM `ԣ`; -SELECT `ã`, RIGHT(`ã`,3) FROM `ԣ`; -SELECT `ã`, RIGHT(`ã`,4) FROM `ԣ`; -SELECT `ã`, RIGHT(`ã`,5) FROM `ԣ`; - DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -138,6 +110,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/t/jp_right_ujis.test b/mysql-test/suite/jp/t/jp_right_ujis.test index b5284489c7e..bb478af7b66 100644 --- a/mysql-test/suite/jp/t/jp_right_ujis.test +++ b/mysql-test/suite/jp/t/jp_right_ujis.test @@ -1,4 +1,5 @@ --source include/have_ujis.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `ԣ`; @@ -10,9 +11,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 `ԣ`; --enable_warnings # @@ -28,12 +26,9 @@ CREATE TABLE `ԣ` (`ã` char(5), INDEX(`ã`)) DEFAULT CHARSET = ujis engin 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 (''),(''),(''),(''),(''),(''); @@ -44,9 +39,6 @@ INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(' INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(''),(''),(''); #InnoDB SELECT `ã`, RIGHT(`ã`,0) FROM `ԣ`; @@ -88,7 +80,7 @@ SELECT `ã`, RIGHT(`ã`,3) FROM `ԣ`; SELECT `ã`, RIGHT(`ã`,4) FROM `ԣ`; SELECT `ã`, RIGHT(`ã`,5) FROM `ԣ`; -#HEAP +#MEMORY SELECT `ã`, RIGHT(`ã`,0) FROM `ԣ`; SELECT `ã`, RIGHT(`ã`,1) FROM `ԣ`; SELECT `ã`, RIGHT(`ã`,2) FROM `ԣ`; @@ -108,26 +100,6 @@ SELECT `ã`, RIGHT(`ã`,3) FROM `ԣ`; SELECT `ã`, RIGHT(`ã`,4) FROM `ԣ`; SELECT `ã`, RIGHT(`ã`,5) FROM `ԣ`; -#BDB -SELECT `ã`, RIGHT(`ã`,0) FROM `ԣ`; -SELECT `ã`, RIGHT(`ã`,1) FROM `ԣ`; -SELECT `ã`, RIGHT(`ã`,2) FROM `ԣ`; -SELECT `ã`, RIGHT(`ã`,3) FROM `ԣ`; -SELECT `ã`, RIGHT(`ã`,4) FROM `ԣ`; -SELECT `ã`, RIGHT(`ã`,5) FROM `ԣ`; -SELECT `ã`, RIGHT(`ã`,0) FROM `ԣ`; -SELECT `ã`, RIGHT(`ã`,1) FROM `ԣ`; -SELECT `ã`, RIGHT(`ã`,2) FROM `ԣ`; -SELECT `ã`, RIGHT(`ã`,3) FROM `ԣ`; -SELECT `ã`, RIGHT(`ã`,4) FROM `ԣ`; -SELECT `ã`, RIGHT(`ã`,5) FROM `ԣ`; -SELECT `ã`, RIGHT(`ã`,0) FROM `ԣ`; -SELECT `ã`, RIGHT(`ã`,1) FROM `ԣ`; -SELECT `ã`, RIGHT(`ã`,2) FROM `ԣ`; -SELECT `ã`, RIGHT(`ã`,3) FROM `ԣ`; -SELECT `ã`, RIGHT(`ã`,4) FROM `ԣ`; -SELECT `ã`, RIGHT(`ã`,5) FROM `ԣ`; - DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -137,6 +109,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/t/jp_right_utf8.test b/mysql-test/suite/jp/t/jp_right_utf8.test index 863755c1dcf..0f435fb54ed 100644 --- a/mysql-test/suite/jp/t/jp_right_utf8.test +++ b/mysql-test/suite/jp/t/jp_right_utf8.test @@ -1,3 +1,5 @@ +--source include/have_utf8.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `Ｔ１`; drop table if exists `Ｔ２`; @@ -8,9 +10,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 `Ｔ１２`; --enable_warnings # @@ -26,12 +25,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 ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),(''); @@ -42,9 +38,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),( INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),(''); INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),(''); INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),(''); -INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),(''); -INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),(''); -INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),(''); #InnoDB SELECT `Ｃ１`, RIGHT(`Ｃ１`,0) FROM `Ｔ１`; @@ -86,7 +79,7 @@ SELECT `Ｃ１`, RIGHT(`Ｃ１`,3) FROM `Ｔ６`; SELECT `Ｃ１`, RIGHT(`Ｃ１`,4) FROM `Ｔ６`; SELECT `Ｃ１`, RIGHT(`Ｃ１`,5) FROM `Ｔ６`; -#HEAP +#MEMORY SELECT `Ｃ１`, RIGHT(`Ｃ１`,0) FROM `Ｔ７`; SELECT `Ｃ１`, RIGHT(`Ｃ１`,1) FROM `Ｔ７`; SELECT `Ｃ１`, RIGHT(`Ｃ１`,2) FROM `Ｔ７`; @@ -106,26 +99,6 @@ SELECT `Ｃ１`, RIGHT(`Ｃ１`,3) FROM `Ｔ９`; SELECT `Ｃ１`, RIGHT(`Ｃ１`,4) FROM `Ｔ９`; SELECT `Ｃ１`, RIGHT(`Ｃ１`,5) FROM `Ｔ９`; -#BDB -SELECT `Ｃ１`, RIGHT(`Ｃ１`,0) FROM `Ｔ１０`; -SELECT `Ｃ１`, RIGHT(`Ｃ１`,1) FROM `Ｔ１０`; -SELECT `Ｃ１`, RIGHT(`Ｃ１`,2) FROM `Ｔ１０`; -SELECT `Ｃ１`, RIGHT(`Ｃ１`,3) FROM `Ｔ１０`; -SELECT `Ｃ１`, RIGHT(`Ｃ１`,4) FROM `Ｔ１０`; -SELECT `Ｃ１`, RIGHT(`Ｃ１`,5) FROM `Ｔ１０`; -SELECT `Ｃ１`, RIGHT(`Ｃ１`,0) FROM `Ｔ１１`; -SELECT `Ｃ１`, RIGHT(`Ｃ１`,1) FROM `Ｔ１１`; -SELECT `Ｃ１`, RIGHT(`Ｃ１`,2) FROM `Ｔ１１`; -SELECT `Ｃ１`, RIGHT(`Ｃ１`,3) FROM `Ｔ１１`; -SELECT `Ｃ１`, RIGHT(`Ｃ１`,4) FROM `Ｔ１１`; -SELECT `Ｃ１`, RIGHT(`Ｃ１`,5) FROM `Ｔ１１`; -SELECT `Ｃ１`, RIGHT(`Ｃ１`,0) FROM `Ｔ１２`; -SELECT `Ｃ１`, RIGHT(`Ｃ１`,1) FROM `Ｔ１２`; -SELECT `Ｃ１`, RIGHT(`Ｃ１`,2) FROM `Ｔ１２`; -SELECT `Ｃ１`, RIGHT(`Ｃ１`,3) FROM `Ｔ１２`; -SELECT `Ｃ１`, RIGHT(`Ｃ１`,4) FROM `Ｔ１２`; -SELECT `Ｃ１`, RIGHT(`Ｃ１`,5) FROM `Ｔ１２`; - DROP TABLE `Ｔ１`; DROP TABLE `Ｔ２`; DROP TABLE `Ｔ３`; @@ -135,6 +108,3 @@ DROP TABLE `Ｔ６`; DROP TABLE `Ｔ７`; DROP TABLE `Ｔ８`; DROP TABLE `Ｔ９`; -DROP TABLE `Ｔ１０`; -DROP TABLE `Ｔ１１`; -DROP TABLE `Ｔ１２`; diff --git a/mysql-test/suite/jp/t/jp_rpad_sjis.test b/mysql-test/suite/jp/t/jp_rpad_sjis.test index cc008631548..16715ee7e93 100644 --- a/mysql-test/suite/jp/t/jp_rpad_sjis.test +++ b/mysql-test/suite/jp/t/jp_rpad_sjis.test @@ -1,3 +1,5 @@ +--source include/have_sjis.inc +--source include/have_innodb.inc --character_set sjis --disable_warnings drop table if exists `sP`; @@ -9,9 +11,6 @@ drop table if exists `sU`; 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`; --enable_warnings # @@ -27,12 +26,9 @@ CREATE TABLE `sR` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engin CREATE TABLE `sS` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sT` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sU` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; -CREATE TABLE `sV` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sW` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sX` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPO` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPP` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPQ` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; +CREATE TABLE `sV` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sW` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sX` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; INSERT INTO `sP` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `sQ` VALUES (''),(''),(''),(''),(''),(''); @@ -43,9 +39,6 @@ INSERT INTO `sU` VALUES ('\\\\\'),('\\\\'),('\\\'),('\\'),('\') INSERT INTO `sV` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `sW` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `sX` VALUES ('\\\\\'),('\\\\'),('\\\'),('\\'),('\'),(''); -INSERT INTO `sPO` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `sPP` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `sPQ` VALUES ('\\\\\'),('\\\\'),('\\\'),('\\'),('\'),(''); #InnoDB SELECT `bP`, RPAD(`bP`,5,'') FROM `sP`; @@ -57,16 +50,11 @@ SELECT `bP`, RPAD(`bP`,5,'') FROM `sS`; SELECT `bP`, RPAD(`bP`,5,'w') FROM `sT`; SELECT `bP`, RPAD(`bP`,5,'\' ) FROM `sU`; -#HEAP +#MEMORY SELECT `bP`, RPAD(`bP`,5,'') FROM `sV`; SELECT `bP`, RPAD(`bP`,5,'w') FROM `sW`; SELECT `bP`, RPAD(`bP`,5,'\' ) FROM `sX`; -#BDB -SELECT `bP`, RPAD(`bP`,5,'') FROM `sPO`; -SELECT `bP`, RPAD(`bP`,5,'w') FROM `sPP`; -SELECT `bP`, RPAD(`bP`,5,'\' ) FROM `sPQ`; - DROP TABLE `sP`; DROP TABLE `sQ`; DROP TABLE `sR`; @@ -76,6 +64,3 @@ DROP TABLE `sU`; DROP TABLE `sV`; DROP TABLE `sW`; DROP TABLE `sX`; -DROP TABLE `sPO`; -DROP TABLE `sPP`; -DROP TABLE `sPQ`; diff --git a/mysql-test/suite/jp/t/jp_rpad_ucs2.test b/mysql-test/suite/jp/t/jp_rpad_ucs2.test index ca5059497d3..9f39c20e7a9 100644 --- a/mysql-test/suite/jp/t/jp_rpad_ucs2.test +++ b/mysql-test/suite/jp/t/jp_rpad_ucs2.test @@ -1,4 +1,5 @@ --source include/have_ucs2.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `ԣ`; @@ -10,9 +11,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 `ԣ`; --enable_warnings # @@ -29,12 +27,9 @@ CREATE TABLE `ԣ` (`ã` char(5), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engin 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 (''),(''),(''),(''),(''),(''); @@ -45,9 +40,6 @@ INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(' INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(''),(''),(''); #InnoDB SELECT `ã`, RPAD(`ã`,5,'') FROM `ԣ`; @@ -59,16 +51,11 @@ SELECT `ã`, RPAD(`ã`,5,'') FROM `ԣ`; SELECT `ã`, RPAD(`ã`,5,'') FROM `ԣ`; SELECT `ã`, RPAD(`ã`,5,'' ) FROM `ԣ`; -#HEAP +#MEMORY SELECT `ã`, RPAD(`ã`,5,'') FROM `ԣ`; SELECT `ã`, RPAD(`ã`,5,'') FROM `ԣ`; SELECT `ã`, RPAD(`ã`,5,'' ) FROM `ԣ`; -#BDB -SELECT `ã`, RPAD(`ã`,5,'') FROM `ԣ`; -SELECT `ã`, RPAD(`ã`,5,'') FROM `ԣ`; -SELECT `ã`, RPAD(`ã`,5,'' ) FROM `ԣ`; - DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -78,6 +65,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/t/jp_rpad_ujis.test b/mysql-test/suite/jp/t/jp_rpad_ujis.test index d7725b80af7..ad150f36587 100644 --- a/mysql-test/suite/jp/t/jp_rpad_ujis.test +++ b/mysql-test/suite/jp/t/jp_rpad_ujis.test @@ -1,4 +1,5 @@ --source include/have_ujis.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `ԣ`; @@ -10,9 +11,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 `ԣ`; --enable_warnings # @@ -28,12 +26,9 @@ CREATE TABLE `ԣ` (`ã` char(5), INDEX(`ã`)) DEFAULT CHARSET = ujis engin 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 (''),(''),(''),(''),(''),(''); @@ -44,9 +39,6 @@ INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(' INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(''),(''),(''); #InnoDB SELECT `ã`, RPAD(`ã`,5,'') FROM `ԣ`; @@ -58,16 +50,11 @@ SELECT `ã`, RPAD(`ã`,5,'') FROM `ԣ`; SELECT `ã`, RPAD(`ã`,5,'') FROM `ԣ`; SELECT `ã`, RPAD(`ã`,5,'' ) FROM `ԣ`; -#HEAP +#MEMORY SELECT `ã`, RPAD(`ã`,5,'') FROM `ԣ`; SELECT `ã`, RPAD(`ã`,5,'') FROM `ԣ`; SELECT `ã`, RPAD(`ã`,5,'' ) FROM `ԣ`; -#BDB -SELECT `ã`, RPAD(`ã`,5,'') FROM `ԣ`; -SELECT `ã`, RPAD(`ã`,5,'') FROM `ԣ`; -SELECT `ã`, RPAD(`ã`,5,'' ) FROM `ԣ`; - DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -77,6 +64,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/t/jp_rpad_utf8.test b/mysql-test/suite/jp/t/jp_rpad_utf8.test index b5a335bc6ce..329165f1abc 100644 --- a/mysql-test/suite/jp/t/jp_rpad_utf8.test +++ b/mysql-test/suite/jp/t/jp_rpad_utf8.test @@ -1,3 +1,6 @@ +--source include/have_utf8.inc +--source include/have_innodb.inc + --disable_warnings drop table if exists `Ｔ１`; drop table if exists `Ｔ２`; @@ -8,9 +11,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 `Ｔ１２`; --enable_warnings # @@ -26,12 +26,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 ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),(''); @@ -42,9 +39,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),( INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),(''); INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),(''); INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),(''); -INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),(''); -INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),(''); -INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),(''); #InnoDB SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'｡') FROM `Ｔ１`; @@ -56,16 +50,11 @@ SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'｡') FROM `Ｔ４`; SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'Ｘ') FROM `Ｔ５`; SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'丄' ) FROM `Ｔ６`; -#HEAP +#MEMORY SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'｡') FROM `Ｔ７`; SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'Ｘ') FROM `Ｔ８`; SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'丄' ) FROM `Ｔ９`; -#BDB -SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'｡') FROM `Ｔ１０`; -SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'Ｘ') FROM `Ｔ１１`; -SELECT `Ｃ１`, RPAD(`Ｃ１`,5,'丄' ) FROM `Ｔ１２`; - DROP TABLE `Ｔ１`; DROP TABLE `Ｔ２`; DROP TABLE `Ｔ３`; @@ -75,6 +64,3 @@ DROP TABLE `Ｔ６`; DROP TABLE `Ｔ７`; DROP TABLE `Ｔ８`; DROP TABLE `Ｔ９`; -DROP TABLE `Ｔ１０`; -DROP TABLE `Ｔ１１`; -DROP TABLE `Ｔ１２`; diff --git a/mysql-test/suite/jp/t/jp_rtrim_sjis.test b/mysql-test/suite/jp/t/jp_rtrim_sjis.test index c80cf9410f9..6a9ded05bec 100644 --- a/mysql-test/suite/jp/t/jp_rtrim_sjis.test +++ b/mysql-test/suite/jp/t/jp_rtrim_sjis.test @@ -1,3 +1,5 @@ +--source include/have_sjis.inc +--source include/have_innodb.inc --character_set sjis --disable_warnings drop table if exists `sP`; @@ -9,7 +11,6 @@ drop table if exists `sU`; drop table if exists `sV`; drop table if exists `sW`; drop table if exists `sX`; -drop table if exists `sPO`; --enable_warnings # @@ -25,12 +26,9 @@ CREATE TABLE `sR` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engin CREATE TABLE `sS` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sT` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sU` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; -CREATE TABLE `sV` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sW` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sX` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPO` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPP` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPQ` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; +CREATE TABLE `sV` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sW` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sX` (`bP` char(8), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; INSERT INTO `sP` VALUES (''); INSERT INTO `sP` VALUES (' '); @@ -104,30 +102,6 @@ INSERT INTO `sX` VALUES ('\\\\\ '); INSERT INTO `sX` VALUES ('\\\\\@'); INSERT INTO `sX` VALUES ('\\\\\@@'); INSERT INTO `sX` VALUES ('\\\\\@@@'); -INSERT INTO `sPO` VALUES (''); -INSERT INTO `sPO` VALUES (' '); -INSERT INTO `sPO` VALUES (' '); -INSERT INTO `sPO` VALUES (' '); -# Double byte spaces are not supposed to be trimed -INSERT INTO `sPO` VALUES ('@'); -INSERT INTO `sPO` VALUES ('@@'); -INSERT INTO `sPO` VALUES ('@@@'); -INSERT INTO `sPP` VALUES (''); -INSERT INTO `sPP` VALUES (' '); -INSERT INTO `sPP` VALUES (' '); -INSERT INTO `sPP` VALUES (' '); -# Double byte spaces are not supposed to be trimed -INSERT INTO `sPP` VALUES ('@'); -INSERT INTO `sPP` VALUES ('@@'); -INSERT INTO `sPP` VALUES ('@@@'); -INSERT INTO `sPQ` VALUES ('\\\\\'); -INSERT INTO `sPQ` VALUES ('\\\\\ '); -INSERT INTO `sPQ` VALUES ('\\\\\ '); -INSERT INTO `sPQ` VALUES ('\\\\\ '); -# Double byte spaces are not supposed to be trimed -INSERT INTO `sPQ` VALUES ('\\\\\@'); -INSERT INTO `sPQ` VALUES ('\\\\\@@'); -INSERT INTO `sPQ` VALUES ('\\\\\@@@'); #InnoDB SELECT RTRIM(`bP`) from `sP`; @@ -139,16 +113,11 @@ SELECT RTRIM(`bP`) from `sS`; SELECT RTRIM(`bP`) from `sT`; SELECT RTRIM(`bP`) from `sU`; -#HEAP +#MEMORY SELECT RTRIM(`bP`) from `sV`; SELECT RTRIM(`bP`) from `sW`; SELECT RTRIM(`bP`) from `sX`; -#BDB -SELECT RTRIM(`bP`) from `sPO`; -SELECT RTRIM(`bP`) from `sPP`; -SELECT RTRIM(`bP`) from `sPQ`; - DROP TABLE `sP`; DROP TABLE `sQ`; DROP TABLE `sR`; @@ -158,6 +127,3 @@ DROP TABLE `sU`; DROP TABLE `sV`; DROP TABLE `sW`; DROP TABLE `sX`; -DROP TABLE `sPO`; -DROP TABLE `sPP`; -DROP TABLE `sPQ`; diff --git a/mysql-test/suite/jp/t/jp_rtrim_ucs2.test b/mysql-test/suite/jp/t/jp_rtrim_ucs2.test index 0fac38d12d1..84cd1ce4b2a 100644 --- a/mysql-test/suite/jp/t/jp_rtrim_ucs2.test +++ b/mysql-test/suite/jp/t/jp_rtrim_ucs2.test @@ -1,4 +1,5 @@ --source include/have_ucs2.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `ԣ`; @@ -10,7 +11,6 @@ drop table if exists `ԣ`; drop table if exists `ԣ`; drop table if exists `ԣ`; drop table if exists `ԣ`; -drop table if exists `ԣ`; --enable_warnings # @@ -27,12 +27,9 @@ CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engin CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = myisam; CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = myisam; CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = myisam; -CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = bdb; -CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = bdb; -CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = bdb; +CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = MEMORY; INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES (' '); @@ -106,30 +103,6 @@ INSERT INTO `ԣ` VALUES ('ݏޏߏ '); INSERT INTO `ԣ` VALUES ('ݏޏߏࡡ'); INSERT INTO `ԣ` VALUES ('ݏޏߏࡡ'); INSERT INTO `ԣ` VALUES ('ݏޏߏࡡ'); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES (' '); -INSERT INTO `ԣ` VALUES (' '); -INSERT INTO `ԣ` VALUES (' '); -# Double byte spaces are not supposed to be trimed -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES (' '); -INSERT INTO `ԣ` VALUES (' '); -INSERT INTO `ԣ` VALUES (' '); -# Double byte spaces are not supposed to be trimed -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'); -INSERT INTO `ԣ` VALUES ('ݏޏߏ '); -INSERT INTO `ԣ` VALUES ('ݏޏߏ '); -INSERT INTO `ԣ` VALUES ('ݏޏߏ '); -# Double byte spaces are not supposed to be trimed -INSERT INTO `ԣ` VALUES ('ݏޏߏࡡ'); -INSERT INTO `ԣ` VALUES ('ݏޏߏࡡ'); -INSERT INTO `ԣ` VALUES ('ݏޏߏࡡ'); #InnoDB SELECT RTRIM(`ã`) from `ԣ`; @@ -141,16 +114,11 @@ SELECT RTRIM(`ã`) from `ԣ`; SELECT RTRIM(`ã`) from `ԣ`; SELECT RTRIM(`ã`) from `ԣ`; -#HEAP +#MEMORY SELECT RTRIM(`ã`) from `ԣ`; SELECT RTRIM(`ã`) from `ԣ`; SELECT RTRIM(`ã`) from `ԣ`; -#BDB -SELECT RTRIM(`ã`) from `ԣ`; -SELECT RTRIM(`ã`) from `ԣ`; -SELECT RTRIM(`ã`) from `ԣ`; - DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -160,6 +128,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/t/jp_rtrim_ujis.test b/mysql-test/suite/jp/t/jp_rtrim_ujis.test index 46cda84dd55..5037419d616 100644 --- a/mysql-test/suite/jp/t/jp_rtrim_ujis.test +++ b/mysql-test/suite/jp/t/jp_rtrim_ujis.test @@ -1,4 +1,5 @@ --source include/have_ujis.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `ԣ`; @@ -10,7 +11,6 @@ drop table if exists `ԣ`; drop table if exists `ԣ`; drop table if exists `ԣ`; drop table if exists `ԣ`; -drop table if exists `ԣ`; --enable_warnings # @@ -26,12 +26,9 @@ CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engin CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = myisam; CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = myisam; CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = myisam; -CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = bdb; -CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = bdb; -CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = bdb; +CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(8), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = MEMORY; INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES (' '); @@ -105,30 +102,6 @@ INSERT INTO `ԣ` VALUES ('ݏޏߏ '); INSERT INTO `ԣ` VALUES ('ݏޏߏࡡ'); INSERT INTO `ԣ` VALUES ('ݏޏߏࡡ'); INSERT INTO `ԣ` VALUES ('ݏޏߏࡡ'); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES (' '); -INSERT INTO `ԣ` VALUES (' '); -INSERT INTO `ԣ` VALUES (' '); -# Double byte spaces are not supposed to be trimed -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES (' '); -INSERT INTO `ԣ` VALUES (' '); -INSERT INTO `ԣ` VALUES (' '); -# Double byte spaces are not supposed to be trimed -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'); -INSERT INTO `ԣ` VALUES ('ݏޏߏ '); -INSERT INTO `ԣ` VALUES ('ݏޏߏ '); -INSERT INTO `ԣ` VALUES ('ݏޏߏ '); -# Double byte spaces are not supposed to be trimed -INSERT INTO `ԣ` VALUES ('ݏޏߏࡡ'); -INSERT INTO `ԣ` VALUES ('ݏޏߏࡡ'); -INSERT INTO `ԣ` VALUES ('ݏޏߏࡡ'); #InnoDB SELECT RTRIM(`ã`) from `ԣ`; @@ -140,16 +113,11 @@ SELECT RTRIM(`ã`) from `ԣ`; SELECT RTRIM(`ã`) from `ԣ`; SELECT RTRIM(`ã`) from `ԣ`; -#HEAP +#MEMORY SELECT RTRIM(`ã`) from `ԣ`; SELECT RTRIM(`ã`) from `ԣ`; SELECT RTRIM(`ã`) from `ԣ`; -#BDB -SELECT RTRIM(`ã`) from `ԣ`; -SELECT RTRIM(`ã`) from `ԣ`; -SELECT RTRIM(`ã`) from `ԣ`; - DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -159,6 +127,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/t/jp_rtrim_utf8.test b/mysql-test/suite/jp/t/jp_rtrim_utf8.test index 4880a42db3e..f1161d16be7 100644 --- a/mysql-test/suite/jp/t/jp_rtrim_utf8.test +++ b/mysql-test/suite/jp/t/jp_rtrim_utf8.test @@ -1,3 +1,5 @@ +--source include/have_utf8.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `Ｔ１`; drop table if exists `Ｔ２`; @@ -8,7 +10,6 @@ drop table if exists `Ｔ６`; drop table if exists `Ｔ７`; drop table if exists `Ｔ８`; drop table if exists `Ｔ９`; -drop table if exists `Ｔ１０`; --enable_warnings # @@ -24,12 +25,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 CREATE TABLE `Ｔ４` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam; CREATE TABLE `Ｔ５` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam; CREATE TABLE `Ｔ６` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam; -CREATE TABLE `Ｔ７` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ８` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ９` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ１０` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb; -CREATE TABLE `Ｔ１１` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb; -CREATE TABLE `Ｔ１２` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb; +CREATE TABLE `Ｔ７` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ８` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ９` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY; INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'); INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ '); @@ -103,30 +101,6 @@ INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡 '); INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡 '); INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡 '); INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡 '); -INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'); -INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ '); -INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ '); -INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ '); -# Double byte spaces are not supposed to be trimed -INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ '); -INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ '); -INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ '); -INSERT INTO `Ｔ１１` VALUES ('あいうえお'); -INSERT INTO `Ｔ１１` VALUES ('あいうえお '); -INSERT INTO `Ｔ１１` VALUES ('あいうえお '); -INSERT INTO `Ｔ１１` VALUES ('あいうえお '); -# Double byte spaces are not supposed to be trimed -INSERT INTO `Ｔ１１` VALUES ('あいうえお '); -INSERT INTO `Ｔ１１` VALUES ('あいうえお '); -INSERT INTO `Ｔ１１` VALUES ('あいうえお '); -INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡'); -INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡 '); -INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡 '); -INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡 '); -# Double byte spaces are not supposed to be trimed -INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡 '); -INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡 '); -INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡 '); #InnoDB SELECT RTRIM(`Ｃ１`) from `Ｔ１`; @@ -138,16 +112,11 @@ SELECT RTRIM(`Ｃ１`) from `Ｔ４`; SELECT RTRIM(`Ｃ１`) from `Ｔ５`; SELECT RTRIM(`Ｃ１`) from `Ｔ６`; -#HEAP +#MEMORY SELECT RTRIM(`Ｃ１`) from `Ｔ７`; SELECT RTRIM(`Ｃ１`) from `Ｔ８`; SELECT RTRIM(`Ｃ１`) from `Ｔ９`; -#BDB -SELECT RTRIM(`Ｃ１`) from `Ｔ１０`; -SELECT RTRIM(`Ｃ１`) from `Ｔ１１`; -SELECT RTRIM(`Ｃ１`) from `Ｔ１２`; - DROP TABLE `Ｔ１`; DROP TABLE `Ｔ２`; DROP TABLE `Ｔ３`; @@ -157,6 +126,3 @@ DROP TABLE `Ｔ６`; DROP TABLE `Ｔ７`; DROP TABLE `Ｔ８`; DROP TABLE `Ｔ９`; -DROP TABLE `Ｔ１０`; -DROP TABLE `Ｔ１１`; -DROP TABLE `Ｔ１２`; diff --git a/mysql-test/suite/jp/t/jp_select_sjis.test b/mysql-test/suite/jp/t/jp_select_sjis.test index d84ed7a4b2c..f96dfadcef2 100644 --- a/mysql-test/suite/jp/t/jp_select_sjis.test +++ b/mysql-test/suite/jp/t/jp_select_sjis.test @@ -1,3 +1,5 @@ +--source include/have_sjis.inc +--source include/have_innodb.inc --character_set sjis --disable_warnings drop table if exists `sP`; @@ -9,9 +11,6 @@ drop table if exists `sU`; 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`; --enable_warnings # @@ -27,12 +26,9 @@ CREATE TABLE `sR` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engi CREATE TABLE `sS` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sT` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sU` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; -CREATE TABLE `sV` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sW` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sX` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPO` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPP` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPQ` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; +CREATE TABLE `sV` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sW` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sX` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; #Load the following data in each table # jisx0201 hankaku-katakana data @@ -48,9 +44,6 @@ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `sU`; 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`; #InnoDB SELECT * FROM `sP`; @@ -60,14 +53,10 @@ SELECT * FROM `sR`; SELECT * FROM `sS`; SELECT * FROM `sT`; SELECT * FROM `sU`; -#Heap +#MEMORY SELECT * FROM `sV`; SELECT * FROM `sW`; SELECT * FROM `sX`; -#BDB -SELECT * FROM `sPO`; -SELECT * FROM `sPP`; -SELECT * FROM `sPQ`; drop table `sP`; drop table `sQ`; @@ -78,6 +67,3 @@ drop table `sU`; drop table `sV`; drop table `sW`; drop table `sX`; -drop table `sPO`; -drop table `sPP`; -drop table `sPQ`; diff --git a/mysql-test/suite/jp/t/jp_select_ucs2.test b/mysql-test/suite/jp/t/jp_select_ucs2.test index 2e4602e7ea4..9acca2d6dfb 100644 --- a/mysql-test/suite/jp/t/jp_select_ucs2.test +++ b/mysql-test/suite/jp/t/jp_select_ucs2.test @@ -1,4 +1,5 @@ --source include/have_ucs2.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `ԣ`; @@ -10,9 +11,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 `ԣ`; --enable_warnings # @@ -32,9 +30,6 @@ CREATE TABLE `ԣ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ucs2 engine = myi CREATE TABLE `ԣ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ucs2 engine = heap; CREATE TABLE `ԣ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ucs2 engine = heap; CREATE TABLE `ԣ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ucs2 engine = bdb; -CREATE TABLE `ԣ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ucs2 engine = bdb; -CREATE TABLE `ԣ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ucs2 engine = bdb; #INSERT the following data in each table # jisx0201 hankaku-katakana data @@ -116,31 +111,6 @@ INSERT INTO `ԣ` VALUES ,('ÏďŏƏ') ,('ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ'); -INSERT INTO `ԣ` VALUES - ('PQRSTUVWXYZ[\\]^_') -,(' ') -,('') -,('ÎĎŎƎǎȎɎʎˎ͎̎Ύ') -,('ЎюҎӎԎՎ֎؎َڎێݎގ'); - -INSERT INTO `ԣ` VALUES - ('¡áġšơ') -,('ȡɡʡˡ̡͡ΡϡСѡҡӡԡա֡סء١ڡ') -,('') -,('') -,('') -,('СТУФХЦЧШЩЪЫЬЭЮЯабвг') -,(''); - -INSERT INTO `ԣ` VALUES - ('Ïġ') -,('ÏďŏƏ') -,('ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ') -,('ݏޏߏᏰ⏰㏰䏰台揰珰菰鏰ꏰ돰쏰폰') -,('') -,('ÏďŏƏ') -,('ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ'); - #InnoDB SELECT * FROM `ԣ`; SELECT * FROM `ԣ`; @@ -153,10 +123,6 @@ SELECT * FROM `ԣ`; SELECT * FROM `ԣ`; SELECT * FROM `ԣ`; SELECT * FROM `ԣ`; -#BDB -SELECT * FROM `ԣ`; -SELECT * FROM `ԣ`; -SELECT * FROM `ԣ`; drop table `ԣ`; drop table `ԣ`; @@ -167,6 +133,3 @@ drop table `ԣ`; drop table `ԣ`; drop table `ԣ`; drop table `ԣ`; -drop table `ԣ`; -drop table `ԣ`; -drop table `ԣ`; diff --git a/mysql-test/suite/jp/t/jp_select_ujis.test b/mysql-test/suite/jp/t/jp_select_ujis.test index 4ad9e581a92..0c01e614cfb 100644 --- a/mysql-test/suite/jp/t/jp_select_ujis.test +++ b/mysql-test/suite/jp/t/jp_select_ujis.test @@ -1,4 +1,5 @@ --source include/have_ujis.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `ԣ`; @@ -10,9 +11,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 `ԣ`; --enable_warnings # @@ -28,12 +26,9 @@ CREATE TABLE `ԣ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = inn CREATE TABLE `ԣ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = myisam; CREATE TABLE `ԣ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = myisam; CREATE TABLE `ԣ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = myisam; -CREATE TABLE `ԣ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = bdb; -CREATE TABLE `ԣ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = bdb; -CREATE TABLE `ԣ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = bdb; +CREATE TABLE `ԣ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣ` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = ujis engine = MEMORY; #Load the following data in each table # jisx0201 hankaku-katakana data @@ -49,9 +44,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 `ԣ`; #InnoDB SELECT * FROM `ԣ`; @@ -61,14 +53,10 @@ SELECT * FROM `ԣ`; SELECT * FROM `ԣ`; SELECT * FROM `ԣ`; SELECT * FROM `ԣ`; -#Heap +#MEMORY SELECT * FROM `ԣ`; SELECT * FROM `ԣ`; SELECT * FROM `ԣ`; -#BDB -SELECT * FROM `ԣ`; -SELECT * FROM `ԣ`; -SELECT * FROM `ԣ`; drop table `ԣ`; drop table `ԣ`; @@ -79,6 +67,3 @@ drop table `ԣ`; drop table `ԣ`; drop table `ԣ`; drop table `ԣ`; -drop table `ԣ`; -drop table `ԣ`; -drop table `ԣ`; diff --git a/mysql-test/suite/jp/t/jp_select_utf8.test b/mysql-test/suite/jp/t/jp_select_utf8.test index e614b9ccfb0..08157ccec11 100644 --- a/mysql-test/suite/jp/t/jp_select_utf8.test +++ b/mysql-test/suite/jp/t/jp_select_utf8.test @@ -1,3 +1,5 @@ +--source include/have_utf8.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `Ｔ１`; drop table if exists `Ｔ２`; @@ -8,9 +10,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 `Ｔ１２`; --enable_warnings # @@ -26,12 +25,9 @@ CREATE TABLE `Ｔ３` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = i CREATE TABLE `Ｔ４` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = myisam; CREATE TABLE `Ｔ５` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = myisam; CREATE TABLE `Ｔ６` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = myisam; -CREATE TABLE `Ｔ７` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ８` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ９` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ１０` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = bdb; -CREATE TABLE `Ｔ１１` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = bdb; -CREATE TABLE `Ｔ１２` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = bdb; +CREATE TABLE `Ｔ７` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ８` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ９` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = MEMORY; #Load the following data in each table # jisx0201 hankaku-katakana data @@ -47,9 +43,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 `Ｔ１２`; #InnoDB SELECT * FROM `Ｔ１`; @@ -59,14 +52,10 @@ SELECT * FROM `Ｔ３`; SELECT * FROM `Ｔ４`; SELECT * FROM `Ｔ５`; SELECT * FROM `Ｔ６`; -#Heap +#MEMORY SELECT * FROM `Ｔ７`; SELECT * FROM `Ｔ８`; SELECT * FROM `Ｔ９`; -#BDB -SELECT * FROM `Ｔ１０`; -SELECT * FROM `Ｔ１１`; -SELECT * FROM `Ｔ１２`; drop table `Ｔ１`; drop table `Ｔ２`; @@ -77,6 +66,3 @@ drop table `Ｔ６`; drop table `Ｔ７`; drop table `Ｔ８`; drop table `Ｔ９`; -drop table `Ｔ１０`; -drop table `Ｔ１１`; -drop table `Ｔ１２`; diff --git a/mysql-test/suite/jp/t/jp_subquery_sjis.test b/mysql-test/suite/jp/t/jp_subquery_sjis.test index 5292c7a2519..aaaa71b0d39 100644 --- a/mysql-test/suite/jp/t/jp_subquery_sjis.test +++ b/mysql-test/suite/jp/t/jp_subquery_sjis.test @@ -1,3 +1,5 @@ +--source include/have_sjis.inc +--source include/have_innodb.inc --character_set sjis --disable_warnings drop table if exists `sP`; @@ -9,9 +11,6 @@ drop table if exists `sU`; 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`; --enable_warnings # @@ -33,18 +32,12 @@ CREATE TABLE `sTa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine CREATE TABLE `sTb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sUa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sUb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = myisam; -CREATE TABLE `sVa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sVb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sWa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sWb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sXa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sXb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPOa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPOb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPPa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPPb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPQa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPQb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = heap; +CREATE TABLE `sVa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sVb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sWa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sWb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sXa` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sXb` (`bP` char(1) PRIMARY KEY) DEFAULT CHARSET = sjis engine = MEMORY; #insert the following data in each table # jisx0201 hankaku-katakana data @@ -69,12 +62,6 @@ INSERT INTO `sWa` VALUES (''),(''),(''); INSERT INTO `sWb` VALUES (''); INSERT INTO `sXa` VALUES ('\'),('\'),('\'); INSERT INTO `sXb` VALUES ('\'); -INSERT INTO `sPOa` VALUES (''),(''),(''); -INSERT INTO `sPOb` VALUES (''); -INSERT INTO `sPPa` VALUES (''),(''),(''); -INSERT INTO `sPPb` VALUES (''); -INSERT INTO `sPQa` VALUES ('\'),('\'),('\'); -INSERT INTO `sPQb` VALUES ('\'); #Test for innodb SELECT `bP` FROM `sPa` WHERE `bP` IN (SELECT `bP` FROM `sPb`); @@ -104,15 +91,6 @@ SELECT `bP` FROM `sWa` WHERE NOT EXISTS (SELECT `bP` FROM `sWb` WHERE ` SELECT `bP` FROM `sXa` WHERE `bP` IN (SELECT `bP` FROM `sXb`); SELECT `bP` FROM `sXa` WHERE EXISTS (SELECT `bP` FROM `sXb` WHERE `sXa`.`bP` = `sXb`.`bP`); SELECT `bP` FROM `sXa` WHERE NOT EXISTS (SELECT `bP` FROM `sXb` WHERE `sXa`.`bP` = `sXb`.`bP`); -SELECT `bP` FROM `sPOa` WHERE `bP` IN (SELECT `bP` FROM `sPOb`); -SELECT `bP` FROM `sPOa` WHERE EXISTS (SELECT `bP` FROM `sPOb` WHERE `sPOa`.`bP` = `sPOb`.`bP`); -SELECT `bP` FROM `sPOa` WHERE NOT EXISTS (SELECT `bP` FROM `sPOb` WHERE `sPOa`.`bP` = `sPOb`.`bP`); -SELECT `bP` FROM `sPPa` WHERE `bP` IN (SELECT `bP` FROM `sPPb`); -SELECT `bP` FROM `sPPa` WHERE EXISTS (SELECT `bP` FROM `sPPb` WHERE `sPPa`.`bP` = `sPPb`.`bP`); -SELECT `bP` FROM `sPPa` WHERE NOT EXISTS (SELECT `bP` FROM `sPPb` WHERE `sPPa`.`bP` = `sPPb`.`bP`); -SELECT `bP` FROM `sPQa` WHERE `bP` IN (SELECT `bP` FROM `sPQb`); -SELECT `bP` FROM `sPQa` WHERE EXISTS (SELECT `bP` FROM `sPQb` WHERE `sPQa`.`bP` = `sPQb`.`bP`); -SELECT `bP` FROM `sPQa` WHERE NOT EXISTS (SELECT `bP` FROM `sPQb` WHERE `sPQa`.`bP` = `sPQb`.`bP`); DROP TABLE `sPa`; DROP TABLE `sPb`; @@ -132,9 +110,3 @@ DROP TABLE `sWa`; DROP TABLE `sWb`; DROP TABLE `sXa`; DROP TABLE `sXb`; -DROP TABLE `sPOa`; -DROP TABLE `sPOb`; -DROP TABLE `sPPa`; -DROP TABLE `sPPb`; -DROP TABLE `sPQa`; -DROP TABLE `sPQb`; diff --git a/mysql-test/suite/jp/t/jp_subquery_ucs2.test b/mysql-test/suite/jp/t/jp_subquery_ucs2.test index 311433438f4..1361235f8a5 100644 --- a/mysql-test/suite/jp/t/jp_subquery_ucs2.test +++ b/mysql-test/suite/jp/t/jp_subquery_ucs2.test @@ -1,18 +1,25 @@ --source include/have_ucs2.inc +--source include/have_innodb.inc --disable_warnings -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 `ԣ`; -drop table if exists `ԣ`; -drop table if exists `ԣ`; -drop table if exists `ԣ`; -drop table if exists `ԣ`; -drop table if exists `ԣ`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; --enable_warnings # @@ -35,18 +42,12 @@ CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = myisam; CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = myisam; CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = myisam; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = heap; +CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY; #insert the following data in each table # jisx0201 hankaku-katakana data @@ -71,12 +72,6 @@ INSERT INTO `ԣa` VALUES (''),(''),(''); INSERT INTO `ԣb` VALUES (''); INSERT INTO `ԣa` VALUES (''),(''),(''); INSERT INTO `ԣb` VALUES (''); -INSERT INTO `ԣa` VALUES (''),(''),(''); -INSERT INTO `ԣb` VALUES (''); -INSERT INTO `ԣa` VALUES (''),(''),(''); -INSERT INTO `ԣb` VALUES (''); -INSERT INTO `ԣa` VALUES (''),(''),(''); -INSERT INTO `ԣb` VALUES (''); #Test for innodb SELECT `ã` FROM `ԣa` WHERE `ã` IN (SELECT `ã` FROM `ԣb`); @@ -106,15 +101,6 @@ SELECT `ã` FROM `ԣa` WHERE NOT EXISTS (SELECT `ã` FROM `ԣb` WHERE ` SELECT `ã` FROM `ԣa` WHERE `ã` IN (SELECT `ã` FROM `ԣb`); SELECT `ã` FROM `ԣa` WHERE EXISTS (SELECT `ã` FROM `ԣb` WHERE `ԣa`.`ã` = `ԣb`.`ã`); SELECT `ã` FROM `ԣa` WHERE NOT EXISTS (SELECT `ã` FROM `ԣb` WHERE `ԣa`.`ã` = `ԣb`.`ã`); -SELECT `ã` FROM `ԣa` WHERE `ã` IN (SELECT `ã` FROM `ԣb`); -SELECT `ã` FROM `ԣa` WHERE EXISTS (SELECT `ã` FROM `ԣb` WHERE `ԣa`.`ã` = `ԣb`.`ã`); -SELECT `ã` FROM `ԣa` WHERE NOT EXISTS (SELECT `ã` FROM `ԣb` WHERE `ԣa`.`ã` = `ԣb`.`ã`); -SELECT `ã` FROM `ԣa` WHERE `ã` IN (SELECT `ã` FROM `ԣb`); -SELECT `ã` FROM `ԣa` WHERE EXISTS (SELECT `ã` FROM `ԣb` WHERE `ԣa`.`ã` = `ԣb`.`ã`); -SELECT `ã` FROM `ԣa` WHERE NOT EXISTS (SELECT `ã` FROM `ԣb` WHERE `ԣa`.`ã` = `ԣb`.`ã`); -SELECT `ã` FROM `ԣa` WHERE `ã` IN (SELECT `ã` FROM `ԣb`); -SELECT `ã` FROM `ԣa` WHERE EXISTS (SELECT `ã` FROM `ԣb` WHERE `ԣa`.`ã` = `ԣb`.`ã`); -SELECT `ã` FROM `ԣa` WHERE NOT EXISTS (SELECT `ã` FROM `ԣb` WHERE `ԣa`.`ã` = `ԣb`.`ã`); DROP TABLE `ԣa`; DROP TABLE `ԣb`; @@ -134,10 +120,3 @@ DROP TABLE `ԣa`; DROP TABLE `ԣb`; DROP TABLE `ԣa`; DROP TABLE `ԣb`; -DROP TABLE `ԣa`; -DROP TABLE `ԣb`; -DROP TABLE `ԣa`; -DROP TABLE `ԣb`; -DROP TABLE `ԣa`; -DROP TABLE `ԣb`; - diff --git a/mysql-test/suite/jp/t/jp_subquery_ujis.test b/mysql-test/suite/jp/t/jp_subquery_ujis.test index 67c9f00fd85..1132f47031d 100644 --- a/mysql-test/suite/jp/t/jp_subquery_ujis.test +++ b/mysql-test/suite/jp/t/jp_subquery_ujis.test @@ -1,18 +1,25 @@ --source include/have_ujis.inc +--source include/have_innodb.inc --disable_warnings -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 `ԣ`; -drop table if exists `ԣ`; -drop table if exists `ԣ`; -drop table if exists `ԣ`; -drop table if exists `ԣ`; -drop table if exists `ԣ`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; +DROP TABLE IF EXISTS `ԣa`; +DROP TABLE IF EXISTS `ԣb`; --enable_warnings # @@ -34,18 +41,12 @@ CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = myisam; CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = myisam; CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = myisam; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap; +CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣa` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣb` (`ã` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = MEMORY; #insert the following data in each table # jisx0201 hankaku-katakana data @@ -70,12 +71,6 @@ INSERT INTO `ԣa` VALUES (''),(''),(''); INSERT INTO `ԣb` VALUES (''); INSERT INTO `ԣa` VALUES (''),(''),(''); INSERT INTO `ԣb` VALUES (''); -INSERT INTO `ԣa` VALUES (''),(''),(''); -INSERT INTO `ԣb` VALUES (''); -INSERT INTO `ԣa` VALUES (''),(''),(''); -INSERT INTO `ԣb` VALUES (''); -INSERT INTO `ԣa` VALUES (''),(''),(''); -INSERT INTO `ԣb` VALUES (''); #Test for innodb SELECT `ã` FROM `ԣa` WHERE `ã` IN (SELECT `ã` FROM `ԣb`); @@ -105,15 +100,6 @@ SELECT `ã` FROM `ԣa` WHERE NOT EXISTS (SELECT `ã` FROM `ԣb` WHERE ` SELECT `ã` FROM `ԣa` WHERE `ã` IN (SELECT `ã` FROM `ԣb`); SELECT `ã` FROM `ԣa` WHERE EXISTS (SELECT `ã` FROM `ԣb` WHERE `ԣa`.`ã` = `ԣb`.`ã`); SELECT `ã` FROM `ԣa` WHERE NOT EXISTS (SELECT `ã` FROM `ԣb` WHERE `ԣa`.`ã` = `ԣb`.`ã`); -SELECT `ã` FROM `ԣa` WHERE `ã` IN (SELECT `ã` FROM `ԣb`); -SELECT `ã` FROM `ԣa` WHERE EXISTS (SELECT `ã` FROM `ԣb` WHERE `ԣa`.`ã` = `ԣb`.`ã`); -SELECT `ã` FROM `ԣa` WHERE NOT EXISTS (SELECT `ã` FROM `ԣb` WHERE `ԣa`.`ã` = `ԣb`.`ã`); -SELECT `ã` FROM `ԣa` WHERE `ã` IN (SELECT `ã` FROM `ԣb`); -SELECT `ã` FROM `ԣa` WHERE EXISTS (SELECT `ã` FROM `ԣb` WHERE `ԣa`.`ã` = `ԣb`.`ã`); -SELECT `ã` FROM `ԣa` WHERE NOT EXISTS (SELECT `ã` FROM `ԣb` WHERE `ԣa`.`ã` = `ԣb`.`ã`); -SELECT `ã` FROM `ԣa` WHERE `ã` IN (SELECT `ã` FROM `ԣb`); -SELECT `ã` FROM `ԣa` WHERE EXISTS (SELECT `ã` FROM `ԣb` WHERE `ԣa`.`ã` = `ԣb`.`ã`); -SELECT `ã` FROM `ԣa` WHERE NOT EXISTS (SELECT `ã` FROM `ԣb` WHERE `ԣa`.`ã` = `ԣb`.`ã`); DROP TABLE `ԣa`; DROP TABLE `ԣb`; @@ -133,10 +119,3 @@ DROP TABLE `ԣa`; DROP TABLE `ԣb`; DROP TABLE `ԣa`; DROP TABLE `ԣb`; -DROP TABLE `ԣa`; -DROP TABLE `ԣb`; -DROP TABLE `ԣa`; -DROP TABLE `ԣb`; -DROP TABLE `ԣa`; -DROP TABLE `ԣb`; - diff --git a/mysql-test/suite/jp/t/jp_subquery_utf8.test b/mysql-test/suite/jp/t/jp_subquery_utf8.test index 97c2df8ce30..c9df0a4ac34 100644 --- a/mysql-test/suite/jp/t/jp_subquery_utf8.test +++ b/mysql-test/suite/jp/t/jp_subquery_utf8.test @@ -1,3 +1,6 @@ +--source include/have_utf8.inc +--source include/have_innodb.inc + --disable_warnings drop table if exists `Ｔ１`; drop table if exists `Ｔ２`; @@ -8,9 +11,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 `Ｔ１２`; --enable_warnings # @@ -32,18 +32,12 @@ CREATE TABLE `Ｔ５a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 eng CREATE TABLE `Ｔ５b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = myisam; CREATE TABLE `Ｔ６a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = myisam; CREATE TABLE `Ｔ６b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = myisam; -CREATE TABLE `Ｔ７a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ７b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ８a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ８b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ９a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ９b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ１０a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ１０b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ１１a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ１１b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ１２a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ１２b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = heap; +CREATE TABLE `Ｔ７a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ７b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ８a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ８b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ９a` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ９b` (`Ｃ１` char(1) PRIMARY KEY) DEFAULT CHARSET = utf8 engine = MEMORY; #insert the following data in each table # jisx0201 hankaku-katakana data @@ -68,12 +62,6 @@ INSERT INTO `Ｔ８a` VALUES ('あ'),('か'),('さ'); INSERT INTO `Ｔ８b` VALUES ('あ'); INSERT INTO `Ｔ９a` VALUES ('龔'),('龖'),('龗'); INSERT INTO `Ｔ９b` VALUES ('龔'); -INSERT INTO `Ｔ１０a` VALUES ('ｱ'),('ｶ'),('ｻ'); -INSERT INTO `Ｔ１０b` VALUES ('ｱ'); -INSERT INTO `Ｔ１１a` VALUES ('あ'),('か'),('さ'); -INSERT INTO `Ｔ１１b` VALUES ('あ'); -INSERT INTO `Ｔ１２a` VALUES ('龔'),('龖'),('龗'); -INSERT INTO `Ｔ１２b` VALUES ('龔'); #Test for innodb SELECT `Ｃ１` FROM `Ｔ１a` WHERE `Ｃ１` IN (SELECT `Ｃ１` FROM `Ｔ１b`); @@ -85,6 +73,7 @@ SELECT `Ｃ１` FROM `Ｔ２a` WHERE NOT EXISTS (SELECT `Ｃ１` FROM `Ｔ２b` SELECT `Ｃ１` FROM `Ｔ３a` WHERE `Ｃ１` IN (SELECT `Ｃ１` FROM `Ｔ３b`); SELECT `Ｃ１` FROM `Ｔ３a` WHERE EXISTS (SELECT `Ｃ１` FROM `Ｔ３b` WHERE `Ｔ３a`.`Ｃ１` = `Ｔ３b`.`Ｃ１`); SELECT `Ｃ１` FROM `Ｔ３a` WHERE NOT EXISTS (SELECT `Ｃ１` FROM `Ｔ３b` WHERE `Ｔ３a`.`Ｃ１` = `Ｔ３b`.`Ｃ１`); +#Test for myisam SELECT `Ｃ１` FROM `Ｔ４a` WHERE `Ｃ１` IN (SELECT `Ｃ１` FROM `Ｔ４b`); SELECT `Ｃ１` FROM `Ｔ４a` WHERE EXISTS (SELECT `Ｃ１` FROM `Ｔ４b` WHERE `Ｔ４a`.`Ｃ１` = `Ｔ４b`.`Ｃ１`); SELECT `Ｃ１` FROM `Ｔ４a` WHERE NOT EXISTS (SELECT `Ｃ１` FROM `Ｔ４b` WHERE `Ｔ４a`.`Ｃ１` = `Ｔ４b`.`Ｃ１`); @@ -94,6 +83,7 @@ SELECT `Ｃ１` FROM `Ｔ５a` WHERE NOT EXISTS (SELECT `Ｃ１` FROM `Ｔ５b` SELECT `Ｃ１` FROM `Ｔ６a` WHERE `Ｃ１` IN (SELECT `Ｃ１` FROM `Ｔ６b`); SELECT `Ｃ１` FROM `Ｔ６a` WHERE EXISTS (SELECT `Ｃ１` FROM `Ｔ６b` WHERE `Ｔ６a`.`Ｃ１` = `Ｔ６b`.`Ｃ１`); SELECT `Ｃ１` FROM `Ｔ６a` WHERE NOT EXISTS (SELECT `Ｃ１` FROM `Ｔ６b` WHERE `Ｔ６a`.`Ｃ１` = `Ｔ６b`.`Ｃ１`); +#Test for memory SELECT `Ｃ１` FROM `Ｔ７a` WHERE `Ｃ１` IN (SELECT `Ｃ１` FROM `Ｔ７b`); SELECT `Ｃ１` FROM `Ｔ７a` WHERE EXISTS (SELECT `Ｃ１` FROM `Ｔ７b` WHERE `Ｔ７a`.`Ｃ１` = `Ｔ７b`.`Ｃ１`); SELECT `Ｃ１` FROM `Ｔ７a` WHERE NOT EXISTS (SELECT `Ｃ１` FROM `Ｔ７b` WHERE `Ｔ７a`.`Ｃ１` = `Ｔ７b`.`Ｃ１`); @@ -103,15 +93,6 @@ SELECT `Ｃ１` FROM `Ｔ８a` WHERE NOT EXISTS (SELECT `Ｃ１` FROM `Ｔ８b` SELECT `Ｃ１` FROM `Ｔ９a` WHERE `Ｃ１` IN (SELECT `Ｃ１` FROM `Ｔ９b`); SELECT `Ｃ１` FROM `Ｔ９a` WHERE EXISTS (SELECT `Ｃ１` FROM `Ｔ９b` WHERE `Ｔ９a`.`Ｃ１` = `Ｔ９b`.`Ｃ１`); SELECT `Ｃ１` FROM `Ｔ９a` WHERE NOT EXISTS (SELECT `Ｃ１` FROM `Ｔ９b` WHERE `Ｔ９a`.`Ｃ１` = `Ｔ９b`.`Ｃ１`); -SELECT `Ｃ１` FROM `Ｔ１０a` WHERE `Ｃ１` IN (SELECT `Ｃ１` FROM `Ｔ１０b`); -SELECT `Ｃ１` FROM `Ｔ１０a` WHERE EXISTS (SELECT `Ｃ１` FROM `Ｔ１０b` WHERE `Ｔ１０a`.`Ｃ１` = `Ｔ１０b`.`Ｃ１`); -SELECT `Ｃ１` FROM `Ｔ１０a` WHERE NOT EXISTS (SELECT `Ｃ１` FROM `Ｔ１０b` WHERE `Ｔ１０a`.`Ｃ１` = `Ｔ１０b`.`Ｃ１`); -SELECT `Ｃ１` FROM `Ｔ１１a` WHERE `Ｃ１` IN (SELECT `Ｃ１` FROM `Ｔ１１b`); -SELECT `Ｃ１` FROM `Ｔ１１a` WHERE EXISTS (SELECT `Ｃ１` FROM `Ｔ１１b` WHERE `Ｔ１１a`.`Ｃ１` = `Ｔ１１b`.`Ｃ１`); -SELECT `Ｃ１` FROM `Ｔ１１a` WHERE NOT EXISTS (SELECT `Ｃ１` FROM `Ｔ１１b` WHERE `Ｔ１１a`.`Ｃ１` = `Ｔ１１b`.`Ｃ１`); -SELECT `Ｃ１` FROM `Ｔ１２a` WHERE `Ｃ１` IN (SELECT `Ｃ１` FROM `Ｔ１２b`); -SELECT `Ｃ１` FROM `Ｔ１２a` WHERE EXISTS (SELECT `Ｃ１` FROM `Ｔ１２b` WHERE `Ｔ１２a`.`Ｃ１` = `Ｔ１２b`.`Ｃ１`); -SELECT `Ｃ１` FROM `Ｔ１２a` WHERE NOT EXISTS (SELECT `Ｃ１` FROM `Ｔ１２b` WHERE `Ｔ１２a`.`Ｃ１` = `Ｔ１２b`.`Ｃ１`); DROP TABLE `Ｔ１a`; DROP TABLE `Ｔ１b`; @@ -131,9 +112,3 @@ DROP TABLE `Ｔ８a`; DROP TABLE `Ｔ８b`; DROP TABLE `Ｔ９a`; DROP TABLE `Ｔ９b`; -DROP TABLE `Ｔ１０a`; -DROP TABLE `Ｔ１０b`; -DROP TABLE `Ｔ１１a`; -DROP TABLE `Ｔ１１b`; -DROP TABLE `Ｔ１２a`; -DROP TABLE `Ｔ１２b`; diff --git a/mysql-test/suite/jp/t/jp_substring_sjis.test b/mysql-test/suite/jp/t/jp_substring_sjis.test index ac929114880..5b956e8e7a2 100644 --- a/mysql-test/suite/jp/t/jp_substring_sjis.test +++ b/mysql-test/suite/jp/t/jp_substring_sjis.test @@ -1,3 +1,6 @@ +--source include/have_sjis.inc +--source include/have_innodb.inc + --character_set sjis --disable_warnings drop table if exists `sP`; @@ -9,9 +12,6 @@ drop table if exists `sU`; 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`; --enable_warnings # @@ -27,12 +27,9 @@ CREATE TABLE `sR` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engin CREATE TABLE `sS` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sT` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sU` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; -CREATE TABLE `sV` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sW` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sX` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPO` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPP` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPQ` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; +CREATE TABLE `sV` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sW` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sX` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; INSERT INTO `sP` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `sQ` VALUES (''),(''),(''),(''),(''),(''); @@ -43,9 +40,6 @@ INSERT INTO `sU` VALUES ('\\\\\'),('\\\\'),('\\\'),('\\'),('\') INSERT INTO `sV` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `sW` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `sX` VALUES ('\\\\\'),('\\\\'),('\\\'),('\\'),('\'),(''); -INSERT INTO `sPO` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `sPP` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `sPQ` VALUES ('\\\\\'),('\\\\'),('\\\'),('\\'),('\'),(''); #InnoDB SELECT `bP`, SUBSTRING(`bP`,0) FROM `sP`; @@ -223,7 +217,7 @@ SELECT `bP`, SUBSTRING(`bP` FROM 1 FOR 4) FROM `sU`; SELECT `bP`, SUBSTRING(`bP` FROM 1 FOR 5) FROM `sU`; SELECT `bP`, SUBSTRING(`bP` FROM 1 FOR 6) FROM `sU`; -#HEAP +#MEMORY SELECT `bP`, SUBSTRING(`bP`,0) FROM `sV`; SELECT `bP`, SUBSTRING(`bP`,1) FROM `sV`; SELECT `bP`, SUBSTRING(`bP`,2) FROM `sV`; @@ -311,94 +305,6 @@ SELECT `bP`, SUBSTRING(`bP` FROM 1 FOR 4) FROM `sX`; SELECT `bP`, SUBSTRING(`bP` FROM 1 FOR 5) FROM `sX`; SELECT `bP`, SUBSTRING(`bP` FROM 1 FOR 6) FROM `sX`; -#BDB -SELECT `bP`, SUBSTRING(`bP`,0) FROM `sPO`; -SELECT `bP`, SUBSTRING(`bP`,1) FROM `sPO`; -SELECT `bP`, SUBSTRING(`bP`,2) FROM `sPO`; -SELECT `bP`, SUBSTRING(`bP`,3) FROM `sPO`; -SELECT `bP`, SUBSTRING(`bP`,4) FROM `sPO`; -SELECT `bP`, SUBSTRING(`bP`,5) FROM `sPO`; -SELECT `bP`, SUBSTRING(`bP`,6) FROM `sPO`; -SELECT `bP`, SUBSTRING(`bP` FROM 0) FROM `sPO`; -SELECT `bP`, SUBSTRING(`bP` FROM 1) FROM `sPO`; -SELECT `bP`, SUBSTRING(`bP` FROM 2) FROM `sPO`; -SELECT `bP`, SUBSTRING(`bP` FROM 3) FROM `sPO`; -SELECT `bP`, SUBSTRING(`bP` FROM 4) FROM `sPO`; -SELECT `bP`, SUBSTRING(`bP` FROM 5) FROM `sPO`; -SELECT `bP`, SUBSTRING(`bP` FROM 6) FROM `sPO`; -SELECT `bP`, SUBSTRING(`bP`,1,0) FROM `sPO`; -SELECT `bP`, SUBSTRING(`bP`,1,1) FROM `sPO`; -SELECT `bP`, SUBSTRING(`bP`,1,2) FROM `sPO`; -SELECT `bP`, SUBSTRING(`bP`,1,3) FROM `sPO`; -SELECT `bP`, SUBSTRING(`bP`,1,4) FROM `sPO`; -SELECT `bP`, SUBSTRING(`bP`,1,5) FROM `sPO`; -SELECT `bP`, SUBSTRING(`bP`,1,6) FROM `sPO`; -SELECT `bP`, SUBSTRING(`bP` FROM 1 FOR 0) FROM `sPO`; -SELECT `bP`, SUBSTRING(`bP` FROM 1 FOR 1) FROM `sPO`; -SELECT `bP`, SUBSTRING(`bP` FROM 1 FOR 2) FROM `sPO`; -SELECT `bP`, SUBSTRING(`bP` FROM 1 FOR 3) FROM `sPO`; -SELECT `bP`, SUBSTRING(`bP` FROM 1 FOR 4) FROM `sPO`; -SELECT `bP`, SUBSTRING(`bP` FROM 1 FOR 5) FROM `sPO`; -SELECT `bP`, SUBSTRING(`bP` FROM 1 FOR 6) FROM `sPO`; - -SELECT `bP`, SUBSTRING(`bP`,0) FROM `sPP`; -SELECT `bP`, SUBSTRING(`bP`,1) FROM `sPP`; -SELECT `bP`, SUBSTRING(`bP`,2) FROM `sPP`; -SELECT `bP`, SUBSTRING(`bP`,3) FROM `sPP`; -SELECT `bP`, SUBSTRING(`bP`,4) FROM `sPP`; -SELECT `bP`, SUBSTRING(`bP`,5) FROM `sPP`; -SELECT `bP`, SUBSTRING(`bP`,6) FROM `sPP`; -SELECT `bP`, SUBSTRING(`bP` FROM 0) FROM `sPP`; -SELECT `bP`, SUBSTRING(`bP` FROM 1) FROM `sPP`; -SELECT `bP`, SUBSTRING(`bP` FROM 2) FROM `sPP`; -SELECT `bP`, SUBSTRING(`bP` FROM 3) FROM `sPP`; -SELECT `bP`, SUBSTRING(`bP` FROM 4) FROM `sPP`; -SELECT `bP`, SUBSTRING(`bP` FROM 5) FROM `sPP`; -SELECT `bP`, SUBSTRING(`bP` FROM 6) FROM `sPP`; -SELECT `bP`, SUBSTRING(`bP`,1,0) FROM `sPP`; -SELECT `bP`, SUBSTRING(`bP`,1,1) FROM `sPP`; -SELECT `bP`, SUBSTRING(`bP`,1,2) FROM `sPP`; -SELECT `bP`, SUBSTRING(`bP`,1,3) FROM `sPP`; -SELECT `bP`, SUBSTRING(`bP`,1,4) FROM `sPP`; -SELECT `bP`, SUBSTRING(`bP`,1,5) FROM `sPP`; -SELECT `bP`, SUBSTRING(`bP`,1,6) FROM `sPP`; -SELECT `bP`, SUBSTRING(`bP` FROM 1 FOR 0) FROM `sPP`; -SELECT `bP`, SUBSTRING(`bP` FROM 1 FOR 1) FROM `sPP`; -SELECT `bP`, SUBSTRING(`bP` FROM 1 FOR 2) FROM `sPP`; -SELECT `bP`, SUBSTRING(`bP` FROM 1 FOR 3) FROM `sPP`; -SELECT `bP`, SUBSTRING(`bP` FROM 1 FOR 4) FROM `sPP`; -SELECT `bP`, SUBSTRING(`bP` FROM 1 FOR 5) FROM `sPP`; -SELECT `bP`, SUBSTRING(`bP` FROM 1 FOR 6) FROM `sPP`; - -SELECT `bP`, SUBSTRING(`bP`,0) FROM `sPQ`; -SELECT `bP`, SUBSTRING(`bP`,1) FROM `sPQ`; -SELECT `bP`, SUBSTRING(`bP`,2) FROM `sPQ`; -SELECT `bP`, SUBSTRING(`bP`,3) FROM `sPQ`; -SELECT `bP`, SUBSTRING(`bP`,4) FROM `sPQ`; -SELECT `bP`, SUBSTRING(`bP`,5) FROM `sPQ`; -SELECT `bP`, SUBSTRING(`bP`,6) FROM `sPQ`; -SELECT `bP`, SUBSTRING(`bP` FROM 0) FROM `sPQ`; -SELECT `bP`, SUBSTRING(`bP` FROM 1) FROM `sPQ`; -SELECT `bP`, SUBSTRING(`bP` FROM 2) FROM `sPQ`; -SELECT `bP`, SUBSTRING(`bP` FROM 3) FROM `sPQ`; -SELECT `bP`, SUBSTRING(`bP` FROM 4) FROM `sPQ`; -SELECT `bP`, SUBSTRING(`bP` FROM 5) FROM `sPQ`; -SELECT `bP`, SUBSTRING(`bP` FROM 6) FROM `sPQ`; -SELECT `bP`, SUBSTRING(`bP`,1,0) FROM `sPQ`; -SELECT `bP`, SUBSTRING(`bP`,1,1) FROM `sPQ`; -SELECT `bP`, SUBSTRING(`bP`,1,2) FROM `sPQ`; -SELECT `bP`, SUBSTRING(`bP`,1,3) FROM `sPQ`; -SELECT `bP`, SUBSTRING(`bP`,1,4) FROM `sPQ`; -SELECT `bP`, SUBSTRING(`bP`,1,5) FROM `sPQ`; -SELECT `bP`, SUBSTRING(`bP`,1,6) FROM `sPQ`; -SELECT `bP`, SUBSTRING(`bP` FROM 1 FOR 0) FROM `sPQ`; -SELECT `bP`, SUBSTRING(`bP` FROM 1 FOR 1) FROM `sPQ`; -SELECT `bP`, SUBSTRING(`bP` FROM 1 FOR 2) FROM `sPQ`; -SELECT `bP`, SUBSTRING(`bP` FROM 1 FOR 3) FROM `sPQ`; -SELECT `bP`, SUBSTRING(`bP` FROM 1 FOR 4) FROM `sPQ`; -SELECT `bP`, SUBSTRING(`bP` FROM 1 FOR 5) FROM `sPQ`; -SELECT `bP`, SUBSTRING(`bP` FROM 1 FOR 6) FROM `sPQ`; - DROP TABLE `sP`; DROP TABLE `sQ`; DROP TABLE `sR`; @@ -408,6 +314,3 @@ DROP TABLE `sU`; DROP TABLE `sV`; DROP TABLE `sW`; DROP TABLE `sX`; -DROP TABLE `sPO`; -DROP TABLE `sPP`; -DROP TABLE `sPQ`; diff --git a/mysql-test/suite/jp/t/jp_substring_ucs2.test b/mysql-test/suite/jp/t/jp_substring_ucs2.test index f3cd5550072..febad324237 100644 --- a/mysql-test/suite/jp/t/jp_substring_ucs2.test +++ b/mysql-test/suite/jp/t/jp_substring_ucs2.test @@ -1,4 +1,5 @@ --source include/have_ucs2.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `ԣ`; @@ -10,9 +11,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 `ԣ`; --enable_warnings # @@ -29,12 +27,9 @@ CREATE TABLE `ԣ` (`ã` char(5), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engin 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 (''),(''),(''),(''),(''),(''); @@ -45,9 +40,6 @@ INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(' INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(''),(''),(''); # Test of SUBSTRING(str,pos) and SUBSTRING(str FROM pos) # is not available until the bug #5364 is fixed @@ -228,7 +220,7 @@ SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 4) FROM `ԣ`; SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 5) FROM `ԣ`; SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 6) FROM `ԣ`; -#HEAP +#MEMORY #SELECT `ã`, SUBSTRING(`ã`,0) FROM `ԣ`; #SELECT `ã`, SUBSTRING(`ã`,1) FROM `ԣ`; #SELECT `ã`, SUBSTRING(`ã`,2) FROM `ԣ`; @@ -316,94 +308,6 @@ SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 4) FROM `ԣ`; SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 5) FROM `ԣ`; SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 6) FROM `ԣ`; -#BDB -#SELECT `ã`, SUBSTRING(`ã`,0) FROM `ԣ`; -#SELECT `ã`, SUBSTRING(`ã`,1) FROM `ԣ`; -#SELECT `ã`, SUBSTRING(`ã`,2) FROM `ԣ`; -#SELECT `ã`, SUBSTRING(`ã`,3) FROM `ԣ`; -#SELECT `ã`, SUBSTRING(`ã`,4) FROM `ԣ`; -#SELECT `ã`, SUBSTRING(`ã`,5) FROM `ԣ`; -#SELECT `ã`, SUBSTRING(`ã`,6) FROM `ԣ`; -#SELECT `ã`, SUBSTRING(`ã` FROM 0) FROM `ԣ`; -#SELECT `ã`, SUBSTRING(`ã` FROM 1) FROM `ԣ`; -#SELECT `ã`, SUBSTRING(`ã` FROM 2) FROM `ԣ`; -#SELECT `ã`, SUBSTRING(`ã` FROM 3) FROM `ԣ`; -#SELECT `ã`, SUBSTRING(`ã` FROM 4) FROM `ԣ`; -#SELECT `ã`, SUBSTRING(`ã` FROM 5) FROM `ԣ`; -#SELECT `ã`, SUBSTRING(`ã` FROM 6) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,1,0) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,1,1) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,1,2) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,1,3) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,1,4) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,1,5) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,1,6) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 0) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 1) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 2) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 3) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 4) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 5) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 6) FROM `ԣ`; - -#SELECT `ã`, SUBSTRING(`ã`,0) FROM `ԣ`; -#SELECT `ã`, SUBSTRING(`ã`,1) FROM `ԣ`; -#SELECT `ã`, SUBSTRING(`ã`,2) FROM `ԣ`; -#SELECT `ã`, SUBSTRING(`ã`,3) FROM `ԣ`; -#SELECT `ã`, SUBSTRING(`ã`,4) FROM `ԣ`; -#SELECT `ã`, SUBSTRING(`ã`,5) FROM `ԣ`; -#SELECT `ã`, SUBSTRING(`ã`,6) FROM `ԣ`; -#SELECT `ã`, SUBSTRING(`ã` FROM 0) FROM `ԣ`; -#SELECT `ã`, SUBSTRING(`ã` FROM 1) FROM `ԣ`; -#SELECT `ã`, SUBSTRING(`ã` FROM 2) FROM `ԣ`; -#SELECT `ã`, SUBSTRING(`ã` FROM 3) FROM `ԣ`; -#SELECT `ã`, SUBSTRING(`ã` FROM 4) FROM `ԣ`; -#SELECT `ã`, SUBSTRING(`ã` FROM 5) FROM `ԣ`; -#SELECT `ã`, SUBSTRING(`ã` FROM 6) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,1,0) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,1,1) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,1,2) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,1,3) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,1,4) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,1,5) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,1,6) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 0) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 1) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 2) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 3) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 4) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 5) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 6) FROM `ԣ`; - -#SELECT `ã`, SUBSTRING(`ã`,0) FROM `ԣ`; -#SELECT `ã`, SUBSTRING(`ã`,1) FROM `ԣ`; -#SELECT `ã`, SUBSTRING(`ã`,2) FROM `ԣ`; -#SELECT `ã`, SUBSTRING(`ã`,3) FROM `ԣ`; -#SELECT `ã`, SUBSTRING(`ã`,4) FROM `ԣ`; -#SELECT `ã`, SUBSTRING(`ã`,5) FROM `ԣ`; -#SELECT `ã`, SUBSTRING(`ã`,6) FROM `ԣ`; -#SELECT `ã`, SUBSTRING(`ã` FROM 0) FROM `ԣ`; -#SELECT `ã`, SUBSTRING(`ã` FROM 1) FROM `ԣ`; -#SELECT `ã`, SUBSTRING(`ã` FROM 2) FROM `ԣ`; -#SELECT `ã`, SUBSTRING(`ã` FROM 3) FROM `ԣ`; -#SELECT `ã`, SUBSTRING(`ã` FROM 4) FROM `ԣ`; -#SELECT `ã`, SUBSTRING(`ã` FROM 5) FROM `ԣ`; -#SELECT `ã`, SUBSTRING(`ã` FROM 6) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,1,0) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,1,1) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,1,2) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,1,3) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,1,4) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,1,5) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,1,6) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 0) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 1) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 2) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 3) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 4) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 5) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 6) FROM `ԣ`; - DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -413,6 +317,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/t/jp_substring_ujis.test b/mysql-test/suite/jp/t/jp_substring_ujis.test index c201c7148da..df35d91cacc 100644 --- a/mysql-test/suite/jp/t/jp_substring_ujis.test +++ b/mysql-test/suite/jp/t/jp_substring_ujis.test @@ -1,4 +1,5 @@ --source include/have_ujis.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `ԣ`; @@ -10,9 +11,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 `ԣ`; --enable_warnings # @@ -28,12 +26,9 @@ CREATE TABLE `ԣ` (`ã` char(5), INDEX(`ã`)) DEFAULT CHARSET = ujis engin 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 (''),(''),(''),(''),(''),(''); @@ -44,9 +39,6 @@ INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(' INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES (''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'),('ݏޏ'),('ݏ'),(''),(''),(''); #InnoDB SELECT `ã`, SUBSTRING(`ã`,0) FROM `ԣ`; @@ -224,7 +216,7 @@ SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 4) FROM `ԣ`; SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 5) FROM `ԣ`; SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 6) FROM `ԣ`; -#HEAP +#MEMORY SELECT `ã`, SUBSTRING(`ã`,0) FROM `ԣ`; SELECT `ã`, SUBSTRING(`ã`,1) FROM `ԣ`; SELECT `ã`, SUBSTRING(`ã`,2) FROM `ԣ`; @@ -312,94 +304,6 @@ SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 4) FROM `ԣ`; SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 5) FROM `ԣ`; SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 6) FROM `ԣ`; -#BDB -SELECT `ã`, SUBSTRING(`ã`,0) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,1) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,2) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,3) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,4) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,5) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,6) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 0) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 1) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 2) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 3) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 4) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 5) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 6) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,1,0) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,1,1) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,1,2) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,1,3) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,1,4) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,1,5) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,1,6) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 0) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 1) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 2) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 3) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 4) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 5) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 6) FROM `ԣ`; - -SELECT `ã`, SUBSTRING(`ã`,0) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,1) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,2) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,3) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,4) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,5) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,6) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 0) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 1) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 2) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 3) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 4) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 5) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 6) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,1,0) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,1,1) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,1,2) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,1,3) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,1,4) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,1,5) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,1,6) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 0) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 1) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 2) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 3) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 4) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 5) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 6) FROM `ԣ`; - -SELECT `ã`, SUBSTRING(`ã`,0) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,1) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,2) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,3) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,4) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,5) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,6) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 0) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 1) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 2) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 3) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 4) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 5) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 6) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,1,0) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,1,1) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,1,2) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,1,3) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,1,4) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,1,5) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã`,1,6) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 0) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 1) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 2) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 3) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 4) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 5) FROM `ԣ`; -SELECT `ã`, SUBSTRING(`ã` FROM 1 FOR 6) FROM `ԣ`; - DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -409,6 +313,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/t/jp_substring_utf8.test b/mysql-test/suite/jp/t/jp_substring_utf8.test index 9f88115c899..5408afd8482 100644 --- a/mysql-test/suite/jp/t/jp_substring_utf8.test +++ b/mysql-test/suite/jp/t/jp_substring_utf8.test @@ -1,3 +1,5 @@ +--source include/have_utf8.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `Ｔ１`; drop table if exists `Ｔ２`; @@ -8,9 +10,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 `Ｔ１２`; --enable_warnings # @@ -26,12 +25,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 ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),(''); @@ -42,9 +38,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),( INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),(''); INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),(''); INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),(''); -INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),(''); -INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),(''); -INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),(''); #InnoDB SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,0) FROM `Ｔ１`; @@ -222,7 +215,7 @@ SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 4) FROM `Ｔ６`; SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 5) FROM `Ｔ６`; SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 6) FROM `Ｔ６`; -#HEAP +#MEMORY SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,0) FROM `Ｔ７`; SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1) FROM `Ｔ７`; SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,2) FROM `Ｔ７`; @@ -310,94 +303,6 @@ SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 4) FROM `Ｔ９`; SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 5) FROM `Ｔ９`; SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 6) FROM `Ｔ９`; -#BDB -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,0) FROM `Ｔ１０`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1) FROM `Ｔ１０`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,2) FROM `Ｔ１０`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,3) FROM `Ｔ１０`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,4) FROM `Ｔ１０`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,5) FROM `Ｔ１０`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,6) FROM `Ｔ１０`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 0) FROM `Ｔ１０`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1) FROM `Ｔ１０`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 2) FROM `Ｔ１０`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 3) FROM `Ｔ１０`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 4) FROM `Ｔ１０`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 5) FROM `Ｔ１０`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 6) FROM `Ｔ１０`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,0) FROM `Ｔ１０`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,1) FROM `Ｔ１０`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,2) FROM `Ｔ１０`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,3) FROM `Ｔ１０`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,4) FROM `Ｔ１０`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,5) FROM `Ｔ１０`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,6) FROM `Ｔ１０`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 0) FROM `Ｔ１０`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 1) FROM `Ｔ１０`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 2) FROM `Ｔ１０`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 3) FROM `Ｔ１０`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 4) FROM `Ｔ１０`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 5) FROM `Ｔ１０`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 6) FROM `Ｔ１０`; - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,0) FROM `Ｔ１１`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1) FROM `Ｔ１１`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,2) FROM `Ｔ１１`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,3) FROM `Ｔ１１`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,4) FROM `Ｔ１１`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,5) FROM `Ｔ１１`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,6) FROM `Ｔ１１`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 0) FROM `Ｔ１１`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1) FROM `Ｔ１１`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 2) FROM `Ｔ１１`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 3) FROM `Ｔ１１`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 4) FROM `Ｔ１１`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 5) FROM `Ｔ１１`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 6) FROM `Ｔ１１`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,0) FROM `Ｔ１１`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,1) FROM `Ｔ１１`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,2) FROM `Ｔ１１`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,3) FROM `Ｔ１１`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,4) FROM `Ｔ１１`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,5) FROM `Ｔ１１`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,6) FROM `Ｔ１１`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 0) FROM `Ｔ１１`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 1) FROM `Ｔ１１`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 2) FROM `Ｔ１１`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 3) FROM `Ｔ１１`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 4) FROM `Ｔ１１`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 5) FROM `Ｔ１１`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 6) FROM `Ｔ１１`; - -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,0) FROM `Ｔ１２`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1) FROM `Ｔ１２`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,2) FROM `Ｔ１２`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,3) FROM `Ｔ１２`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,4) FROM `Ｔ１２`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,5) FROM `Ｔ１２`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,6) FROM `Ｔ１２`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 0) FROM `Ｔ１２`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1) FROM `Ｔ１２`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 2) FROM `Ｔ１２`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 3) FROM `Ｔ１２`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 4) FROM `Ｔ１２`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 5) FROM `Ｔ１２`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 6) FROM `Ｔ１２`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,0) FROM `Ｔ１２`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,1) FROM `Ｔ１２`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,2) FROM `Ｔ１２`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,3) FROM `Ｔ１２`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,4) FROM `Ｔ１２`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,5) FROM `Ｔ１２`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１`,1,6) FROM `Ｔ１２`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 0) FROM `Ｔ１２`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 1) FROM `Ｔ１２`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 2) FROM `Ｔ１２`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 3) FROM `Ｔ１２`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 4) FROM `Ｔ１２`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 5) FROM `Ｔ１２`; -SELECT `Ｃ１`, SUBSTRING(`Ｃ１` FROM 1 FOR 6) FROM `Ｔ１２`; - DROP TABLE `Ｔ１`; DROP TABLE `Ｔ２`; DROP TABLE `Ｔ３`; @@ -407,6 +312,3 @@ DROP TABLE `Ｔ６`; DROP TABLE `Ｔ７`; DROP TABLE `Ｔ８`; DROP TABLE `Ｔ９`; -DROP TABLE `Ｔ１０`; -DROP TABLE `Ｔ１１`; -DROP TABLE `Ｔ１２`; diff --git a/mysql-test/suite/jp/t/jp_trim_sjis.test b/mysql-test/suite/jp/t/jp_trim_sjis.test index 0f6821605ed..4a2b6b98b54 100644 --- a/mysql-test/suite/jp/t/jp_trim_sjis.test +++ b/mysql-test/suite/jp/t/jp_trim_sjis.test @@ -1,219 +1,13 @@ ---character_set sjis ---disable_warnings -drop table if exists `sP`; -drop table if exists `sQ`; -drop table if exists `sR`; -drop table if exists `sS`; -drop table if exists `sT`; -drop table if exists `sU`; -drop table if exists `sV`; -drop table if exists `sW`; -drop table if exists `sX`; -drop table if exists `sPO`; ---enable_warnings - # # Test TRIM() function with Japanese characters sjis encoding # -SET NAMES sjis; -SET character_set_database = sjis; - -CREATE TABLE `sP` (`bP` char(12), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = innodb; -CREATE TABLE `sQ` (`bP` char(12), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = innodb; -CREATE TABLE `sR` (`bP` char(12), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = innodb; -CREATE TABLE `sS` (`bP` char(12), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; -CREATE TABLE `sT` (`bP` char(12), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; -CREATE TABLE `sU` (`bP` char(12), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; -CREATE TABLE `sV` (`bP` char(12), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sW` (`bP` char(12), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sX` (`bP` char(12), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPO` (`bP` char(12), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPP` (`bP` char(12), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPQ` (`bP` char(12), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; - -# Nothing to trim -INSERT INTO `sP` VALUES (''); -# Test data for TRIM(TRAILING [remstr] FROM str) -INSERT INTO `sP` VALUES (''); -INSERT INTO `sP` VALUES (''); -INSERT INTO `sP` VALUES (''); -# Test data for TRIM(LEADING [remstr] FROM str) -INSERT INTO `sP` VALUES (''); -INSERT INTO `sP` VALUES (''); -INSERT INTO `sP` VALUES (''); -# Test data for TRIM(BOTH [remstr] FROM str) -INSERT INTO `sP` VALUES (''); -# Test data for TRIM without [remstr] (remove spaces) -INSERT INTO `sP` VALUES (' '); -INSERT INTO `sQ` VALUES (''); -INSERT INTO `sQ` VALUES (''); -INSERT INTO `sQ` VALUES (''); -INSERT INTO `sQ` VALUES (''); -INSERT INTO `sQ` VALUES (''); -INSERT INTO `sQ` VALUES (''); -INSERT INTO `sQ` VALUES (''); -INSERT INTO `sQ` VALUES (''); -INSERT INTO `sQ` VALUES (' '); -INSERT INTO `sR` VALUES ('\\\\\'); -INSERT INTO `sR` VALUES ('\\\\\\'); -INSERT INTO `sR` VALUES ('\\\\\\\'); -INSERT INTO `sR` VALUES ('\\\\\\\\'); -INSERT INTO `sR` VALUES ('\\\\\\'); -INSERT INTO `sR` VALUES ('\\\\\\\'); -INSERT INTO `sR` VALUES ('\\\\\\\\'); -INSERT INTO `sR` VALUES ('\\\\\\\\\\\'); -INSERT INTO `sR` VALUES (' \\\\\ '); - -INSERT INTO `sS` VALUES (''); -INSERT INTO `sS` VALUES (''); -INSERT INTO `sS` VALUES (''); -INSERT INTO `sS` VALUES (''); -INSERT INTO `sS` VALUES (''); -INSERT INTO `sS` VALUES (''); -INSERT INTO `sS` VALUES (''); -INSERT INTO `sS` VALUES (''); -INSERT INTO `sS` VALUES (' '); -INSERT INTO `sT` VALUES (''); -INSERT INTO `sT` VALUES (''); -INSERT INTO `sT` VALUES (''); -INSERT INTO `sT` VALUES (''); -INSERT INTO `sT` VALUES (''); -INSERT INTO `sT` VALUES (''); -INSERT INTO `sT` VALUES (''); -INSERT INTO `sT` VALUES (''); -INSERT INTO `sT` VALUES (' '); -INSERT INTO `sU` VALUES ('\\\\\'); -INSERT INTO `sU` VALUES ('\\\\\\'); -INSERT INTO `sU` VALUES ('\\\\\\\'); -INSERT INTO `sU` VALUES ('\\\\\\\\'); -INSERT INTO `sU` VALUES ('\\\\\\'); -INSERT INTO `sU` VALUES ('\\\\\\\'); -INSERT INTO `sU` VALUES ('\\\\\\\\'); -INSERT INTO `sU` VALUES ('\\\\\\\\\\\'); -INSERT INTO `sU` VALUES (' \\\\\ '); - -INSERT INTO `sV` VALUES (''); -INSERT INTO `sV` VALUES (''); -INSERT INTO `sV` VALUES (''); -INSERT INTO `sV` VALUES (''); -INSERT INTO `sV` VALUES (''); -INSERT INTO `sV` VALUES (''); -INSERT INTO `sV` VALUES (''); -INSERT INTO `sV` VALUES (''); -INSERT INTO `sV` VALUES (' '); -INSERT INTO `sW` VALUES (''); -INSERT INTO `sW` VALUES (''); -INSERT INTO `sW` VALUES (''); -INSERT INTO `sW` VALUES (''); -INSERT INTO `sW` VALUES (''); -INSERT INTO `sW` VALUES (''); -INSERT INTO `sW` VALUES (''); -INSERT INTO `sW` VALUES (''); -INSERT INTO `sW` VALUES (' '); -INSERT INTO `sX` VALUES ('\\\\\'); -INSERT INTO `sX` VALUES ('\\\\\\'); -INSERT INTO `sX` VALUES ('\\\\\\\'); -INSERT INTO `sX` VALUES ('\\\\\\\\'); -INSERT INTO `sX` VALUES ('\\\\\\'); -INSERT INTO `sX` VALUES ('\\\\\\\'); -INSERT INTO `sX` VALUES ('\\\\\\\\'); -INSERT INTO `sX` VALUES ('\\\\\\\\\\\'); -INSERT INTO `sX` VALUES (' \\\\\ '); - -INSERT INTO `sPO` VALUES (''); -INSERT INTO `sPO` VALUES (''); -INSERT INTO `sPO` VALUES (''); -INSERT INTO `sPO` VALUES (''); -INSERT INTO `sPO` VALUES (''); -INSERT INTO `sPO` VALUES (''); -INSERT INTO `sPO` VALUES (''); -INSERT INTO `sPO` VALUES (''); -INSERT INTO `sPO` VALUES (' '); -INSERT INTO `sPP` VALUES (''); -INSERT INTO `sPP` VALUES (''); -INSERT INTO `sPP` VALUES (''); -INSERT INTO `sPP` VALUES (''); -INSERT INTO `sPP` VALUES (''); -INSERT INTO `sPP` VALUES (''); -INSERT INTO `sPP` VALUES (''); -INSERT INTO `sPP` VALUES (''); -INSERT INTO `sPP` VALUES (' '); -INSERT INTO `sPQ` VALUES ('\\\\\'); -INSERT INTO `sPQ` VALUES ('\\\\\\'); -INSERT INTO `sPQ` VALUES ('\\\\\\\'); -INSERT INTO `sPQ` VALUES ('\\\\\\\\'); -INSERT INTO `sPQ` VALUES ('\\\\\\'); -INSERT INTO `sPQ` VALUES ('\\\\\\\'); -INSERT INTO `sPQ` VALUES ('\\\\\\\\'); -INSERT INTO `sPQ` VALUES ('\\\\\\\\\\\'); -INSERT INTO `sPQ` VALUES (' \\\\\ '); - -#InnoDB -SELECT `bP`,TRIM(TRAILING '' FROM `bP`) FROM `sP`; -SELECT `bP`,TRIM(LEADING '' FROM `bP`) FROM `sP`; -SELECT `bP`,TRIM(BOTH '' FROM `bP`) FROM `sP`; -SELECT `bP`,TRIM(`bP`) FROM `sP`; -SELECT `bP`,TRIM(TRAILING '' FROM `bP`) FROM `sQ`; -SELECT `bP`,TRIM(LEADING '' FROM `bP`) FROM `sQ`; -SELECT `bP`,TRIM(BOTH '' FROM `bP`) FROM `sQ`; -SELECT `bP`,TRIM(`bP`) FROM `sQ`; -SELECT `bP`,TRIM(TRAILING '\'FROM `bP`) FROM `sR`; -SELECT `bP`,TRIM(LEADING '\' FROM `bP`) FROM `sR`; -SELECT `bP`,TRIM(BOTH '\' FROM `bP`) FROM `sR`; -SELECT `bP`,TRIM(`bP`) FROM `sR`; - -#MyISAM -SELECT `bP`,TRIM(TRAILING '' FROM `bP`) FROM `sS`; -SELECT `bP`,TRIM(LEADING '' FROM `bP`) FROM `sS`; -SELECT `bP`,TRIM(BOTH '' FROM `bP`) FROM `sS`; -SELECT `bP`,TRIM(`bP`) FROM `sS`; -SELECT `bP`,TRIM(TRAILING '' FROM `bP`) FROM `sT`; -SELECT `bP`,TRIM(LEADING '' FROM `bP`) FROM `sT`; -SELECT `bP`,TRIM(BOTH '' FROM `bP`) FROM `sT`; -SELECT `bP`,TRIM(`bP`) FROM `sT`; -SELECT `bP`,TRIM(TRAILING '\' FROM `bP`) FROM `sU`; -SELECT `bP`,TRIM(LEADING '\' FROM `bP`) FROM `sU`; -SELECT `bP`,TRIM(BOTH '\' FROM `bP`) FROM `sU`; -SELECT `bP`,TRIM(`bP`) FROM `sU`; - -#HEAP -SELECT `bP`,TRIM(TRAILING '' FROM `bP`) FROM `sV`; -SELECT `bP`,TRIM(LEADING '' FROM `bP`) FROM `sV`; -SELECT `bP`,TRIM(BOTH '' FROM `bP`) FROM `sV`; -SELECT `bP`,TRIM(`bP`) FROM `sV`; -SELECT `bP`,TRIM(TRAILING '' FROM `bP`) FROM `sW`; -SELECT `bP`,TRIM(LEADING '' FROM `bP`) FROM `sW`; -SELECT `bP`,TRIM(BOTH '' FROM `bP`) FROM `sW`; -SELECT `bP`,TRIM(`bP`) FROM `sW`; -SELECT `bP`,TRIM(TRAILING '\' FROM `bP`) FROM `sX`; -SELECT `bP`,TRIM(LEADING '\' FROM `bP`) FROM `sX`; -SELECT `bP`,TRIM(BOTH '\' FROM `bP`) FROM `sX`; -SELECT `bP`,TRIM(`bP`) FROM `sX`; +--source include/have_innodb.inc +let $engine = innodb; +--source suite/jp/include/trim_sjis.inc -#BDB -SELECT `bP`,TRIM(TRAILING '' FROM `bP`) FROM `sPO`; -SELECT `bP`,TRIM(LEADING '' FROM `bP`) FROM `sPO`; -SELECT `bP`,TRIM(BOTH '' FROM `bP`) FROM `sPO`; -SELECT `bP`,TRIM(`bP`) FROM `sPO`; -SELECT `bP`,TRIM(TRAILING '' FROM `bP`) FROM `sPP`; -SELECT `bP`,TRIM(LEADING '' FROM `bP`) FROM `sPP`; -SELECT `bP`,TRIM(BOTH '' FROM `bP`) FROM `sPP`; -SELECT `bP`,TRIM(`bP`) FROM `sPP`; -SELECT `bP`,TRIM(TRAILING '\' FROM `bP`) FROM `sPQ`; -SELECT `bP`,TRIM(LEADING '\' FROM `bP`) FROM `sPQ`; -SELECT `bP`,TRIM(BOTH '\' FROM `bP`) FROM `sPQ`; -SELECT `bP`,TRIM(`bP`) FROM `sPQ`; +let $engine = myisam; +--source suite/jp/include/trim_sjis.inc -DROP TABLE `sP`; -DROP TABLE `sQ`; -DROP TABLE `sR`; -DROP TABLE `sS`; -DROP TABLE `sT`; -DROP TABLE `sU`; -DROP TABLE `sV`; -DROP TABLE `sW`; -DROP TABLE `sX`; -DROP TABLE `sPO`; -DROP TABLE `sPP`; -DROP TABLE `sPQ`; +let $engine = memory; +--source suite/jp/include/trim_sjis.inc diff --git a/mysql-test/suite/jp/t/jp_trim_ucs2.test b/mysql-test/suite/jp/t/jp_trim_ucs2.test index 1d8a12650e0..e7205019f18 100644 --- a/mysql-test/suite/jp/t/jp_trim_ucs2.test +++ b/mysql-test/suite/jp/t/jp_trim_ucs2.test @@ -1,4 +1,5 @@ --source include/have_ucs2.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `ԣ`; @@ -10,7 +11,6 @@ drop table if exists `ԣ`; drop table if exists `ԣ`; drop table if exists `ԣ`; drop table if exists `ԣ`; -drop table if exists `ԣ`; --enable_warnings # @@ -27,12 +27,9 @@ CREATE TABLE `ԣ` (`ã` char(12), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engi CREATE TABLE `ԣ` (`ã` char(12), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = myisam; CREATE TABLE `ԣ` (`ã` char(12), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = myisam; CREATE TABLE `ԣ` (`ã` char(12), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = myisam; -CREATE TABLE `ԣ` (`ã` char(12), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` char(12), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` char(12), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` char(12), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = bdb; -CREATE TABLE `ԣ` (`ã` char(12), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = bdb; -CREATE TABLE `ԣ` (`ã` char(12), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = bdb; +CREATE TABLE `ԣ` (`ã` char(12), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(12), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(12), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = MEMORY; # Nothing to trim INSERT INTO `ԣ` VALUES (''); @@ -123,34 +120,6 @@ 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 (''); -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 (' ݏޏߏ '); - #InnoDB SELECT `ã`,TRIM(TRAILING '' FROM `ã`) FROM `ԣ`; SELECT `ã`,TRIM(LEADING '' FROM `ã`) FROM `ԣ`; @@ -179,7 +148,7 @@ SELECT `ã`,TRIM(LEADING '' FROM `ã`) FROM `ԣ`; SELECT `ã`,TRIM(BOTH '' FROM `ã`) FROM `ԣ`; SELECT `ã`,TRIM(`ã`) FROM `ԣ`; -#HEAP +#MEMORY SELECT `ã`,TRIM(TRAILING '' FROM `ã`) FROM `ԣ`; SELECT `ã`,TRIM(LEADING '' FROM `ã`) FROM `ԣ`; SELECT `ã`,TRIM(BOTH '' FROM `ã`) FROM `ԣ`; @@ -193,20 +162,6 @@ SELECT `ã`,TRIM(LEADING '' FROM `ã`) FROM `ԣ`; SELECT `ã`,TRIM(BOTH '' FROM `ã`) FROM `ԣ`; SELECT `ã`,TRIM(`ã`) FROM `ԣ`; -#BDB -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 `ԣ`; @@ -216,6 +171,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/t/jp_trim_ujis.test b/mysql-test/suite/jp/t/jp_trim_ujis.test index de401217fcf..658d066d5df 100644 --- a/mysql-test/suite/jp/t/jp_trim_ujis.test +++ b/mysql-test/suite/jp/t/jp_trim_ujis.test @@ -1,4 +1,5 @@ --source include/have_ujis.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `ԣ`; @@ -10,7 +11,6 @@ drop table if exists `ԣ`; drop table if exists `ԣ`; drop table if exists `ԣ`; drop table if exists `ԣ`; -drop table if exists `ԣ`; --enable_warnings # @@ -26,12 +26,9 @@ CREATE TABLE `ԣ` (`ã` char(12), INDEX(`ã`)) DEFAULT CHARSET = ujis engi CREATE TABLE `ԣ` (`ã` char(12), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = myisam; CREATE TABLE `ԣ` (`ã` char(12), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = myisam; CREATE TABLE `ԣ` (`ã` char(12), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = myisam; -CREATE TABLE `ԣ` (`ã` char(12), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` char(12), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` char(12), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` char(12), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = bdb; -CREATE TABLE `ԣ` (`ã` char(12), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = bdb; -CREATE TABLE `ԣ` (`ã` char(12), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = bdb; +CREATE TABLE `ԣ` (`ã` char(12), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(12), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(12), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = MEMORY; # Nothing to trim INSERT INTO `ԣ` VALUES (''); @@ -122,34 +119,6 @@ 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 (''); -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 (' ݏޏߏ '); - #InnoDB SELECT `ã`,TRIM(TRAILING '' FROM `ã`) FROM `ԣ`; SELECT `ã`,TRIM(LEADING '' FROM `ã`) FROM `ԣ`; @@ -178,7 +147,7 @@ SELECT `ã`,TRIM(LEADING '' FROM `ã`) FROM `ԣ`; SELECT `ã`,TRIM(BOTH '' FROM `ã`) FROM `ԣ`; SELECT `ã`,TRIM(`ã`) FROM `ԣ`; -#HEAP +#MEMORY SELECT `ã`,TRIM(TRAILING '' FROM `ã`) FROM `ԣ`; SELECT `ã`,TRIM(LEADING '' FROM `ã`) FROM `ԣ`; SELECT `ã`,TRIM(BOTH '' FROM `ã`) FROM `ԣ`; @@ -192,20 +161,6 @@ SELECT `ã`,TRIM(LEADING '' FROM `ã`) FROM `ԣ`; SELECT `ã`,TRIM(BOTH '' FROM `ã`) FROM `ԣ`; SELECT `ã`,TRIM(`ã`) FROM `ԣ`; -#BDB -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 `ԣ`; @@ -215,6 +170,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/t/jp_trim_utf8.test b/mysql-test/suite/jp/t/jp_trim_utf8.test index 0777de15c36..fd258869b9f 100644 --- a/mysql-test/suite/jp/t/jp_trim_utf8.test +++ b/mysql-test/suite/jp/t/jp_trim_utf8.test @@ -1,3 +1,5 @@ +--source include/have_utf8.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `Ｔ１`; drop table if exists `Ｔ２`; @@ -8,7 +10,6 @@ drop table if exists `Ｔ６`; drop table if exists `Ｔ７`; drop table if exists `Ｔ８`; drop table if exists `Ｔ９`; -drop table if exists `Ｔ１０`; --enable_warnings # @@ -24,12 +25,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf CREATE TABLE `Ｔ４` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam; CREATE TABLE `Ｔ５` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam; CREATE TABLE `Ｔ６` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam; -CREATE TABLE `Ｔ７` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ８` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ９` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ１０` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb; -CREATE TABLE `Ｔ１１` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb; -CREATE TABLE `Ｔ１２` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb; +CREATE TABLE `Ｔ７` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ８` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ９` (`Ｃ１` char(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY; # Nothing to trim INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'); @@ -120,34 +118,6 @@ 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 ('かかかあいうえお'); -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 (' 龔龖龗龞龡 '); - #InnoDB SELECT `Ｃ１`,TRIM(TRAILING 'ｶ' FROM `Ｃ１`) FROM `Ｔ１`; SELECT `Ｃ１`,TRIM(LEADING 'ｶ' FROM `Ｃ１`) FROM `Ｔ１`; @@ -176,7 +146,7 @@ SELECT `Ｃ１`,TRIM(LEADING '丂' FROM `Ｃ１`) FROM `Ｔ６`; SELECT `Ｃ１`,TRIM(BOTH '丂' FROM `Ｃ１`) FROM `Ｔ６`; SELECT `Ｃ１`,TRIM(`Ｃ１`) FROM `Ｔ６`; -#HEAP +#MEMORY SELECT `Ｃ１`,TRIM(TRAILING 'ｶ' FROM `Ｃ１`) FROM `Ｔ７`; SELECT `Ｃ１`,TRIM(LEADING 'ｶ' FROM `Ｃ１`) FROM `Ｔ７`; SELECT `Ｃ１`,TRIM(BOTH 'ｶ' FROM `Ｃ１`) FROM `Ｔ７`; @@ -190,20 +160,6 @@ SELECT `Ｃ１`,TRIM(LEADING '丂' FROM `Ｃ１`) FROM `Ｔ９`; SELECT `Ｃ１`,TRIM(BOTH '丂' FROM `Ｃ１`) FROM `Ｔ９`; SELECT `Ｃ１`,TRIM(`Ｃ１`) FROM `Ｔ９`; -#BDB -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 `Ｔ３`; @@ -213,6 +169,3 @@ DROP TABLE `Ｔ６`; DROP TABLE `Ｔ７`; DROP TABLE `Ｔ８`; DROP TABLE `Ｔ９`; -DROP TABLE `Ｔ１０`; -DROP TABLE `Ｔ１１`; -DROP TABLE `Ｔ１２`; diff --git a/mysql-test/suite/jp/t/jp_union_ujis.test b/mysql-test/suite/jp/t/jp_union_ujis.test index e36d18c85c0..73c9c6607ad 100644 --- a/mysql-test/suite/jp/t/jp_union_ujis.test +++ b/mysql-test/suite/jp/t/jp_union_ujis.test @@ -1,4 +1,5 @@ --source include/have_ujis.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `ԣ`; @@ -10,9 +11,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 `ԣ`; --enable_warnings # @@ -70,34 +68,10 @@ DROP TABLE `ԣ` ; DROP TABLE `ԣ` ; DROP TABLE `ԣ` ; -#HEAP -CREATE TABLE `ԣ` (`ã` char(1), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = HEAP; -CREATE TABLE `ԣ` (`ã` char(1), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = HEAP; -CREATE TABLE `ԣ` (`ã` char(1), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = HEAP; -INSERT INTO `ԣ` VALUES(''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES(''),(''),(''),(''),(''),(''); -INSERT INTO `ԣ` VALUES(''),(''),(''),(''),(''),(''); -SELECT * FROM `ԣ` UNION DISTINCT SELECT * FROM `ԣ` ORDER BY `ã`; -SELECT * FROM `ԣ` UNION ALL SELECT * FROM `ԣ` ORDER BY `ã`; -(SELECT * FROM `ԣ`) UNION (SELECT * FROM `ԣ`) UNION (SELECT '') ORDER BY `ã`; -(SELECT '' AS `ã`) UNION (SELECT * FROM `ԣ`) UNION (SELECT * FROM `ԣ`) ORDER BY `ã`; -SELECT `ã`, COUNT(*) FROM `ԣ` GROUP BY `ã` UNION -SELECT `ã`, COUNT(*) FROM `ԣ` GROUP BY `ã` ORDER BY `ã`; -SELECT * FROM `ԣ` UNION DISTINCT -SELECT * FROM `ԣ` UNION ALL -SELECT * FROM `ԣ` ORDER BY `ã`; -SELECT * FROM `ԣ` UNION ALL -SELECT * FROM `ԣ` UNION DISTINCT -SELECT * FROM `ԣ` ORDER BY `ã`; -SELECT * FROM `ԣ` UNION SELECT REPEAT(`ã`,5) FROM `ԣ` ORDER BY `ã`; -DROP TABLE `ԣ` ; -DROP TABLE `ԣ` ; -DROP TABLE `ԣ` ; - -#BDB -CREATE TABLE `ԣ` (`ã` char(1), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = BDB; -CREATE TABLE `ԣ` (`ã` char(1), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = BDB; -CREATE TABLE `ԣ` (`ã` char(1), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = BDB; +#MEMORY +CREATE TABLE `ԣ` (`ã` char(1), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(1), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(1), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = MEMORY; INSERT INTO `ԣ` VALUES(''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES(''),(''),(''),(''),(''),(''); INSERT INTO `ԣ` VALUES(''),(''),(''),(''),(''),(''); diff --git a/mysql-test/suite/jp/t/jp_update_sjis.test b/mysql-test/suite/jp/t/jp_update_sjis.test index 0dc7372ae92..b977df5fb8a 100644 --- a/mysql-test/suite/jp/t/jp_update_sjis.test +++ b/mysql-test/suite/jp/t/jp_update_sjis.test @@ -1,3 +1,5 @@ +--source include/have_sjis.inc +--source include/have_innodb.inc --character_set sjis --disable_warnings drop table if exists `sP`; @@ -9,9 +11,6 @@ drop table if exists `sU`; 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`; --enable_warnings # @@ -27,12 +26,9 @@ CREATE TABLE `sR` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engin CREATE TABLE `sS` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sT` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sU` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; -CREATE TABLE `sV` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sW` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sX` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPO` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPP` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPQ` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; +CREATE TABLE `sV` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sW` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sX` (`bP` char(5), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; INSERT INTO `sP` VALUES (''); INSERT INTO `sQ` VALUES (''); @@ -43,9 +39,6 @@ INSERT INTO `sU` VALUES ('\\\\\'); INSERT INTO `sV` VALUES (''); INSERT INTO `sW` VALUES (''); INSERT INTO `sX` VALUES ('\\\\\'); -INSERT INTO `sPO` VALUES (''); -INSERT INTO `sPP` VALUES (''); -INSERT INTO `sPQ` VALUES ('\\\\\'); UPDATE `sP` SET `bP` = (''); UPDATE `sQ` SET `bP` = (''); @@ -56,9 +49,6 @@ UPDATE `sU` SET `bP` = ('\\\\\'); UPDATE `sV` SET `bP` = (''); UPDATE `sW` SET `bP` = (''); UPDATE `sX` SET `bP` = ('\\\\\'); -UPDATE `sPO` SET `bP` = (''); -UPDATE `sPP` SET `bP` = (''); -UPDATE `sPQ` SET `bP` = ('\\\\\'); #InnoDB SELECT * FROM `sP`; @@ -70,16 +60,11 @@ SELECT * FROM `sS`; SELECT * FROM `sT`; SELECT * FROM `sU`; -#HEAP +#MEMORY SELECT * FROM `sV`; SELECT * FROM `sW`; SELECT * FROM `sX`; -#BDB -SELECT * FROM `sPO`; -SELECT * FROM `sPP`; -SELECT * FROM `sPQ`; - DROP TABLE `sP`; DROP TABLE `sQ`; DROP TABLE `sR`; @@ -89,6 +74,3 @@ DROP TABLE `sU`; DROP TABLE `sV`; DROP TABLE `sW`; DROP TABLE `sX`; -DROP TABLE `sPO`; -DROP TABLE `sPP`; -DROP TABLE `sPQ`; diff --git a/mysql-test/suite/jp/t/jp_update_ucs2.test b/mysql-test/suite/jp/t/jp_update_ucs2.test index 7a3c1233210..33a5ce63f96 100644 --- a/mysql-test/suite/jp/t/jp_update_ucs2.test +++ b/mysql-test/suite/jp/t/jp_update_ucs2.test @@ -1,4 +1,5 @@ --source include/have_ucs2.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `ԣ`; @@ -10,9 +11,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 `ԣ`; --enable_warnings # @@ -29,12 +27,9 @@ CREATE TABLE `ԣ` (`ã` char(5), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engin 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 (''); @@ -45,9 +40,6 @@ INSERT INTO `ԣ` VALUES ('ݏޏߏ'); INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES ('ݏޏߏ'); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'); UPDATE `ԣ` SET `ã` = (''); UPDATE `ԣ` SET `ã` = (''); @@ -58,9 +50,6 @@ UPDATE `ԣ` SET `ã` = ('ȏɏʏˏ'); UPDATE `ԣ` SET `ã` = (''); UPDATE `ԣ` SET `ã` = (''); UPDATE `ԣ` SET `ã` = ('ȏɏʏˏ'); -UPDATE `ԣ` SET `ã` = (''); -UPDATE `ԣ` SET `ã` = (''); -UPDATE `ԣ` SET `ã` = ('ȏɏʏˏ'); #InnoDB SELECT * FROM `ԣ`; @@ -72,16 +61,11 @@ SELECT * FROM `ԣ`; SELECT * FROM `ԣ`; SELECT * FROM `ԣ`; -#HEAP +#MEMORY SELECT * FROM `ԣ`; SELECT * FROM `ԣ`; SELECT * FROM `ԣ`; -#BDB -SELECT * FROM `ԣ`; -SELECT * FROM `ԣ`; -SELECT * FROM `ԣ`; - DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -91,6 +75,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/t/jp_update_ujis.test b/mysql-test/suite/jp/t/jp_update_ujis.test index 852e45b9eeb..3ba009469b2 100644 --- a/mysql-test/suite/jp/t/jp_update_ujis.test +++ b/mysql-test/suite/jp/t/jp_update_ujis.test @@ -1,4 +1,5 @@ --source include/have_ujis.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `ԣ`; @@ -10,9 +11,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 `ԣ`; --enable_warnings # @@ -28,12 +26,9 @@ CREATE TABLE `ԣ` (`ã` char(5), INDEX(`ã`)) DEFAULT CHARSET = ujis engin 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 (''); @@ -44,9 +39,6 @@ INSERT INTO `ԣ` VALUES ('ݏޏߏ'); INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES (''); INSERT INTO `ԣ` VALUES ('ݏޏߏ'); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES (''); -INSERT INTO `ԣ` VALUES ('ݏޏߏ'); UPDATE `ԣ` SET `ã` = (''); UPDATE `ԣ` SET `ã` = (''); @@ -57,9 +49,6 @@ UPDATE `ԣ` SET `ã` = ('ȏɏʏˏ'); UPDATE `ԣ` SET `ã` = (''); UPDATE `ԣ` SET `ã` = (''); UPDATE `ԣ` SET `ã` = ('ȏɏʏˏ'); -UPDATE `ԣ` SET `ã` = (''); -UPDATE `ԣ` SET `ã` = (''); -UPDATE `ԣ` SET `ã` = ('ȏɏʏˏ'); #InnoDB SELECT * FROM `ԣ`; @@ -71,16 +60,11 @@ SELECT * FROM `ԣ`; SELECT * FROM `ԣ`; SELECT * FROM `ԣ`; -#HEAP +#MEMORY SELECT * FROM `ԣ`; SELECT * FROM `ԣ`; SELECT * FROM `ԣ`; -#BDB -SELECT * FROM `ԣ`; -SELECT * FROM `ԣ`; -SELECT * FROM `ԣ`; - DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -90,6 +74,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/t/jp_update_utf8.test b/mysql-test/suite/jp/t/jp_update_utf8.test index b4b3d18ecab..8dbd046a125 100644 --- a/mysql-test/suite/jp/t/jp_update_utf8.test +++ b/mysql-test/suite/jp/t/jp_update_utf8.test @@ -1,3 +1,5 @@ +--source include/have_utf8.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `Ｔ１`; drop table if exists `Ｔ２`; @@ -8,9 +10,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 `Ｔ１２`; --enable_warnings # @@ -26,12 +25,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 ('あいうえお'); @@ -42,9 +38,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡'); INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'); INSERT INTO `Ｔ８` VALUES ('あいうえお'); INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡'); -INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'); -INSERT INTO `Ｔ１１` VALUES ('あいうえお'); -INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡'); UPDATE `Ｔ１` SET `Ｃ１` = ('ｶｷｸｹｺ'); UPDATE `Ｔ２` SET `Ｃ１` = ('かきくけこ'); @@ -55,9 +48,6 @@ UPDATE `Ｔ６` SET `Ｃ１` = ('齗齘齚齝齞'); UPDATE `Ｔ７` SET `Ｃ１` = ('ｶｷｸｹｺ'); UPDATE `Ｔ８` SET `Ｃ１` = ('かきくけこ'); UPDATE `Ｔ９` SET `Ｃ１` = ('齗齘齚齝齞'); -UPDATE `Ｔ１０` SET `Ｃ１` = ('ｶｷｸｹｺ'); -UPDATE `Ｔ１１` SET `Ｃ１` = ('かきくけこ'); -UPDATE `Ｔ１２` SET `Ｃ１` = ('齗齘齚齝齞'); #InnoDB SELECT * FROM `Ｔ１`; @@ -69,16 +59,11 @@ SELECT * FROM `Ｔ４`; SELECT * FROM `Ｔ５`; SELECT * FROM `Ｔ６`; -#HEAP +#MEMORY SELECT * FROM `Ｔ７`; SELECT * FROM `Ｔ８`; SELECT * FROM `Ｔ９`; -#BDB -SELECT * FROM `Ｔ１０`; -SELECT * FROM `Ｔ１１`; -SELECT * FROM `Ｔ１２`; - DROP TABLE `Ｔ１`; DROP TABLE `Ｔ２`; DROP TABLE `Ｔ３`; @@ -88,6 +73,3 @@ DROP TABLE `Ｔ６`; DROP TABLE `Ｔ７`; DROP TABLE `Ｔ８`; DROP TABLE `Ｔ９`; -DROP TABLE `Ｔ１０`; -DROP TABLE `Ｔ１１`; -DROP TABLE `Ｔ１２`; diff --git a/mysql-test/suite/jp/t/jp_where_sjis.test b/mysql-test/suite/jp/t/jp_where_sjis.test index 452d137f643..374905727d5 100644 --- a/mysql-test/suite/jp/t/jp_where_sjis.test +++ b/mysql-test/suite/jp/t/jp_where_sjis.test @@ -1,3 +1,5 @@ +--source include/have_sjis.inc +--source include/have_innodb.inc --character_set sjis --disable_warnings drop table if exists `sP`; @@ -9,9 +11,6 @@ drop table if exists `sU`; 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`; --enable_warnings # @@ -27,12 +26,9 @@ CREATE TABLE `sR` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engi CREATE TABLE `sS` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sT` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; CREATE TABLE `sU` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = myisam; -CREATE TABLE `sV` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sW` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sX` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = heap; -CREATE TABLE `sPO` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPP` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; -CREATE TABLE `sPQ` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = bdb; +CREATE TABLE `sV` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sW` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; +CREATE TABLE `sX` (`bP` char(20), INDEX(`bP`)) DEFAULT CHARSET = sjis engine = MEMORY; #Load the following data in each table # jisx0201 hankaku-katakana data @@ -48,9 +44,6 @@ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `sU`; 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`; #InnoDB SELECT * FROM `sP` WHERE `bP` = ''; @@ -62,33 +55,32 @@ SELECT * FROM `sS` WHERE `bP` = ''; SELECT * FROM `sT` WHERE `bP` = 'E'; SELECT * FROM `sU` WHERE `bP` = '\\\\\\\\\\\\\\\\\\\\'; -#Heap +#MEMORY SELECT * FROM `sV` WHERE `bP` = ''; SELECT * FROM `sW` WHERE `bP` = 'E'; SELECT * FROM `sX` WHERE `bP` = '\\\\\\\\\\\\\\\\\\\\'; -#BDB -SELECT * FROM `sPO` WHERE `bP` = ''; -SELECT * FROM `sPP` WHERE `bP` = 'E'; -SELECT * FROM `sPQ` WHERE `bP` = '\\\\\\\\\\\\\\\\\\\\'; - #Test to distinguish 0x9353 and 0x9373 +--disable_warnings +DROP TABLE IF EXISTS t1; +DROP TABLE IF EXISTS t2; +DROP TABLE IF EXISTS t3; +--enable_warnings CREATE TABLE t1(c1 char(1)) default charset = sjis engine=innodb; CREATE TABLE t2(c1 char(1)) default charset = sjis engine=myisam; -CREATE TABLE t3(c1 char(1)) default charset = sjis engine=heap; -CREATE TABLE t4(c1 char(1)) default charset = sjis engine=bdb; +CREATE TABLE t3(c1 char(1)) default charset = sjis engine=MEMORY; INSERT INTO t1 VALUES('S'),('s'); INSERT INTO t2 VALUES('S'),('s'); INSERT INTO t3 VALUES('S'),('s'); -INSERT INTO t4 VALUES('S'),('s'); SELECT * FROM t1 WHERE c1 = 'S'; SELECT * FROM t2 WHERE c1 = 'S'; SELECT * FROM t3 WHERE c1 = 'S'; -SELECT * FROM t4 WHERE c1 = 'S'; SELECT * FROM t1 WHERE c1 = 's'; SELECT * FROM t2 WHERE c1 = 's'; SELECT * FROM t3 WHERE c1 = 's'; -SELECT * FROM t4 WHERE c1 = 's'; +DROP TABLE t1; +DROP TABLE t2; +DROP TABLE t3; DROP TABLE `sP`; DROP TABLE `sQ`; @@ -99,6 +91,3 @@ DROP TABLE `sU`; DROP TABLE `sV`; DROP TABLE `sW`; DROP TABLE `sX`; -DROP TABLE `sPO`; -DROP TABLE `sPP`; -DROP TABLE `sPQ`; diff --git a/mysql-test/suite/jp/t/jp_where_ucs2.test b/mysql-test/suite/jp/t/jp_where_ucs2.test index 3b82eacd615..7e035cd28f3 100644 --- a/mysql-test/suite/jp/t/jp_where_ucs2.test +++ b/mysql-test/suite/jp/t/jp_where_ucs2.test @@ -1,4 +1,5 @@ --source include/have_ucs2.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `ԣ`; @@ -10,9 +11,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 `ԣ`; --enable_warnings # @@ -29,12 +27,9 @@ CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engi CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = myisam; CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = myisam; CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = myisam; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = heap; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = bdb; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = bdb; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = bdb; +CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ucs2 engine = MEMORY; #Insert the following data in each table # jisx0201 hankaku-katakana data @@ -116,31 +111,6 @@ INSERT INTO `ԣ` VALUES ,('ÏďŏƏ') ,('ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ'); -INSERT INTO `ԣ` VALUES - ('PQRSTUVWXYZ[\\]^_') -,(' ') -,('') -,('ÎĎŎƎǎȎɎʎˎ͎̎Ύ') -,('ЎюҎӎԎՎ֎؎َڎێݎގ'); - -INSERT INTO `ԣ` VALUES - ('¡áġšơ') -,('ȡɡʡˡ̡͡ΡϡСѡҡӡԡա֡סء١ڡ') -,('') -,('') -,('') -,('СТУФХЦЧШЩЪЫЬЭЮЯабвг') -,(''); - -INSERT INTO `ԣ` VALUES - ('Ïġ') -,('ÏďŏƏ') -,('ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ') -,('ݏޏߏᏰ⏰㏰䏰台揰珰菰鏰ꏰ돰쏰폰') -,('') -,('ÏďŏƏ') -,('ȏɏʏˏ̏͏ΏϏЏяҏӏԏՏ֏؏ُڏ'); - #InnoDB SELECT * FROM `ԣ` WHERE `ã` = ''; SELECT * FROM `ԣ` WHERE `ã` = ''; @@ -151,16 +121,11 @@ SELECT * FROM `ԣ` WHERE `ã` = ''; SELECT * FROM `ԣ` WHERE `ã` = ''; SELECT * FROM `ԣ` WHERE `ã` = 'ÏďŏƏ'; -#Heap +#MEMORY SELECT * FROM `ԣ` WHERE `ã` = ''; SELECT * FROM `ԣ` WHERE `ã` = ''; SELECT * FROM `ԣ` WHERE `ã` = 'ÏďŏƏ'; -#BDB -SELECT * FROM `ԣ` WHERE `ã` = ''; -SELECT * FROM `ԣ` WHERE `ã` = ''; -SELECT * FROM `ԣ` WHERE `ã` = 'ÏďŏƏ'; - DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -170,6 +135,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/t/jp_where_ujis.test b/mysql-test/suite/jp/t/jp_where_ujis.test index e96404fbb17..ce39e2670da 100644 --- a/mysql-test/suite/jp/t/jp_where_ujis.test +++ b/mysql-test/suite/jp/t/jp_where_ujis.test @@ -1,4 +1,5 @@ --source include/have_ujis.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `ԣ`; @@ -10,9 +11,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 `ԣ`; --enable_warnings # @@ -28,12 +26,9 @@ CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engi CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = myisam; CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = myisam; CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = myisam; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = heap; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = bdb; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = bdb; -CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = bdb; +CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = MEMORY; +CREATE TABLE `ԣ` (`ã` char(20), INDEX(`ã`)) DEFAULT CHARSET = ujis engine = MEMORY; #Load the following data in each table # jisx0201 hankaku-katakana data @@ -49,9 +44,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 `ԣ`; #InnoDB SELECT * FROM `ԣ` WHERE `ã` = ''; @@ -63,16 +55,11 @@ SELECT * FROM `ԣ` WHERE `ã` = ''; SELECT * FROM `ԣ` WHERE `ã` = ''; SELECT * FROM `ԣ` WHERE `ã` = 'ÏďŏƏ'; -#Heap +#MEMORY SELECT * FROM `ԣ` WHERE `ã` = ''; SELECT * FROM `ԣ` WHERE `ã` = ''; SELECT * FROM `ԣ` WHERE `ã` = 'ÏďŏƏ'; -#BDB -SELECT * FROM `ԣ` WHERE `ã` = ''; -SELECT * FROM `ԣ` WHERE `ã` = ''; -SELECT * FROM `ԣ` WHERE `ã` = 'ÏďŏƏ'; - DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; @@ -82,6 +69,3 @@ DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; -DROP TABLE `ԣ`; diff --git a/mysql-test/suite/jp/t/jp_where_utf8.test b/mysql-test/suite/jp/t/jp_where_utf8.test index 7280bc33f21..97234ff15c5 100644 --- a/mysql-test/suite/jp/t/jp_where_utf8.test +++ b/mysql-test/suite/jp/t/jp_where_utf8.test @@ -1,3 +1,5 @@ +--source include/have_utf8.inc +--source include/have_innodb.inc --disable_warnings drop table if exists `Ｔ１`; drop table if exists `Ｔ２`; @@ -8,13 +10,10 @@ 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 `Ｔ１２`; --enable_warnings # -# Test Displaying Japanese charact using WHERE condtion in utf8 encoding +# Test Displaying Japanese charact using WHERE condition in utf8 encoding # SET NAMES utf8; @@ -26,12 +25,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf CREATE TABLE `Ｔ４` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam; CREATE TABLE `Ｔ５` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam; CREATE TABLE `Ｔ６` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam; -CREATE TABLE `Ｔ７` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ８` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ９` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap; -CREATE TABLE `Ｔ１０` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb; -CREATE TABLE `Ｔ１１` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb; -CREATE TABLE `Ｔ１２` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb; +CREATE TABLE `Ｔ７` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ８` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY; +CREATE TABLE `Ｔ９` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY; #Load the following data in each table # jisx0201 hankaku-katakana data @@ -47,9 +43,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 `Ｔ１２`; #InnoDB SELECT * FROM `Ｔ１` WHERE `Ｃ１` = 'ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ'; @@ -61,16 +54,11 @@ SELECT * FROM `Ｔ４` WHERE `Ｃ１` = 'ｰｱｲｳｴｵｶｷｸｹｺｻｼ SELECT * FROM `Ｔ５` WHERE `Ｃ１` = '・ぁあぃいぅうぇえぉおかがきぎくぐけげこ'; SELECT * FROM `Ｔ６` WHERE `Ｃ１` = '鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖'; -#Heap +#MEMORY SELECT * FROM `Ｔ７` WHERE `Ｃ１` = 'ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ'; SELECT * FROM `Ｔ８` WHERE `Ｃ１` = '・ぁあぃいぅうぇえぉおかがきぎくぐけげこ'; SELECT * FROM `Ｔ９` WHERE `Ｃ１` = '鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖'; -#BDB -SELECT * FROM `Ｔ１０` WHERE `Ｃ１` = 'ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ'; -SELECT * FROM `Ｔ１１` WHERE `Ｃ１` = '・ぁあぃいぅうぇえぉおかがきぎくぐけげこ'; -SELECT * FROM `Ｔ１２` WHERE `Ｃ１` = '鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖'; - DROP TABLE `Ｔ１`; DROP TABLE `Ｔ２`; DROP TABLE `Ｔ３`; @@ -80,6 +68,3 @@ DROP TABLE `Ｔ６`; DROP TABLE `Ｔ７`; DROP TABLE `Ｔ８`; DROP TABLE `Ｔ９`; -DROP TABLE `Ｔ１０`; -DROP TABLE `Ｔ１１`; -DROP TABLE `Ｔ１２`; diff --git a/mysql-test/suite/rpl/r/rpl_insert_id.result b/mysql-test/suite/rpl/r/rpl_insert_id.result index b0c1b6cfd73..3aa92009f5e 100644 --- a/mysql-test/suite/rpl/r/rpl_insert_id.result +++ b/mysql-test/suite/rpl/r/rpl_insert_id.result @@ -15,8 +15,8 @@ reset master; reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; -create table t1(a int auto_increment, key(a)); -create table t2(b int auto_increment, c int, key(b)); +create table t1(a int auto_increment, key(a)) engine=innodb; +create table t2(b int auto_increment, c int, key(b)) engine=innodb; insert into t1 values (1),(2),(3); insert into t1 values (null); insert into t2 values (null,last_insert_id()); @@ -54,8 +54,8 @@ b c # 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)); +create table t1(a int auto_increment, key(a)) engine=innodb; +create table t2(b int auto_increment, c int, key(b)) engine=innodb; insert into t1 values (10); insert into t1 values (null),(null),(null); insert into t2 values (5,0); @@ -87,7 +87,7 @@ drop table t2; # FOREIGN_KEY_CHECKS # SET TIMESTAMP=1000000000; -CREATE TABLE t1 ( a INT UNIQUE ); +CREATE TABLE t1 ( a INT UNIQUE ) engine=innodb; SET FOREIGN_KEY_CHECKS=0; INSERT INTO t1 VALUES (1),(1); Got one of the listed errors @@ -95,8 +95,8 @@ drop table t1; # # Bug#14553: NULL in WHERE resets LAST_INSERT_ID # -create table t1(a int auto_increment, key(a)); -create table t2(a int); +create table t1(a int auto_increment, key(a)) engine=innodb; +create table t2(a int) engine=innodb; 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; @@ -123,7 +123,7 @@ create table t1 ( id int not null auto_increment, last_id int, primary key (id) -); +) engine=innodb; create function bug15728() returns int(11) return last_insert_id(); insert into t1 (last_id) values (0); @@ -133,7 +133,7 @@ create table t2 ( id int not null auto_increment, last_id int, primary key (id) -); +) engine=innodb; create function bug15728_insert() returns int(11) modifies sql data begin insert into t2 (last_id) values (bug15728()); @@ -199,7 +199,7 @@ drop function bug15728_insert; drop table t1,t2; drop procedure foo; create table t1 (n int primary key auto_increment not null, -b int, unique(b)); +b int, unique(b)) engine=innodb; set sql_log_bin=0; insert into t1 values(null,100); replace into t1 values(null,50),(null,100),(null,150); @@ -243,7 +243,7 @@ n b 1001 600 drop table t1; create table t1 (n int primary key auto_increment not null, -b int, unique(b)); +b int, unique(b)) engine=innodb; insert into t1 values(null,100); select * from t1 order by n; n b @@ -264,13 +264,13 @@ n b 3 350 drop table t1; CREATE TABLE t1 (a INT NOT NULL PRIMARY KEY AUTO_INCREMENT, b INT, -UNIQUE(b)); +UNIQUE(b)) ENGINE=innodb; INSERT INTO t1(b) VALUES(1),(1),(2) ON DUPLICATE KEY UPDATE t1.b=10; -SELECT * FROM t1; +SELECT * FROM t1 ORDER BY a; a b 1 10 2 2 -SELECT * FROM t1; +SELECT * FROM t1 ORDER BY a; a b 1 10 2 2 @@ -282,12 +282,12 @@ field_2 varchar(255) NOT NULL, field_3 varchar(255) NOT NULL, PRIMARY KEY (id), UNIQUE KEY field_1 (field_1, field_2) -); +) ENGINE=innodb; CREATE TABLE t2 ( field_a int(10) unsigned NOT NULL, field_b varchar(255) NOT NULL, field_c varchar(255) NOT NULL -); +) ENGINE=innodb; 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'); @@ -304,7 +304,7 @@ 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; id field_1 field_2 field_3 1 1 a 1a 2 2 b 2b @@ -312,7 +312,7 @@ id field_1 field_2 field_3 4 4 d 4d 5 5 e 5e 6 6 f 6f -SELECT * FROM t1; +SELECT * FROM t1 ORDER BY id; id field_1 field_2 field_3 1 1 a 1a 2 2 b 2b @@ -330,28 +330,28 @@ CREATE TABLE t1 ( id INT NOT NULL DEFAULT 0, last_id INT, PRIMARY KEY (id) -); +) ENGINE=innodb; CREATE TABLE t2 ( id INT NOT NULL AUTO_INCREMENT, last_id INT, PRIMARY KEY (id) -); +) ENGINE=innodb; CREATE PROCEDURE p1() BEGIN INSERT INTO t2 (last_id) VALUES (LAST_INSERT_ID()); INSERT INTO t1 (last_id) VALUES (LAST_INSERT_ID()); END| CALL p1(); -SELECT * FROM t1; +SELECT * FROM t1 ORDER BY id; id last_id 0 1 -SELECT * FROM t2; +SELECT * FROM t2 ORDER BY id; id last_id 1 0 -SELECT * FROM t1; +SELECT * FROM t1 ORDER BY id; id last_id 0 1 -SELECT * FROM t2; +SELECT * FROM t2 ORDER BY id; id last_id 1 0 DROP PROCEDURE p1; @@ -364,8 +364,8 @@ DROP TABLE IF EXISTS t1, t2; CREATE TABLE t1 ( i INT NOT NULL AUTO_INCREMENT PRIMARY KEY, j INT DEFAULT 0 -); -CREATE TABLE t2 (i INT); +) ENGINE=innodb; +CREATE TABLE t2 (i INT) ENGINE=innodb; CREATE PROCEDURE p1() BEGIN INSERT INTO t1 (i) VALUES (NULL); @@ -401,11 +401,14 @@ INSERT INTO t1 VALUES (NULL, LAST_INSERT_ID()), (NULL, LAST_INSERT_ID(5)), INSERT INTO t1 VALUES (NULL, 0), (NULL, LAST_INSERT_ID()); UPDATE t1 SET j= -1 WHERE i IS NULL; INSERT INTO t1 (i) VALUES (NULL); +SET @old_concurrent_insert= @@global.concurrent_insert; +SET @@global.concurrent_insert= 0; INSERT INTO t1 (i) VALUES (NULL); SELECT f3(); f3() 0 -SELECT * FROM t1; +SET @@global.concurrent_insert= @old_concurrent_insert; +SELECT * FROM t1 ORDER BY i; i j 1 -1 2 0 @@ -427,7 +430,7 @@ i j 18 14 19 0 20 0 -SELECT * FROM t2; +SELECT * FROM t2 ORDER BY i; i 2 3 @@ -475,9 +478,9 @@ create table t2 ( id int not null auto_increment, last_id int, primary key (id) -); +) engine=innodb; truncate table t2; -create table t1 (id tinyint primary key); +create table t1 (id tinyint primary key) engine=innodb; create function insid() returns int begin insert into t2 (last_id) values (0); @@ -495,17 +498,17 @@ 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 t1 order by id; id 0 -select * from t2; +select * from t2 order by id; id last_id 4 0 8 0 -select * from t1; +select * from t1 order by id; id 0 -select * from t2; +select * from t2 order by id; id last_id 4 0 8 0 @@ -513,7 +516,7 @@ drop table t1; drop function insid; truncate table t2; create table t1 (n int primary key auto_increment not null, -b int, unique(b)); +b int, unique(b)) engine=innodb; create procedure foo() begin insert into t1 values(null,10); @@ -522,16 +525,16 @@ insert ignore into t1 values(null,10); insert into t2 values(null,3); end| call foo(); -select * from t1; +select * from t1 order by n; n b 1 10 -select * from t2; +select * from t2 order by id; id last_id 1 3 -select * from t1; +select * from t1 order by n; n b 1 10 -select * from t2; +select * from t2 order by id; id last_id 1 3 drop table t1, t2; |