autocommit

client/mysqltest.c

@@ -1406,7 +1406,7 @@ void show_diff(DYNAMIC_STRING* ds,
   else
     diff_name = 0;
 #else
-  diff_name = "diff";           // Otherwise always assume it's called diff
+  diff_name = "diff";           /* Otherwise always assume it's called diff */
 #endif
 
   if (diff_name)

configure.in

@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc)
 AC_CANONICAL_SYSTEM
 # The Docs Makefile.am parses this line!
 # remember to also change ndb version below and update version.c in ndb
-AM_INIT_AUTOMAKE(mysql, 5.0.86)
+AM_INIT_AUTOMAKE(mysql, 5.0.87)
 AM_CONFIG_HEADER([include/config.h:config.h.in])
 
 PROTOCOL_VERSION=10
@@ -23,7 +23,7 @@ NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_MAJOR_VERSION:0:0
 # ndb version
 NDB_VERSION_MAJOR=5
 NDB_VERSION_MINOR=0
-NDB_VERSION_BUILD=86
+NDB_VERSION_BUILD=87
 NDB_VERSION_STATUS=""
 
 # Set all version vars based on $VERSION. How do we do this more elegant ?

heap/hp_write.c

@@ -196,13 +196,10 @@ int hp_write_key(HP_INFO *info, HP_KEYDEF *keyinfo,
   HP_SHARE *share = info->s;
   int flag;
   ulong halfbuff,hashnr,first_index;
-  byte *ptr_to_rec,*ptr_to_rec2;
-  HASH_INFO *empty,*gpos,*gpos2,*pos;
+  byte *UNINIT_VAR(ptr_to_rec),*UNINIT_VAR(ptr_to_rec2);
+  HASH_INFO *empty,*UNINIT_VAR(gpos),*UNINIT_VAR(gpos2),*pos;
   DBUG_ENTER("hp_write_key");
 
-  LINT_INIT(gpos); LINT_INIT(gpos2);
-  LINT_INIT(ptr_to_rec); LINT_INIT(ptr_to_rec2);
-
   flag=0;
   if (!(empty= hp_find_free_hash(share,&keyinfo->block,share->records)))
     DBUG_RETURN(-1);				/* No more memory */

include/keycache.h

@@ -44,6 +44,7 @@ typedef struct st_keycache_wqueue
 typedef struct st_key_cache
 {
   my_bool key_cache_inited;
+  my_bool in_resize;             /* true during resize operation             */
   my_bool resize_in_flush;       /* true during flush of resize operation    */
   my_bool can_be_used;           /* usage of cache for read/write is allowed */
   size_t key_cache_mem_size;     /* specified size of the cache memory       */
@@ -71,6 +72,11 @@ typedef struct st_key_cache
   BLOCK_LINK *used_ins;          /* ptr to the insertion block in LRU chain  */
   pthread_mutex_t cache_lock;    /* to lock access to the cache structure    */
   KEYCACHE_WQUEUE resize_queue;  /* threads waiting during resize operation  */
+  /*
+    Waiting for a zero resize count. Using a queue for symmetry though
+    only one thread can wait here.
+  */
+  KEYCACHE_WQUEUE waiting_for_resize_cnt;
   KEYCACHE_WQUEUE waiting_for_hash_link; /* waiting for a free hash link     */
   KEYCACHE_WQUEUE waiting_for_block;    /* requests waiting for a free block */
   BLOCK_LINK *changed_blocks[CHANGED_BLOCKS_HASH]; /* hash for dirty file bl.*/

include/my_global.h

@@ -458,12 +458,6 @@ int	__void__;
 #define LINT_INIT(var)
 #endif
 
-#if defined(_lint) || defined(FORCE_INIT_OF_VARS) || defined(HAVE_purify)
-#define PURIFY_OR_LINT_INIT(var) var=0
-#else
-#define PURIFY_OR_LINT_INIT(var)
-#endif
-
 /* 
    Suppress uninitialized variable warning without generating code.
 

libmysqld/libmysqld.c

@@ -164,6 +164,7 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user,
   port=0;
   unix_socket=0;
 
+  client_flag|=mysql->options.client_flag;
   /* Send client information for access check */
   client_flag|=CLIENT_CAPABILITIES;
   if (client_flag & CLIENT_MULTI_STATEMENTS)

myisam/mi_preload.c

@@ -55,12 +55,17 @@ int mi_preload(MI_INFO *info, ulonglong key_map, my_bool ignore_leaves)
 
   block_length= keyinfo[0].block_length;
 
+  if (ignore_leaves)
+  {
     /* Check whether all indexes use the same block size */
     for (i= 1 ; i < keys ; i++)
     {
       if (keyinfo[i].block_length != block_length)
         DBUG_RETURN(my_errno= HA_ERR_NON_UNIQUE_BLOCK_SIZE);
     }
+  }
+  else
+    block_length= share->key_cache->key_cache_block_size;
 
   length= info->preload_buff_size/block_length * block_length;
   set_if_bigger(length, block_length);

myisam/mi_search.c

@@ -295,7 +295,8 @@ int _mi_prefix_search(MI_INFO *info, register MI_KEYDEF *keyinfo, uchar *page,
   uchar *end, *kseg, *vseg;
   uchar *sort_order=keyinfo->seg->charset->sort_order;
   uchar tt_buff[MI_MAX_KEY_BUFF+2], *t_buff=tt_buff+2;
-  uchar *saved_from, *saved_to, *saved_vseg;
+  uchar *UNINIT_VAR(saved_from), *UNINIT_VAR(saved_to);
+  uchar *UNINIT_VAR(saved_vseg);
   uint  saved_length=0, saved_prefix_len=0;
   uint  length_pack;
   DBUG_ENTER("_mi_prefix_search");
@@ -303,9 +304,6 @@ int _mi_prefix_search(MI_INFO *info, register MI_KEYDEF *keyinfo, uchar *page,
   LINT_INIT(length);
   LINT_INIT(prefix_len);
   LINT_INIT(seg_len_pack);
-  LINT_INIT(saved_from);
-  LINT_INIT(saved_to);
-  LINT_INIT(saved_vseg);
 
   t_buff[0]=0;                                  /* Avoid bugs */
   end= page+mi_getint(page);

myisam/mi_write.c

@@ -700,8 +700,8 @@ static uchar *_mi_find_last_pos(MI_KEYDEF *keyinfo, uchar *page,
 				uchar *key, uint *return_key_length,
 				uchar **after_key)
 {
-  uint keys,length,last_length,key_ref_length;
-  uchar *end,*lastpos,*prevpos;
+  uint keys,length,UNINIT_VAR(last_length),key_ref_length;
+  uchar *end,*lastpos,*UNINIT_VAR(prevpos);
   uchar key_buff[MI_MAX_KEY_BUFF];
   DBUG_ENTER("_mi_find_last_pos");
 
@@ -720,8 +720,6 @@ static uchar *_mi_find_last_pos(MI_KEYDEF *keyinfo, uchar *page,
     DBUG_RETURN(end);
   }
 
-  LINT_INIT(prevpos);
-  LINT_INIT(last_length);
   end=page+length-key_ref_length;
   *key='\0';
   length=0;

mysql-test/r/func_str.result

@@ -2196,4 +2196,13 @@ SELECT LOAD_FILE(a) FROM t1;
 LOAD_FILE(a)
 NULL
 DROP TABLE t1;
+CREATE TABLE t1 (f2 VARCHAR(20));
+CREATE TABLE t2 (f2 VARCHAR(20));
+INSERT INTO t1 VALUES ('MIN'),('MAX');
+INSERT INTO t2 VALUES ('LOAD');
+SELECT CONCAT_WS('_', (SELECT t2.f2 FROM t2), t1.f2) AS concat_name FROM t1;
+concat_name
+LOAD_MIN
+LOAD_MAX
+DROP TABLE t1, t2;
 End of 5.0 tests

mysql-test/r/subselect4.result

+#
+# Bug #46791: Assertion failed:(table->key_read==0),function unknown
+#    function,file sql_base.cc
+#
+CREATE TABLE t1 (a INT, b INT, KEY(a));
+INSERT INTO t1 VALUES (1,1),(2,2);
+CREATE TABLE t2 LIKE t1;
+INSERT INTO t2 VALUES (1,1),(2,2);
+CREATE TABLE t3 LIKE t1;
+# should have 1 impossible where and 2 dependent subqueries
+EXPLAIN
+SELECT 1 FROM t1
+WHERE NOT EXISTS (SELECT 1 FROM t2 WHERE 1 = (SELECT MIN(t2.b) FROM t3))
+ORDER BY count(*);
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	t1	index	NULL	a	5	NULL	2	Using index; Using temporary
+2	DEPENDENT SUBQUERY	t2	ALL	NULL	NULL	NULL	NULL	2	Using where
+3	DEPENDENT SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	no matching row in const table
+# should not crash the next statement
+SELECT 1 FROM t1
+WHERE NOT EXISTS (SELECT 1 FROM t2 WHERE 1 = (SELECT MIN(t2.b) FROM t3))
+ORDER BY count(*);
+1
+1
+# should not crash: the crash is caused by the previous statement
+SELECT 1;
+1
+1
+DROP TABLE t1,t2,t3;
+#
+# Bug #47106: Crash / segfault on adding EXPLAIN to a non-crashing 
+# query
+#
+CREATE TABLE t1 (
+a INT,
+b INT,
+PRIMARY KEY (a),
+KEY b (b)
+);
+INSERT INTO t1 VALUES (1, 1), (2, 1);
+CREATE TABLE t2 LIKE t1;
+INSERT INTO t2 SELECT * FROM t1;
+CREATE TABLE t3 LIKE t1;
+INSERT INTO t3 SELECT * FROM t1;
+# Should not crash.
+# Should have 1 impossible where and 2 dependent subqs.
+EXPLAIN
+SELECT
+(SELECT 1 FROM t1,t2 WHERE t2.b > t3.b)
+FROM t3 WHERE 1 = 0 GROUP BY 1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE
+2	DEPENDENT SUBQUERY	t1	index	NULL	PRIMARY	4	NULL	2	Using index
+2	DEPENDENT SUBQUERY	t2	index	b	b	5	NULL	2	Using where; Using index
+# should return 0 rows
+SELECT
+(SELECT 1 FROM t1,t2 WHERE t2.b > t3.b)
+FROM t3 WHERE 1 = 0 GROUP BY 1;
+(SELECT 1 FROM t1,t2 WHERE t2.b > t3.b)
+DROP TABLE t1,t2,t3;
+End of 5.0 tests.

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

@@ -31,8 +31,8 @@ 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
@@ -58,7 +58,7 @@ SELECT * FROM `
 ｳｳｳｳｳ
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
-ｷｷｷ	char(6)				
+ｷｷｷ	char(6)	NO			
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
@@ -80,8 +80,8 @@ 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
@@ -107,7 +107,7 @@ SELECT * FROM `
 ううううう
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
-ききき	char(6)				
+ききき	char(6)	NO			
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
@@ -129,8 +129,8 @@ 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
@@ -156,7 +156,7 @@ SELECT * FROM `
 表表表表表
 DESC `ソソソ`;
 Field	Type	Null	Key	Default	Extra
-表表表	char(6)				
+表表表	char(6)	NO			
 SHOW CREATE TABLE `ソソソ`;
 Table	Create Table
 ソソソ	CREATE TABLE `ソソソ` (
@@ -193,8 +193,8 @@ 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
@@ -220,7 +220,7 @@ SELECT * FROM `
 ｳｳｳｳｳ
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
-ｷｷｷ	char(6)				
+ｷｷｷ	char(6)	NO			
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
@@ -242,8 +242,8 @@ 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
@@ -269,7 +269,7 @@ SELECT * FROM `
 ううううう
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
-ききき	char(6)				
+ききき	char(6)	NO			
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
@@ -291,8 +291,8 @@ 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
@@ -318,7 +318,7 @@ SELECT * FROM `
 能能能能能
 DESC `ソソソ`;
 Field	Type	Null	Key	Default	Extra
-表表表	char(6)				
+表表表	char(6)	NO			
 SHOW CREATE TABLE `ソソソ`;
 Table	Create Table
 ソソソ	CREATE TABLE `ソソソ` (
@@ -355,8 +355,8 @@ 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
@@ -368,7 +368,7 @@ Table	Create Table
   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
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 ALTER TABLE `あああ` ADD `かかか` char(1) FIRST;
 ALTER TABLE `あああ` ADD `くくく` char(1) AFTER `ききき`;
 ALTER TABLE `あああ` ADD `けけけ` char(1);
@@ -404,8 +404,8 @@ 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
@@ -417,7 +417,7 @@ Table	Create Table
   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
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 ALTER TABLE `ソソソ` ADD `構構構` char(1) FIRST;
 ALTER TABLE `ソソソ` ADD `能能能` char(1) AFTER `表表表`;
 ALTER TABLE `ソソソ` ADD `予予予` char(1);
@@ -453,8 +453,8 @@ 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
@@ -466,7 +466,7 @@ Table	Create Table
   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,12 +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
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 DROP TABLE `ｱｱｱ`;
 DROP TABLE `ｲｲｲ`;
 DROP TABLE `あああ`;
@@ -516,7 +516,7 @@ NULL
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
 ｶｶ	char(1)	YES	MUL	NULL	
-ｷｷｷ	char(6)		PRI		
+ｷｷｷ	char(6)	NO	PRI		
 ｸｸｸ	char(1)	YES		NULL	
 ｹｹｹ	char(1)	YES		NULL	
 SHOW CREATE TABLE `ｱｱｱ`;
@@ -541,7 +541,7 @@ SELECT * FROM `
 ｳｳｳｳｳ
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
-ｷｷｷ	char(6)				
+ｷｷｷ	char(6)	NO			
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
@@ -562,7 +562,7 @@ NULL
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
 かか	char(1)	YES	MUL	NULL	
-ききき	char(6)		PRI		
+ききき	char(6)	NO	PRI		
 くくく	char(1)	YES		NULL	
 けけけ	char(1)	YES		NULL	
 SHOW CREATE TABLE `あああ`;
@@ -587,7 +587,7 @@ SELECT * FROM `
 ううううう
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
-ききき	char(6)				
+ききき	char(6)	NO			
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
@@ -608,7 +608,7 @@ NULL
 DESC `ソソソ`;
 Field	Type	Null	Key	Default	Extra
 構構	char(1)	YES	MUL	NULL	
-表表表	char(6)		PRI		
+表表表	char(6)	NO	PRI		
 能能能	char(1)	YES		NULL	
 予予予	char(1)	YES		NULL	
 SHOW CREATE TABLE `ソソソ`;
@@ -633,7 +633,7 @@ SELECT * FROM `
 表表表表表
 DESC `ソソソ`;
 Field	Type	Null	Key	Default	Extra
-表表表	char(6)				
+表表表	char(6)	NO			
 SHOW CREATE TABLE `ソソソ`;
 Table	Create Table
 ソソソ	CREATE TABLE `ソソソ` (

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

@@ -32,8 +32,8 @@ 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
@@ -59,7 +59,7 @@ SELECT * FROM `
 ｳｳｳｳｳ
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
-ｷｷｷ	char(6)				
+ｷｷｷ	char(6)	NO			
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
@@ -81,8 +81,8 @@ 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
@@ -108,7 +108,7 @@ SELECT * FROM `
 ううううう
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
-ききき	char(6)				
+ききき	char(6)	NO			
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
@@ -130,8 +130,8 @@ 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
@@ -157,7 +157,7 @@ SELECT * FROM `
 丅丅丅丅丅
 DESC `龖龖龖`;
 Field	Type	Null	Key	Default	Extra
-丂丂丂	char(6)				
+丂丂丂	char(6)	NO			
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
@@ -194,8 +194,8 @@ 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
@@ -221,7 +221,7 @@ SELECT * FROM `
 ｳｳｳｳｳ
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
-ｷｷｷ	char(6)				
+ｷｷｷ	char(6)	NO			
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
@@ -243,8 +243,8 @@ 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
@@ -270,7 +270,7 @@ SELECT * FROM `
 ううううう
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
-ききき	char(6)				
+ききき	char(6)	NO			
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
@@ -292,8 +292,8 @@ 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
@@ -319,7 +319,7 @@ SELECT * FROM `
 丅丅丅丅丅
 DESC `龖龖龖`;
 Field	Type	Null	Key	Default	Extra
-丂丂丂	char(6)				
+丂丂丂	char(6)	NO			
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
@@ -356,8 +356,8 @@ 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
@@ -369,7 +369,7 @@ Table	Create Table
   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
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 ALTER TABLE `あああ` ADD `かかか` char(1) FIRST;
 ALTER TABLE `あああ` ADD `くくく` char(1) AFTER `ききき`;
 ALTER TABLE `あああ` ADD `けけけ` char(1);
@@ -405,8 +405,8 @@ 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
@@ -418,7 +418,7 @@ Table	Create Table
   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
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 ALTER TABLE `龖龖龖` ADD `丄丄丄` char(1) FIRST;
 ALTER TABLE `龖龖龖` ADD `丅丅丅` char(1) AFTER `丂丂丂`;
 ALTER TABLE `龖龖龖` ADD `乚乚乚` char(1);
@@ -454,8 +454,8 @@ 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
@@ -467,7 +467,7 @@ Table	Create Table
   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,12 +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
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 DROP TABLE `ｱｱｱ`;
 DROP TABLE `ｲｲｲ`;
 DROP TABLE `あああ`;
@@ -517,7 +517,7 @@ NULL
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
 ｶｶ	char(1)	YES	MUL	NULL	
-ｷｷｷ	char(6)		PRI		
+ｷｷｷ	char(6)	NO	PRI		
 ｸｸｸ	char(1)	YES		NULL	
 ｹｹｹ	char(1)	YES		NULL	
 SHOW CREATE TABLE `ｱｱｱ`;
@@ -542,7 +542,7 @@ SELECT * FROM `
 ｳｳｳｳｳ
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
-ｷｷｷ	char(6)				
+ｷｷｷ	char(6)	NO			
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
@@ -563,7 +563,7 @@ NULL
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
 かか	char(1)	YES	MUL	NULL	
-ききき	char(6)		PRI		
+ききき	char(6)	NO	PRI		
 くくく	char(1)	YES		NULL	
 けけけ	char(1)	YES		NULL	
 SHOW CREATE TABLE `あああ`;
@@ -588,7 +588,7 @@ SELECT * FROM `
 ううううう
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
-ききき	char(6)				
+ききき	char(6)	NO			
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
@@ -609,7 +609,7 @@ NULL
 DESC `龖龖龖`;
 Field	Type	Null	Key	Default	Extra
 丄丄	char(1)	YES	MUL	NULL	
-丂丂丂	char(6)		PRI		
+丂丂丂	char(6)	NO	PRI		
 丅丅丅	char(1)	YES		NULL	
 乚乚乚	char(1)	YES		NULL	
 SHOW CREATE TABLE `龖龖龖`;
@@ -634,7 +634,7 @@ SELECT * FROM `
 丅丅丅丅丅
 DESC `龖龖龖`;
 Field	Type	Null	Key	Default	Extra
-丂丂丂	char(6)				
+丂丂丂	char(6)	NO			
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (

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

@@ -31,8 +31,8 @@ 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
@@ -58,7 +58,7 @@ SELECT * FROM `
 ｳｳｳｳｳ
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
-ｷｷｷ	char(6)				
+ｷｷｷ	char(6)	NO			
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
@@ -80,8 +80,8 @@ 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
@@ -107,7 +107,7 @@ SELECT * FROM `
 ううううう
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
-ききき	char(6)				
+ききき	char(6)	NO			
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
@@ -129,8 +129,8 @@ 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
@@ -156,7 +156,7 @@ SELECT * FROM `
 丅丅丅丅丅
 DESC `龖龖龖`;
 Field	Type	Null	Key	Default	Extra
-丂丂丂	char(6)				
+丂丂丂	char(6)	NO			
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
@@ -193,8 +193,8 @@ 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
@@ -220,7 +220,7 @@ SELECT * FROM `
 ｳｳｳｳｳ
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
-ｷｷｷ	char(6)				
+ｷｷｷ	char(6)	NO			
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
@@ -242,8 +242,8 @@ 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
@@ -269,7 +269,7 @@ SELECT * FROM `
 ううううう
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
-ききき	char(6)				
+ききき	char(6)	NO			
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
@@ -291,8 +291,8 @@ 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
@@ -318,7 +318,7 @@ SELECT * FROM `
 丅丅丅丅丅
 DESC `龖龖龖`;
 Field	Type	Null	Key	Default	Extra
-丂丂丂	char(6)				
+丂丂丂	char(6)	NO			
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
@@ -355,8 +355,8 @@ 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
@@ -368,7 +368,7 @@ Table	Create Table
   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
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 ALTER TABLE `あああ` ADD `かかか` char(1) FIRST;
 ALTER TABLE `あああ` ADD `くくく` char(1) AFTER `ききき`;
 ALTER TABLE `あああ` ADD `けけけ` char(1);
@@ -404,8 +404,8 @@ 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
@@ -417,7 +417,7 @@ Table	Create Table
   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
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 ALTER TABLE `龖龖龖` ADD `丄丄丄` char(1) FIRST;
 ALTER TABLE `龖龖龖` ADD `丅丅丅` char(1) AFTER `丂丂丂`;
 ALTER TABLE `龖龖龖` ADD `乚乚乚` char(1);
@@ -453,8 +453,8 @@ 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
@@ -466,7 +466,7 @@ Table	Create Table
   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,12 +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
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 DROP TABLE `ｱｱｱ`;
 DROP TABLE `ｲｲｲ`;
 DROP TABLE `あああ`;
@@ -516,7 +516,7 @@ NULL
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
 ｶｶ	char(1)	YES	MUL	NULL	
-ｷｷｷ	char(6)		PRI		
+ｷｷｷ	char(6)	NO	PRI		
 ｸｸｸ	char(1)	YES		NULL	
 ｹｹｹ	char(1)	YES		NULL	
 SHOW CREATE TABLE `ｱｱｱ`;
@@ -541,7 +541,7 @@ SELECT * FROM `
 ｳｳｳｳｳ
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
-ｷｷｷ	char(6)				
+ｷｷｷ	char(6)	NO			
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
@@ -562,7 +562,7 @@ NULL
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
 かか	char(1)	YES	MUL	NULL	
-ききき	char(6)		PRI		
+ききき	char(6)	NO	PRI		
 くくく	char(1)	YES		NULL	
 けけけ	char(1)	YES		NULL	
 SHOW CREATE TABLE `あああ`;
@@ -587,7 +587,7 @@ SELECT * FROM `
 ううううう
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
-ききき	char(6)				
+ききき	char(6)	NO			
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
@@ -608,7 +608,7 @@ NULL
 DESC `龖龖龖`;
 Field	Type	Null	Key	Default	Extra
 丄丄	char(1)	YES	MUL	NULL	
-丂丂丂	char(6)		PRI		
+丂丂丂	char(6)	NO	PRI		
 丅丅丅	char(1)	YES		NULL	
 乚乚乚	char(1)	YES		NULL	
 SHOW CREATE TABLE `龖龖龖`;
@@ -633,7 +633,7 @@ SELECT * FROM `
 丅丅丅丅丅
 DESC `龖龖龖`;
 Field	Type	Null	Key	Default	Extra
-丂丂丂	char(6)				
+丂丂丂	char(6)	NO			
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (

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

@@ -31,8 +31,8 @@ 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
@@ -58,7 +58,7 @@ SELECT * FROM `ｱｱｱ`;
 ｳｳｳｳｳ
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
-ｷｷｷ	char(6)				
+ｷｷｷ	char(6)	NO			
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
@@ -80,8 +80,8 @@ 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
@@ -107,7 +107,7 @@ SELECT * FROM `あああ`;
 ううううう
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
-ききき	char(6)				
+ききき	char(6)	NO			
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
@@ -129,8 +129,8 @@ 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
@@ -156,7 +156,7 @@ SELECT * FROM `龖龖龖`;
 丅丅丅丅丅
 DESC `龖龖龖`;
 Field	Type	Null	Key	Default	Extra
-丂丂丂	char(6)				
+丂丂丂	char(6)	NO			
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
@@ -193,8 +193,8 @@ 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
@@ -220,7 +220,7 @@ SELECT * FROM `ｱｱｱ`;
 ｳｳｳｳｳ
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
-ｷｷｷ	char(6)				
+ｷｷｷ	char(6)	NO			
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
@@ -242,8 +242,8 @@ 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
@@ -269,7 +269,7 @@ SELECT * FROM `あああ`;
 ううううう
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
-ききき	char(6)				
+ききき	char(6)	NO			
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
@@ -291,8 +291,8 @@ 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
@@ -318,7 +318,7 @@ SELECT * FROM `龖龖龖`;
 丅丅丅丅丅
 DESC `龖龖龖`;
 Field	Type	Null	Key	Default	Extra
-丂丂丂	char(6)				
+丂丂丂	char(6)	NO			
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
@@ -355,8 +355,8 @@ 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
@@ -368,7 +368,7 @@ Table	Create Table
   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
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 ALTER TABLE `あああ` ADD `かかか` char(1) FIRST;
 ALTER TABLE `あああ` ADD `くくく` char(1) AFTER `ききき`;
 ALTER TABLE `あああ` ADD `けけけ` char(1);
@@ -404,8 +404,8 @@ 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
@@ -417,7 +417,7 @@ Table	Create Table
   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
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 ALTER TABLE `龖龖龖` ADD `丄丄丄` char(1) FIRST;
 ALTER TABLE `龖龖龖` ADD `丅丅丅` char(1) AFTER `丂丂丂`;
 ALTER TABLE `龖龖龖` ADD `乚乚乚` char(1);
@@ -453,8 +453,8 @@ 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
@@ -466,7 +466,7 @@ Table	Create Table
   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,12 +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
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 DROP TABLE `ｱｱｱ`;
 DROP TABLE `ｲｲｲ`;
 DROP TABLE `あああ`;
@@ -516,7 +516,7 @@ NULL	ｳｳｳｳｳ	NULL	NULL
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
 ｶｶ	char(1)	YES	MUL	NULL	
-ｷｷｷ	char(6)		PRI		
+ｷｷｷ	char(6)	NO	PRI		
 ｸｸｸ	char(1)	YES		NULL	
 ｹｹｹ	char(1)	YES		NULL	
 SHOW CREATE TABLE `ｱｱｱ`;
@@ -541,7 +541,7 @@ SELECT * FROM `ｱｱｱ`;
 ｳｳｳｳｳ
 DESC `ｱｱｱ`;
 Field	Type	Null	Key	Default	Extra
-ｷｷｷ	char(6)				
+ｷｷｷ	char(6)	NO			
 SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
@@ -562,7 +562,7 @@ NULL	ううううう	NULL	NULL
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
 かか	char(1)	YES	MUL	NULL	
-ききき	char(6)		PRI		
+ききき	char(6)	NO	PRI		
 くくく	char(1)	YES		NULL	
 けけけ	char(1)	YES		NULL	
 SHOW CREATE TABLE `あああ`;
@@ -587,7 +587,7 @@ SELECT * FROM `あああ`;
 ううううう
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
-ききき	char(6)				
+ききき	char(6)	NO			
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
@@ -608,7 +608,7 @@ NULL	丅丅丅丅丅	NULL	NULL
 DESC `龖龖龖`;
 Field	Type	Null	Key	Default	Extra
 丄丄	char(1)	YES	MUL	NULL	
-丂丂丂	char(6)		PRI		
+丂丂丂	char(6)	NO	PRI		
 丅丅丅	char(1)	YES		NULL	
 乚乚乚	char(1)	YES		NULL	
 SHOW CREATE TABLE `龖龖龖`;
@@ -633,7 +633,7 @@ SELECT * FROM `龖龖龖`;
 丅丅丅丅丅
 DESC `龖龖龖`;
 Field	Type	Null	Key	Default	Extra
-丂丂丂	char(6)				
+丂丂丂	char(6)	NO			
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (

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

@@ -24,18 +24,6 @@ CREATE TABLE `
 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;
-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`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `sS`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `sT`;
-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

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

@@ -24,18 +24,6 @@ CREATE TABLE `
 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;
-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 `ԣ`;
-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

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

@@ -24,18 +24,6 @@ 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;
-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 `Ｔ６`;
-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

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

@@ -24,18 +24,6 @@ CREATE TABLE `
 CREATE TABLE `Ｔ１０` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
 CREATE TABLE `Ｔ１１` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
 CREATE TABLE `Ｔ１２` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `Ｔ１`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `Ｔ２`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `Ｔ３`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `Ｔ４`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `Ｔ５`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `Ｔ６`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `Ｔ７`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `Ｔ８`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `Ｔ９`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `Ｔ１０`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `Ｔ１１`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `Ｔ１２`;
 SELECT `Ｃ１`, CONVERT(`Ｃ１` using utf8) FROM `Ｔ１`;
 Ｃ１	CONVERT(`Ｃ１` using utf8)
  !"#$%&'()*+,-./	 !"#$%&'()*+,-./
@@ -278,12 +266,15 @@ SELECT `
 齔齣齟齠齡齦齧齬齪齷齲齶龕龜龠・・・・・	齔齣齟齠齡齦齧齬齪齷齲齶龕龜龠・・・・・
 SELECT `Ｃ１`, CONVERT(`Ｃ１` using utf8) FROM `Ｔ３`;
 Ｃ１	CONVERT(`Ｃ１` using utf8)
+	
 ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤	ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤
 SELECT `Ｃ１`, CONVERT(`Ｃ１` using ucs2) FROM `Ｔ３`;
 Ｃ１	CONVERT(`Ｃ１` using ucs2)
+	
 ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤	ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤
 SELECT `Ｃ１`, CONVERT(`Ｃ１` using ujis) FROM `Ｔ３`;
 Ｃ１	CONVERT(`Ｃ１` using ujis)
+	
 ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤	ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤
 SELECT `Ｃ１`, CONVERT(`Ｃ１` using utf8) FROM `Ｔ４`;
 Ｃ１	CONVERT(`Ｃ１` using utf8)
@@ -527,12 +518,15 @@ SELECT `
 齔齣齟齠齡齦齧齬齪齷齲齶龕龜龠・・・・・	齔齣齟齠齡齦齧齬齪齷齲齶龕龜龠・・・・・
 SELECT `Ｃ１`, CONVERT(`Ｃ１` using utf8) FROM `Ｔ６`;
 Ｃ１	CONVERT(`Ｃ１` using utf8)
+	
 ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤	ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤
 SELECT `Ｃ１`, CONVERT(`Ｃ１` using ucs2) FROM `Ｔ６`;
 Ｃ１	CONVERT(`Ｃ１` using ucs2)
+	
 ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤	ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤
 SELECT `Ｃ１`, CONVERT(`Ｃ１` using ujis) FROM `Ｔ６`;
 Ｃ１	CONVERT(`Ｃ１` using ujis)
+	
 ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤	ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤
 SELECT `Ｃ１`, CONVERT(`Ｃ１` using utf8) FROM `Ｔ７`;
 Ｃ１	CONVERT(`Ｃ１` using utf8)
@@ -777,12 +771,15 @@ SELECT `
 SELECT `Ｃ１`, CONVERT(`Ｃ１` using utf8) FROM `Ｔ９`;
 Ｃ１	CONVERT(`Ｃ１` using utf8)
 ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤	ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤
+	
 SELECT `Ｃ１`, CONVERT(`Ｃ１` using ucs2) FROM `Ｔ９`;
 Ｃ１	CONVERT(`Ｃ１` using ucs2)
 ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤	ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤
+	
 SELECT `Ｃ１`, CONVERT(`Ｃ１` using ujis) FROM `Ｔ９`;
 Ｃ１	CONVERT(`Ｃ１` using ujis)
 ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤	ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤
+	
 SELECT `Ｃ１`, CONVERT(`Ｃ１` using utf8) FROM `Ｔ１０`;
 Ｃ１	CONVERT(`Ｃ１` using utf8)
  !"#$%&'()*+,-./	 !"#$%&'()*+,-./
@@ -1026,12 +1023,15 @@ SELECT `
 SELECT `Ｃ１`, CONVERT(`Ｃ１` using utf8) FROM `Ｔ１２`;
 Ｃ１	CONVERT(`Ｃ１` using utf8)
 ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤	ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤
+	
 SELECT `Ｃ１`, CONVERT(`Ｃ１` using ucs2) FROM `Ｔ１２`;
 Ｃ１	CONVERT(`Ｃ１` using ucs2)
 ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤	ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤
+	
 SELECT `Ｃ１`, CONVERT(`Ｃ１` using ujis) FROM `Ｔ１２`;
 Ｃ１	CONVERT(`Ｃ１` using ujis)
 ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤	ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤
+	
 drop table `Ｔ１`;
 drop table `Ｔ２`;
 drop table `Ｔ３`;

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

@@ -24,18 +24,6 @@ CREATE TABLE `
 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;
-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 `Ｔ６`;
-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)
  !"#$%&'()*+,-./	 !"#$%&'()*+,-./

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

@@ -24,18 +24,6 @@ CREATE TABLE `Ｔ９` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf
 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;
-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 `Ｔ６`;
-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)
  !"#$%&'()*+,-./	 !"#$%&'()*+,-./

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

@@ -8,6 +8,7 @@ CREATE DATABASE `
 CREATE DATABASE `ソ十表`;
 SHOW DATABASES;
 Database
+information_schema
 mysql
 test
 ソ十表

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

@@ -9,6 +9,7 @@ CREATE DATABASE `
 CREATE DATABASE `龔龖龗`;
 SHOW DATABASES;
 Database
+information_schema
 mysql
 test
 日本語

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

@@ -8,6 +8,7 @@ CREATE DATABASE `
 CREATE DATABASE `龔龖龗`;
 SHOW DATABASES;
 Database
+information_schema
 mysql
 test
 日本語

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

@@ -8,6 +8,7 @@ CREATE DATABASE `日本語`;
 CREATE DATABASE `龔龖龗`;
 SHOW DATABASES;
 Database
+information_schema
 mysql
 test
 日本語

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

@@ -22,11 +22,23 @@ CREATE TABLE `
 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;
@@ -178,11 +190,23 @@ CREATE TABLE `
 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;
@@ -334,11 +358,23 @@ CREATE TABLE `
 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;
+Warnings:
+Note	1050	Table 'ｱｱｱ' already exists
 CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
+Warnings:
+Note	1050	Table 'ｲｲｲ' already exists
 CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
+Warnings:
+Note	1050	Table 'あああ' already exists
 CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
+Warnings:
+Note	1050	Table 'いいい' already exists
 CREATE TABLE IF NOT EXISTS `ソソソ`(`噂噂噂` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
+Warnings:
+Note	1050	Table 'ソソソ' already exists
 CREATE TABLE IF NOT EXISTS `十十十`(`蚕蚕蚕` char(1)) DEFAULT CHARSET = sjis engine=HEAP;
+Warnings:
+Note	1050	Table '十十十' already exists
 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;
@@ -397,77 +433,77 @@ SHOW CREATE TABLE `
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
   `ｶｶｶ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `ｲｲｲ`;
 Table	Create Table
 ｲｲｲ	CREATE TABLE `ｲｲｲ` (
   `ｷｷｷ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `ｳｳｳ`;
 Table	Create Table
 ｳｳｳ	CREATE TABLE `ｳｳｳ` (
   `ｸｸｸ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `ｴｴｴ`;
 Table	Create Table
 ｴｴｴ	CREATE TEMPORARY TABLE `ｴｴｴ` (
   `ｹｹｹ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `ｵｵｵ`;
 Table	Create Table
 ｵｵｵ	CREATE TEMPORARY TABLE `ｵｵｵ` (
   `ｺｺｺ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
   `かかか` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `いいい`;
 Table	Create Table
 いいい	CREATE TABLE `いいい` (
   `ききき` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `ううう`;
 Table	Create Table
 ううう	CREATE TABLE `ううう` (
   `くくく` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `えええ`;
 Table	Create Table
 えええ	CREATE TEMPORARY TABLE `えええ` (
   `けけけ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `おおお`;
 Table	Create Table
 おおお	CREATE TEMPORARY TABLE `おおお` (
   `こここ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `ソソソ`;
 Table	Create Table
 ソソソ	CREATE TABLE `ソソソ` (
   `噂噂噂` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `十十十`;
 Table	Create Table
 十十十	CREATE TABLE `十十十` (
   `蚕蚕蚕` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `表表表`;
 Table	Create Table
 表表表	CREATE TABLE `表表表` (
   `申申申` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `予予予`;
 Table	Create Table
 予予予	CREATE TEMPORARY TABLE `予予予` (
   `貼貼貼` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `構構構`;
 Table	Create Table
 構構構	CREATE TEMPORARY TABLE `構構構` (
   `能能能` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 DROP TABLE `ｱｱｱ`;
 DROP TABLE `ｲｲｲ`;
 DROP TABLE `ｳｳｳ`;
@@ -490,11 +526,23 @@ CREATE TABLE `
 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;
+Warnings:
+Note	1050	Table 'ｱｱｱ' already exists
 CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = sjis engine=BDB;
+Warnings:
+Note	1050	Table 'ｲｲｲ' already exists
 CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = sjis engine=BDB;
+Warnings:
+Note	1050	Table 'あああ' already exists
 CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = sjis engine=BDB;
+Warnings:
+Note	1050	Table 'いいい' already exists
 CREATE TABLE IF NOT EXISTS `ソソソ`(`噂噂噂` char(1)) DEFAULT CHARSET = sjis engine=BDB;
+Warnings:
+Note	1050	Table 'ソソソ' already exists
 CREATE TABLE IF NOT EXISTS `十十十`(`蚕蚕蚕` char(1)) DEFAULT CHARSET = sjis engine=BDB;
+Warnings:
+Note	1050	Table '十十十' already exists
 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;

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

@@ -22,11 +22,23 @@ CREATE TABLE `
 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;
@@ -178,11 +190,23 @@ CREATE TABLE `
 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;
@@ -334,11 +358,23 @@ CREATE TABLE `
 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;
+Warnings:
+Note	1050	Table 'ｱｱｱ' already exists
 CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
+Warnings:
+Note	1050	Table 'ｲｲｲ' already exists
 CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
+Warnings:
+Note	1050	Table 'あああ' already exists
 CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
+Warnings:
+Note	1050	Table 'いいい' already exists
 CREATE TABLE IF NOT EXISTS `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
+Warnings:
+Note	1050	Table '龖龖龖' already exists
 CREATE TABLE IF NOT EXISTS `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP;
+Warnings:
+Note	1050	Table '龗龗龗' already exists
 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;
@@ -397,77 +433,77 @@ SHOW CREATE TABLE `
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
   `ｶｶｶ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `ｲｲｲ`;
 Table	Create Table
 ｲｲｲ	CREATE TABLE `ｲｲｲ` (
   `ｷｷｷ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `ｳｳｳ`;
 Table	Create Table
 ｳｳｳ	CREATE TABLE `ｳｳｳ` (
   `ｸｸｸ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `ｴｴｴ`;
 Table	Create Table
 ｴｴｴ	CREATE TEMPORARY TABLE `ｴｴｴ` (
   `ｹｹｹ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `ｵｵｵ`;
 Table	Create Table
 ｵｵｵ	CREATE TEMPORARY TABLE `ｵｵｵ` (
   `ｺｺｺ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
   `かかか` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `いいい`;
 Table	Create Table
 いいい	CREATE TABLE `いいい` (
   `ききき` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `ううう`;
 Table	Create Table
 ううう	CREATE TABLE `ううう` (
   `くくく` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `えええ`;
 Table	Create Table
 えええ	CREATE TEMPORARY TABLE `えええ` (
   `けけけ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `おおお`;
 Table	Create Table
 おおお	CREATE TEMPORARY TABLE `おおお` (
   `こここ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
   `丂丂丂` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `龗龗龗`;
 Table	Create Table
 龗龗龗	CREATE TABLE `龗龗龗` (
   `丄丄丄` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `龞龞龞`;
 Table	Create Table
 龞龞龞	CREATE TABLE `龞龞龞` (
   `丅丅丅` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `龡龡龡`;
 Table	Create Table
 龡龡龡	CREATE TEMPORARY TABLE `龡龡龡` (
   `丌丌丌` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `龢龢龢`;
 Table	Create Table
 龢龢龢	CREATE TEMPORARY TABLE `龢龢龢` (
   `丒丒丒` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 DROP TABLE `ｱｱｱ`;
 DROP TABLE `ｲｲｲ`;
 DROP TABLE `ｳｳｳ`;
@@ -490,11 +526,23 @@ CREATE TABLE `
 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;
+Warnings:
+Note	1050	Table 'ｱｱｱ' already exists
 CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
+Warnings:
+Note	1050	Table 'ｲｲｲ' already exists
 CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
+Warnings:
+Note	1050	Table 'あああ' already exists
 CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
+Warnings:
+Note	1050	Table 'いいい' already exists
 CREATE TABLE IF NOT EXISTS `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
+Warnings:
+Note	1050	Table '龖龖龖' already exists
 CREATE TABLE IF NOT EXISTS `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ucs2 engine=BDB;
+Warnings:
+Note	1050	Table '龗龗龗' already exists
 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;

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

@@ -22,11 +22,23 @@ CREATE TABLE `
 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;
@@ -178,11 +190,23 @@ CREATE TABLE `
 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;
@@ -334,11 +358,23 @@ CREATE TABLE `
 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;
+Warnings:
+Note	1050	Table 'ｱｱｱ' already exists
 CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
+Warnings:
+Note	1050	Table 'ｲｲｲ' already exists
 CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
+Warnings:
+Note	1050	Table 'あああ' already exists
 CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
+Warnings:
+Note	1050	Table 'いいい' already exists
 CREATE TABLE IF NOT EXISTS `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
+Warnings:
+Note	1050	Table '龖龖龖' already exists
 CREATE TABLE IF NOT EXISTS `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ujis engine=HEAP;
+Warnings:
+Note	1050	Table '龗龗龗' already exists
 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;
@@ -397,77 +433,77 @@ SHOW CREATE TABLE `
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
   `ｶｶｶ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `ｲｲｲ`;
 Table	Create Table
 ｲｲｲ	CREATE TABLE `ｲｲｲ` (
   `ｷｷｷ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `ｳｳｳ`;
 Table	Create Table
 ｳｳｳ	CREATE TABLE `ｳｳｳ` (
   `ｸｸｸ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `ｴｴｴ`;
 Table	Create Table
 ｴｴｴ	CREATE TEMPORARY TABLE `ｴｴｴ` (
   `ｹｹｹ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `ｵｵｵ`;
 Table	Create Table
 ｵｵｵ	CREATE TEMPORARY TABLE `ｵｵｵ` (
   `ｺｺｺ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
   `かかか` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `いいい`;
 Table	Create Table
 いいい	CREATE TABLE `いいい` (
   `ききき` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `ううう`;
 Table	Create Table
 ううう	CREATE TABLE `ううう` (
   `くくく` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `えええ`;
 Table	Create Table
 えええ	CREATE TEMPORARY TABLE `えええ` (
   `けけけ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `おおお`;
 Table	Create Table
 おおお	CREATE TEMPORARY TABLE `おおお` (
   `こここ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
   `丂丂丂` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `龗龗龗`;
 Table	Create Table
 龗龗龗	CREATE TABLE `龗龗龗` (
   `丄丄丄` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `龞龞龞`;
 Table	Create Table
 龞龞龞	CREATE TABLE `龞龞龞` (
   `丅丅丅` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `龡龡龡`;
 Table	Create Table
 龡龡龡	CREATE TEMPORARY TABLE `龡龡龡` (
   `丌丌丌` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `龢龢龢`;
 Table	Create Table
 龢龢龢	CREATE TEMPORARY TABLE `龢龢龢` (
   `丒丒丒` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 DROP TABLE `ｱｱｱ`;
 DROP TABLE `ｲｲｲ`;
 DROP TABLE `ｳｳｳ`;
@@ -490,11 +526,23 @@ CREATE TABLE `
 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;
+Warnings:
+Note	1050	Table 'ｱｱｱ' already exists
 CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = ujis engine=BDB;
+Warnings:
+Note	1050	Table 'ｲｲｲ' already exists
 CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = ujis engine=BDB;
+Warnings:
+Note	1050	Table 'あああ' already exists
 CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = ujis engine=BDB;
+Warnings:
+Note	1050	Table 'いいい' already exists
 CREATE TABLE IF NOT EXISTS `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = ujis engine=BDB;
+Warnings:
+Note	1050	Table '龖龖龖' already exists
 CREATE TABLE IF NOT EXISTS `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = ujis engine=BDB;
+Warnings:
+Note	1050	Table '龗龗龗' already exists
 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;

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;
@@ -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;
@@ -334,11 +358,23 @@ 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;
+Warnings:
+Note	1050	Table 'ｱｱｱ' already exists
 CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
+Warnings:
+Note	1050	Table 'ｲｲｲ' already exists
 CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
+Warnings:
+Note	1050	Table 'あああ' already exists
 CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
+Warnings:
+Note	1050	Table 'いいい' already exists
 CREATE TABLE IF NOT EXISTS `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
+Warnings:
+Note	1050	Table '龖龖龖' already exists
 CREATE TABLE IF NOT EXISTS `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
+Warnings:
+Note	1050	Table '龗龗龗' already exists
 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;
@@ -397,77 +433,77 @@ SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
   `ｶｶｶ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `ｲｲｲ`;
 Table	Create Table
 ｲｲｲ	CREATE TABLE `ｲｲｲ` (
   `ｷｷｷ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `ｳｳｳ`;
 Table	Create Table
 ｳｳｳ	CREATE TABLE `ｳｳｳ` (
   `ｸｸｸ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `ｴｴｴ`;
 Table	Create Table
 ｴｴｴ	CREATE TEMPORARY TABLE `ｴｴｴ` (
   `ｹｹｹ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `ｵｵｵ`;
 Table	Create Table
 ｵｵｵ	CREATE TEMPORARY TABLE `ｵｵｵ` (
   `ｺｺｺ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
   `かかか` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `いいい`;
 Table	Create Table
 いいい	CREATE TABLE `いいい` (
   `ききき` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `ううう`;
 Table	Create Table
 ううう	CREATE TABLE `ううう` (
   `くくく` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `えええ`;
 Table	Create Table
 えええ	CREATE TEMPORARY TABLE `えええ` (
   `けけけ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `おおお`;
 Table	Create Table
 おおお	CREATE TEMPORARY TABLE `おおお` (
   `こここ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
   `丂丂丂` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `龗龗龗`;
 Table	Create Table
 龗龗龗	CREATE TABLE `龗龗龗` (
   `丄丄丄` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `龞龞龞`;
 Table	Create Table
 龞龞龞	CREATE TABLE `龞龞龞` (
   `丅丅丅` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `龡龡龡`;
 Table	Create Table
 龡龡龡	CREATE TEMPORARY TABLE `龡龡龡` (
   `丌丌丌` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `龢龢龢`;
 Table	Create Table
 龢龢龢	CREATE TEMPORARY TABLE `龢龢龢` (
   `丒丒丒` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 DROP TABLE `ｱｱｱ`;
 DROP TABLE `ｲｲｲ`;
 DROP TABLE `ｳｳｳ`;
@@ -490,11 +526,23 @@ 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;
+Warnings:
+Note	1050	Table 'ｱｱｱ' already exists
 CREATE TABLE IF NOT EXISTS `ｲｲｲ`(`ｷｷｷ` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
+Warnings:
+Note	1050	Table 'ｲｲｲ' already exists
 CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
+Warnings:
+Note	1050	Table 'あああ' already exists
 CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
+Warnings:
+Note	1050	Table 'いいい' already exists
 CREATE TABLE IF NOT EXISTS `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
+Warnings:
+Note	1050	Table '龖龖龖' already exists
 CREATE TABLE IF NOT EXISTS `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
+Warnings:
+Note	1050	Table '龗龗龗' already exists
 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;

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

@@ -137,19 +137,19 @@ Table	Create Table
 Ｔ７	CREATE TABLE `Ｔ７` (
   `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `Ｔ８`;
 Table	Create Table
 Ｔ８	CREATE TABLE `Ｔ８` (
   `Ｃ１` enum('あ','い','う') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `Ｔ９`;
 Table	Create Table
 Ｔ９	CREATE TABLE `Ｔ９` (
   `Ｃ１` enum('ソ','十','表') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `Ｔ１０`;
 Table	Create Table
 Ｔ１０	CREATE TABLE `Ｔ１０` (
@@ -219,134 +219,134 @@ ALTER TABLE `
 SHOW CREATE TABLE `Ｔ１`;
 Table	Create Table
 Ｔ１	CREATE TABLE `Ｔ１` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `Ｔ２`;
 Table	Create Table
 Ｔ２	CREATE TABLE `Ｔ２` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('あ','い','う') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `Ｔ３`;
 Table	Create Table
 Ｔ３	CREATE TABLE `Ｔ３` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('ソ','十','表') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `Ｔ４`;
 Table	Create Table
 Ｔ４	CREATE TABLE `Ｔ４` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `Ｔ５`;
 Table	Create Table
 Ｔ５	CREATE TABLE `Ｔ５` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('あ','い','う') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `Ｔ６`;
 Table	Create Table
 Ｔ６	CREATE TABLE `Ｔ６` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('ソ','十','表') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `Ｔ７`;
 Table	Create Table
 Ｔ７	CREATE TABLE `Ｔ７` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `Ｔ８`;
 Table	Create Table
 Ｔ８	CREATE TABLE `Ｔ８` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('あ','い','う') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `Ｔ９`;
 Table	Create Table
 Ｔ９	CREATE TABLE `Ｔ９` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('ソ','十','表') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `Ｔ１０`;
 Table	Create Table
 Ｔ１０	CREATE TABLE `Ｔ１０` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `Ｔ１１`;
 Table	Create Table
 Ｔ１１	CREATE TABLE `Ｔ１１` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('あ','い','う') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
 SHOW CREATE TABLE `Ｔ１２`;
 Table	Create Table
 Ｔ１２	CREATE TABLE `Ｔ１２` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('ソ','十','表') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
 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)				
+Ｃ２	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	
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;

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

@@ -138,19 +138,19 @@ Table	Create Table
 Ｔ７	CREATE TABLE `Ｔ７` (
   `Ｃ１` 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
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `Ｔ９`;
 Table	Create Table
 Ｔ９	CREATE TABLE `Ｔ９` (
   `Ｃ１` enum('龔','龖','龗') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 SHOW CREATE TABLE `Ｔ１０`;
 Table	Create Table
 Ｔ１０	CREATE TABLE `Ｔ１０` (

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

@@ -137,19 +137,19 @@ Table	Create Table
 Ｔ７	CREATE TABLE `Ｔ７` (
   `Ｃ１` 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
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `Ｔ９`;
 Table	Create Table
 Ｔ９	CREATE TABLE `Ｔ９` (
   `Ｃ１` enum('龔','龖','龗') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `Ｔ１０`;
 Table	Create Table
 Ｔ１０	CREATE TABLE `Ｔ１０` (
@@ -219,134 +219,134 @@ ALTER TABLE `
 SHOW CREATE TABLE `Ｔ１`;
 Table	Create Table
 Ｔ１	CREATE TABLE `Ｔ１` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` 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 '',
+  `Ｃ２` 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 '',
+  `Ｃ２` 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 '',
+  `Ｃ２` 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 '',
+  `Ｃ２` 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 '',
+  `Ｃ２` 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 '',
+  `Ｃ２` 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 '',
+  `Ｃ２` 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 '',
+  `Ｃ２` 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 '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `Ｔ１１`;
 Table	Create Table
 Ｔ１１	CREATE TABLE `Ｔ１１` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('あ','い','う') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
 SHOW CREATE TABLE `Ｔ１２`;
 Table	Create Table
 Ｔ１２	CREATE TABLE `Ｔ１２` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('龔','龖','龗') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=BerkeleyDB 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)				
+Ｃ２	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	
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;

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

@@ -137,19 +137,19 @@ Table	Create Table
 Ｔ７	CREATE TABLE `Ｔ７` (
   `Ｃ１` 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
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `Ｔ９`;
 Table	Create Table
 Ｔ９	CREATE TABLE `Ｔ９` (
   `Ｃ１` enum('龔','龖','龗') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `Ｔ１０`;
 Table	Create Table
 Ｔ１０	CREATE TABLE `Ｔ１０` (
@@ -219,134 +219,134 @@ ALTER TABLE `Ｔ１２` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
 SHOW CREATE TABLE `Ｔ１`;
 Table	Create Table
 Ｔ１	CREATE TABLE `Ｔ１` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` 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 '',
+  `Ｃ２` 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 '',
+  `Ｃ２` 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 '',
+  `Ｃ２` 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 '',
+  `Ｃ２` 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 '',
+  `Ｃ２` 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 '',
+  `Ｃ２` 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 '',
+  `Ｃ２` 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 '',
+  `Ｃ２` 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 '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `Ｔ１１`;
 Table	Create Table
 Ｔ１１	CREATE TABLE `Ｔ１１` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('あ','い','う') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `Ｔ１２`;
 Table	Create Table
 Ｔ１２	CREATE TABLE `Ｔ１２` (
-  `Ｃ２` char(1) NOT NULL default '',
+  `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('龔','龖','龗') default NULL,
   KEY `Ｃ１` (`Ｃ１`)
 ) ENGINE=BerkeleyDB 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)				
+Ｃ２	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	
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;

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

@@ -24,18 +24,6 @@ CREATE TABLE `
 CREATE TABLE `Ｔ１０` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
 CREATE TABLE `Ｔ１１` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
 CREATE TABLE `Ｔ１２` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `Ｔ１`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `Ｔ２`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `Ｔ３`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `Ｔ４`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `Ｔ５`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `Ｔ６`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `Ｔ７`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `Ｔ８`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `Ｔ９`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `Ｔ１０`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `Ｔ１１`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `Ｔ１２`;
 SELECT * FROM `Ｔ１` WHERE `Ｃ１` LIKE ' %';
 Ｃ１
  !"#$%&'()*+,-./

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

@@ -24,18 +24,6 @@ CREATE TABLE `
 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;
-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 `Ｔ６`;
-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 ' %';
 Ｃ１
  !"#$%&'()*+,-./

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

@@ -24,18 +24,6 @@ CREATE TABLE `Ｔ９` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf
 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;
-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 `Ｔ６`;
-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 ' %';
 Ｃ１
  !"#$%&'()*+,-./

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

@@ -24,18 +24,6 @@ CREATE TABLE `
 CREATE TABLE `Ｔ１０` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
 CREATE TABLE `Ｔ１１` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
 CREATE TABLE `Ｔ１２` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `Ｔ１`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `Ｔ２`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `Ｔ３`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `Ｔ４`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `Ｔ５`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `Ｔ６`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `Ｔ７`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `Ｔ８`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `Ｔ９`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `Ｔ１０`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `Ｔ１１`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `Ｔ１２`;
 SELECT * FROM `Ｔ１`;
 Ｃ１
  !"#$%&'()*+,-./
@@ -118,6 +106,7 @@ SELECT * FROM `
 齔齣齟齠齡齦齧齬齪齷齲齶龕龜龠・・・・・
 SELECT * FROM `Ｔ３`;
 Ｃ１
+
 ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤
 SELECT * FROM `Ｔ４`;
 Ｃ１
@@ -201,6 +190,7 @@ SELECT * FROM `
 齔齣齟齠齡齦齧齬齪齷齲齶龕龜龠・・・・・
 SELECT * FROM `Ｔ６`;
 Ｃ１
+
 ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤
 SELECT * FROM `Ｔ７`;
 Ｃ１
@@ -285,6 +275,7 @@ SELECT * FROM `
 SELECT * FROM `Ｔ９`;
 Ｃ１
 ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤
+
 SELECT * FROM `Ｔ１０`;
 Ｃ１
  !"#$%&'()*+,-./
@@ -368,6 +359,7 @@ SELECT * FROM `
 SELECT * FROM `Ｔ１２`;
 Ｃ１
 ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤
+
 drop table `Ｔ１`;
 drop table `Ｔ２`;
 drop table `Ｔ３`;

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

@@ -24,18 +24,6 @@ CREATE TABLE `
 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;
-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 `Ｔ６`;
-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
  !"#$%&'()*+,-./

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

@@ -24,18 +24,6 @@ CREATE TABLE `Ｔ９` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = h
 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;
-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 `Ｔ６`;
-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
  !"#$%&'()*+,-./

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

@@ -24,18 +24,6 @@ CREATE TABLE `
 CREATE TABLE `Ｔ１０` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
 CREATE TABLE `Ｔ１１` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
 CREATE TABLE `Ｔ１２` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `Ｔ１`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `Ｔ２`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `Ｔ３`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `Ｔ４`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `Ｔ５`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `Ｔ６`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `Ｔ７`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `Ｔ８`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `Ｔ９`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `Ｔ１０`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `Ｔ１１`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `Ｔ１２`;
 SELECT * FROM `Ｔ１` WHERE `Ｃ１` = 'ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ';
 Ｃ１
 ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ

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

@@ -24,18 +24,6 @@ CREATE TABLE `
 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;
-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 `Ｔ６`;
-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 `Ｃ１` = 'ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ';
 Ｃ１
 ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ

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

@@ -24,18 +24,6 @@ CREATE TABLE `Ｔ９` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf
 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;
-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 `Ｔ６`;
-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 `Ｃ１` = 'ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ';
 Ｃ１
 ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ

mysql-test/suite/jp/t/jp_alter_sjis.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --character_set sjis
 SET NAMES sjis;
 SET character_set_database = sjis;

mysql-test/suite/jp/t/jp_alter_ucs2.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --source include/have_ucs2.inc
 
 --disable_warnings

mysql-test/suite/jp/t/jp_alter_ujis.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --source include/have_ujis.inc
 
 --disable_warnings

mysql-test/suite/jp/t/jp_alter_utf8.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --disable_warnings
 DROP TABLE IF EXISTS `ｱｱｱ`;
 DROP TABLE IF EXISTS `ｲｲｲ`;

mysql-test/suite/jp/t/jp_charlength_sjis.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --character_set sjis
 --disable_warnings
 drop table if exists `Ｔ１`;

mysql-test/suite/jp/t/jp_charlength_ucs2.test

+-- source include/have_innodb.inc
+-- source include/have_bdb.inc
 --source include/have_ucs2.inc
 
 --disable_warnings