Commit 464c2de7 authored by mleich@five.local.lan's avatar mleich@five.local.lan
Browse files

Fix for 

  Bug#28563 Test suite "jp" fails completely
- The main goal of this fix is to make the "jp" suite runnable in general
  and to make it more robust for use in pushbuild under build team conditions.
- It was decided to fix the remaining heavy issues within the
  architecture of this test later
  (-> WL 4327 Redesign the 'jp' testsuite for build team testing conditions)
  Only the test jp_trim_sjis got some significant improvements of its
  architecture (Just as proof of concept for the other tests).
- Tests suffering from
     Bug 36597 Testsuite "jp": Suspicious results for some tests
               (unexpected result sets)
  were disabled
- *.opt files were used to avoid differences on OS (Windows) because of
  case sensitive tablenames within the tests
parent 742e84d7

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

0 → 100644
+70 −0
Original line number Diff line number Diff line 
#

# Test TRIM() function with Japanese characters sjis encoding

#



--source include/have_sjis.inc

--character_set sjis

SET NAMES sjis;

SET character_set_database = sjis;



--disable_warnings

DROP TABLE IF EXISTS `Ｔ１`;

DROP TABLE IF EXISTS `Ｔ２`;

DROP TABLE IF EXISTS `Ｔ３`;

--enable_warnings

--replace_result $engine <engine_to_be_tested>

eval CREATE TABLE `Ｔ１` (`Ｃ１` CHAR(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis ENGINE = $engine;

--replace_result $engine <engine_to_be_tested>

eval CREATE TABLE `Ｔ２` (`Ｃ１` CHAR(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis ENGINE = $engine;

--replace_result $engine <engine_to_be_tested>

eval CREATE TABLE `Ｔ３` (`Ｃ１` CHAR(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis ENGINE = $engine;



# Nothing to trim

INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');

# Test data for TRIM(TRAILING [remstr] FROM str)

INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵｶ');

INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵｶｶ');

INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵｶｶｶ');

# Test data for TRIM(LEADING [remstr] FROM str)

INSERT INTO `Ｔ１` VALUES ('ｶｱｲｳｴｵ');

INSERT INTO `Ｔ１` VALUES ('ｶｶｱｲｳｴｵ');

INSERT INTO `Ｔ１` VALUES ('ｶｶｶｱｲｳｴｵ');

# Test data for TRIM(BOTH [remstr] FROM str)

INSERT INTO `Ｔ１` VALUES ('ｶｶｶｱｲｳｴｵｶｶｶ');

# Test data for TRIM without [remstr] (remove spaces) 

INSERT INTO `Ｔ１` VALUES ('   ｱｲｳｴｵ   ');

INSERT INTO `Ｔ２` VALUES ('あいうえお');

INSERT INTO `Ｔ２` VALUES ('あいうえおか');

INSERT INTO `Ｔ２` VALUES ('あいうえおかか');

INSERT INTO `Ｔ２` VALUES ('あいうえおかかか');

INSERT INTO `Ｔ２` VALUES ('かあいうえお');

INSERT INTO `Ｔ２` VALUES ('かかあいうえお');

INSERT INTO `Ｔ２` VALUES ('かかかあいうえお');

INSERT INTO `Ｔ２` VALUES ('かかかあいうえおかかか');

INSERT INTO `Ｔ２` VALUES ('   あいうえお   ');

INSERT INTO `Ｔ３` VALUES ('ソ十表予構');

INSERT INTO `Ｔ３` VALUES ('ソ十表予構暴');

INSERT INTO `Ｔ３` VALUES ('ソ十表予構暴暴');

INSERT INTO `Ｔ３` VALUES ('ソ十表予構暴暴暴');

INSERT INTO `Ｔ３` VALUES ('暴ソ十表予構');

INSERT INTO `Ｔ３` VALUES ('暴暴ソ十表予構');

INSERT INTO `Ｔ３` VALUES ('暴暴暴ソ十表予構');

INSERT INTO `Ｔ３` VALUES ('暴暴暴ソ十表予構暴暴暴');

INSERT INTO `Ｔ３` VALUES ('   ソ十表予構   ');



SELECT `Ｃ１`,TRIM(TRAILING 'ｶ' FROM `Ｃ１`) FROM `Ｔ１`;

SELECT `Ｃ１`,TRIM(LEADING 'ｶ' FROM `Ｃ１`) FROM `Ｔ１`;

SELECT `Ｃ１`,TRIM(BOTH 'ｶ' FROM `Ｃ１`) FROM `Ｔ１`;

SELECT `Ｃ１`,TRIM(`Ｃ１`) FROM `Ｔ１`;

SELECT `Ｃ１`,TRIM(TRAILING 'か' FROM `Ｃ１`) FROM `Ｔ２`;

SELECT `Ｃ１`,TRIM(LEADING 'か' FROM `Ｃ１`) FROM `Ｔ２`;

SELECT `Ｃ１`,TRIM(BOTH 'か' FROM `Ｃ１`) FROM `Ｔ２`;

SELECT `Ｃ１`,TRIM(`Ｃ１`) FROM `Ｔ２`;

SELECT `Ｃ１`,TRIM(TRAILING '暴' FROM `Ｃ１`) FROM `Ｔ３`;

SELECT `Ｃ１`,TRIM(LEADING '暴' FROM `Ｃ１`) FROM `Ｔ３`;

SELECT `Ｃ１`,TRIM(BOTH '暴' FROM `Ｃ１`) FROM `Ｔ３`;

SELECT `Ｃ１`,TRIM(`Ｃ１`) FROM `Ｔ３`;



DROP TABLE `Ｔ１`;

DROP TABLE `Ｔ２`;

DROP TABLE `Ｔ３`;

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

+93 −246
Original line number Diff line number Diff line
@@ -31,16 +31,16 @@ 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,

  `ｶｶ` char(1) DEFAULT NULL,

  `ｷｷｷ` char(6) NOT NULL DEFAULT '',

  `ｸｸｸ` char(1) DEFAULT NULL,

  `ｹｹｹ` char(1) DEFAULT NULL,

  PRIMARY KEY (`ｷｷｷ`),

  UNIQUE KEY `ｸｸｸ` (`ｸｸｸ`),

  KEY `ｶｶｶ` (`ｶｶ`)
@@ -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,16 +80,16 @@ 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,

  `かか` char(1) DEFAULT NULL,

  `ききき` char(6) NOT NULL DEFAULT '',

  `くくく` char(1) DEFAULT NULL,

  `けけけ` char(1) DEFAULT NULL,

  PRIMARY KEY (`ききき`),

  UNIQUE KEY `くくく` (`くくく`),

  KEY `かかか` (`かか`)
@@ -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,16 +129,16 @@ 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,

  `構構` char(1) DEFAULT NULL,

  `表表表` char(6) NOT NULL DEFAULT '',

  `能能能` char(1) DEFAULT NULL,

  `予予予` char(1) DEFAULT NULL,

  PRIMARY KEY (`表表表`),

  UNIQUE KEY `能能能` (`能能能`),

  KEY `構構構` (`構構`)
@@ -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,16 +193,16 @@ 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,

  `ｶｶ` char(1) DEFAULT NULL,

  `ｷｷｷ` char(6) NOT NULL DEFAULT '',

  `ｸｸｸ` char(1) DEFAULT NULL,

  `ｹｹｹ` char(1) DEFAULT NULL,

  PRIMARY KEY (`ｷｷｷ`),

  UNIQUE KEY `ｸｸｸ` (`ｸｸｸ`),

  KEY `ｶｶｶ` (`ｶｶ`)
@@ -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,16 +242,16 @@ 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,

  `かか` char(1) DEFAULT NULL,

  `ききき` char(6) NOT NULL DEFAULT '',

  `くくく` char(1) DEFAULT NULL,

  `けけけ` char(1) DEFAULT NULL,

  PRIMARY KEY (`ききき`),

  UNIQUE KEY `くくく` (`くくく`),

  KEY `かかか` (`かか`)
@@ -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,16 +291,16 @@ 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,

  `構構` char(1) DEFAULT NULL,

  `表表表` char(6) NOT NULL DEFAULT '',

  `能能能` char(1) DEFAULT NULL,

  `予予予` char(1) DEFAULT NULL,

  PRIMARY KEY (`表表表`),

  UNIQUE KEY `能能能` (`能能能`),

  KEY `構構構` (`構構`)
@@ -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 
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,

  `ｶｶ` 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 
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,

  `かか` 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 
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,

  `構構` 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 `あああ`;

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

+93 −246

File changed.

Preview size limit exceeded, changes collapsed.

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

+93 −246

File changed.

Preview size limit exceeded, changes collapsed.

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

+93 −246

File changed.

Preview size limit exceeded, changes collapsed.