List:Commits« Previous MessageNext Message »
From:mleich Date:May 15 2008 4:01pm
Subject:bk commit into 5.1 tree (mleich:1.2635) BUG#28563
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of mleich.  When mleich does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

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

  mysql-test/suite/jp/include/trim_sjis.inc@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +70 -0
    Auxiliary script

  mysql-test/suite/jp/include/trim_sjis.inc@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +0 -0

  mysql-test/suite/jp/r/jp_alter_sjis.result@stripped, 2008-05-15 18:01:06+02:00, mleich@stripped +93 -246
    Updated results

  mysql-test/suite/jp/r/jp_alter_ucs2.result@stripped, 2008-05-15 18:01:06+02:00, mleich@stripped +93 -246
    Updated results

  mysql-test/suite/jp/r/jp_alter_ujis.result@stripped, 2008-05-15 18:01:06+02:00, mleich@stripped +93 -246
    Updated results

  mysql-test/suite/jp/r/jp_alter_utf8.result@stripped, 2008-05-15 18:01:06+02:00, mleich@stripped +93 -246
    Updated results

  mysql-test/suite/jp/r/jp_charlength_sjis.result@stripped, 2008-05-15 18:01:06+02:00, mleich@stripped +3 -39
    Updated results

  mysql-test/suite/jp/r/jp_charlength_ucs2.result@stripped, 2008-05-15 18:01:06+02:00, mleich@stripped +3 -39
    Updated results

  mysql-test/suite/jp/r/jp_charlength_ujis.result@stripped, 2008-05-15 18:01:06+02:00, mleich@stripped +3 -39
    Updated results

  mysql-test/suite/jp/r/jp_charlength_utf8.result@stripped, 2008-05-15 18:01:06+02:00, mleich@stripped +3 -39
    Updated results

  mysql-test/suite/jp/r/jp_charset_sjis.result@stripped, 2008-05-15 18:01:06+02:00, mleich@stripped +3 -60
    Updated results

  mysql-test/suite/jp/r/jp_charset_ucs2.result@stripped, 2008-05-15 18:01:06+02:00, mleich@stripped +3 -79
    Updated results

  mysql-test/suite/jp/r/jp_charset_ujis.result@stripped, 2008-05-15 18:01:06+02:00, mleich@stripped +3 -60
    Updated results

  mysql-test/suite/jp/r/jp_charset_utf8.result@stripped, 2008-05-15 18:01:06+02:00, mleich@stripped +3 -60
    Updated results

  mysql-test/suite/jp/r/jp_convert_sjis.result@stripped, 2008-05-15 18:01:06+02:00, mleich@stripped +3 -264
    Updated results

  mysql-test/suite/jp/r/jp_convert_ucs2.result@stripped, 2008-05-15 18:01:06+02:00, mleich@stripped +3 -109
    Updated results

  mysql-test/suite/jp/r/jp_convert_ujis.result@stripped, 2008-05-15 18:01:06+02:00, mleich@stripped +3 -381
    Updated results

  mysql-test/suite/jp/r/jp_convert_utf8.result@stripped, 2008-05-15 18:01:06+02:00, mleich@stripped +3 -381
    Updated results

  mysql-test/suite/jp/r/jp_create_db_sjis.result@stripped, 2008-05-15 18:01:06+02:00, mleich@stripped +3 -2
    Updated results

  mysql-test/suite/jp/r/jp_create_db_ucs2.result@stripped, 2008-05-15 18:01:06+02:00, mleich@stripped +3 -2
    Updated results

  mysql-test/suite/jp/r/jp_create_db_ujis.result@stripped, 2008-05-15 18:01:06+02:00, mleich@stripped +3 -2
    Updated results

  mysql-test/suite/jp/r/jp_create_db_utf8.result@stripped, 2008-05-15 18:01:06+02:00, mleich@stripped +3 -2
    Updated results

  mysql-test/suite/jp/r/jp_create_tbl_sjis.result@stripped, 2008-05-15 18:01:06+02:00, mleich@stripped +117 -237
    Updated results

  mysql-test/suite/jp/r/jp_create_tbl_ucs2.result@stripped, 2008-05-15 18:01:06+02:00, mleich@stripped +117 -237
    Updated results

  mysql-test/suite/jp/r/jp_create_tbl_ujis.result@stripped, 2008-05-15 18:01:06+02:00, mleich@stripped +117 -237
    Updated results

  mysql-test/suite/jp/r/jp_create_tbl_utf8.result@stripped, 2008-05-15 18:01:06+02:00, mleich@stripped +117 -237
    Updated results

  mysql-test/suite/jp/r/jp_enum_sjis.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +52 -135
    Updated results

  mysql-test/suite/jp/r/jp_enum_ucs2.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +117 -63
    Updated results

  mysql-test/suite/jp/r/jp_enum_ujis.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +45 -135
    Updated results

  mysql-test/suite/jp/r/jp_enum_utf8.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +45 -135
    Updated results

  mysql-test/suite/jp/r/jp_insert_sjis.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +3 -195
    Updated results

  mysql-test/suite/jp/r/jp_insert_ucs2.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +3 -195
    Updated results

  mysql-test/suite/jp/r/jp_insert_ujis.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +3 -195
    Updated results

  mysql-test/suite/jp/r/jp_insert_utf8.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +3 -195
    Updated results

  mysql-test/suite/jp/r/jp_instr_sjis.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +3 -67
    Updated results

  mysql-test/suite/jp/r/jp_instr_ucs2.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +3 -67
    Updated results

  mysql-test/suite/jp/r/jp_instr_ujis.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +3 -67
    Updated results

  mysql-test/suite/jp/r/jp_instr_utf8.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +3 -67
    Updated results

  mysql-test/suite/jp/r/jp_join_sjis.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +132 -267
    Updated results

  mysql-test/suite/jp/r/jp_join_ucs2.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +138 -273
    Updated results

  mysql-test/suite/jp/r/jp_join_ujis.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +138 -273
    Updated results

  mysql-test/suite/jp/r/jp_join_utf8.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +144 -279
    Updated results

  mysql-test/suite/jp/r/jp_left_sjis.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +3 -159
    Updated results

  mysql-test/suite/jp/r/jp_left_ucs2.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +3 -159
    Updated results

  mysql-test/suite/jp/r/jp_left_ujis.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +3 -159
    Updated results

  mysql-test/suite/jp/r/jp_left_utf8.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +3 -159
    Updated results

  mysql-test/suite/jp/r/jp_length_sjis.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +3 -39
    Updated results

  mysql-test/suite/jp/r/jp_length_ucs2.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +3 -39
    Updated results

  mysql-test/suite/jp/r/jp_length_ujis.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +3 -39
    Updated results

  mysql-test/suite/jp/r/jp_length_utf8.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +3 -39
    Updated results

  mysql-test/suite/jp/r/jp_like_sjis.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +3 -65
    Updated results

  mysql-test/suite/jp/r/jp_like_ucs2.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +3 -107
    Updated results

  mysql-test/suite/jp/r/jp_like_ujis.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +3 -65
    Updated results

  mysql-test/suite/jp/r/jp_like_utf8.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +3 -62
    Updated results

  mysql-test/suite/jp/r/jp_locate_sjis.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +3 -67
    Updated results

  mysql-test/suite/jp/r/jp_locate_ucs2.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +3 -67
    Updated results

  mysql-test/suite/jp/r/jp_locate_ujis.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +3 -67
    Updated results

  mysql-test/suite/jp/r/jp_locate_utf8.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +3 -67
    Updated results

  mysql-test/suite/jp/r/jp_lpad_sjis.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +3 -39
    Updated results

  mysql-test/suite/jp/r/jp_lpad_ucs2.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +3 -39
    Updated results

  mysql-test/suite/jp/r/jp_lpad_ujis.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +3 -39
    Updated results

  mysql-test/suite/jp/r/jp_lpad_utf8.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +3 -39
    Updated results

  mysql-test/suite/jp/r/jp_ltrim_sjis.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +3 -58
    Updated results

  mysql-test/suite/jp/r/jp_ltrim_ucs2.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +3 -58
    Updated results

  mysql-test/suite/jp/r/jp_ltrim_ujis.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +3 -58
    Updated results

  mysql-test/suite/jp/r/jp_ltrim_utf8.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +3 -58
    Updated results

  mysql-test/suite/jp/r/jp_ps_sjis.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +4 -231
    Updated results

  mysql-test/suite/jp/r/jp_ps_ujis.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +4 -231
    Updated results

  mysql-test/suite/jp/r/jp_replace_sjis.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +3 -60
    Updated results

  mysql-test/suite/jp/r/jp_replace_ucs2.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +3 -60
    Updated results

  mysql-test/suite/jp/r/jp_replace_ujis.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +3 -60
    Updated results

  mysql-test/suite/jp/r/jp_replace_utf8.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +3 -60
    Updated results

  mysql-test/suite/jp/r/jp_reverse_sjis.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +3 -24
    Updated results

  mysql-test/suite/jp/r/jp_reverse_ucs2.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +3 -24
    Updated results

  mysql-test/suite/jp/r/jp_reverse_ujis.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +3 -24
    Updated results

  mysql-test/suite/jp/r/jp_reverse_utf8.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +3 -24
    Updated results

  mysql-test/suite/jp/r/jp_right_sjis.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +3 -159
    Updated results

  mysql-test/suite/jp/r/jp_right_ucs2.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +3 -159
    Updated results

  mysql-test/suite/jp/r/jp_right_ujis.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +3 -159
    Updated results

  mysql-test/suite/jp/r/jp_right_utf8.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +3 -159
    Updated results

  mysql-test/suite/jp/r/jp_rpad_sjis.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +3 -39
    Updated results

  mysql-test/suite/jp/r/jp_rpad_ucs2.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +3 -39
    Updated results

  mysql-test/suite/jp/r/jp_rpad_ujis.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +3 -39
    Updated results

  mysql-test/suite/jp/r/jp_rpad_utf8.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +3 -39
    Updated results

  mysql-test/suite/jp/r/jp_rtrim_sjis.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +3 -58
    Updated results

  mysql-test/suite/jp/r/jp_rtrim_ucs2.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +3 -58
    Updated results

  mysql-test/suite/jp/r/jp_rtrim_ujis.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +3 -58
    Updated results

  mysql-test/suite/jp/r/jp_rtrim_utf8.result@stripped, 2008-05-15 18:01:07+02:00, mleich@stripped +3 -58
    Updated results

  mysql-test/suite/jp/r/jp_select_sjis.result@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +3 -98
    Updated results

  mysql-test/suite/jp/r/jp_select_ucs2.result@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +0 -56
    Updated results

  mysql-test/suite/jp/r/jp_select_ujis.result@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +3 -137
    Updated results

  mysql-test/suite/jp/r/jp_select_utf8.result@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +3 -137
    Updated results

  mysql-test/suite/jp/r/jp_subquery_sjis.result@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +6 -57
    Updated results

  mysql-test/suite/jp/r/jp_subquery_ucs2.result@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +24 -66
    Updated results

  mysql-test/suite/jp/r/jp_subquery_ujis.result@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +24 -66
    Updated results

  mysql-test/suite/jp/r/jp_subquery_utf8.result@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +6 -57
    Updated results

  mysql-test/suite/jp/r/jp_substring_sjis.result@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +3 -687
    Updated results

  mysql-test/suite/jp/r/jp_substring_ucs2.result@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +3 -351
    Updated results

  mysql-test/suite/jp/r/jp_substring_ujis.result@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +3 -687
    Updated results

  mysql-test/suite/jp/r/jp_substring_utf8.result@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +3 -687
    Updated results

  mysql-test/suite/jp/r/jp_trim_sjis.result@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +108 -270
    Updated results

  mysql-test/suite/jp/r/jp_trim_ucs2.result@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +3 -169
    Updated results

  mysql-test/suite/jp/r/jp_trim_ujis.result@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +3 -169
    Updated results

  mysql-test/suite/jp/r/jp_trim_utf8.result@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +3 -169
    Updated results

  mysql-test/suite/jp/r/jp_union_ujis.result@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +3 -101
    Updated results

  mysql-test/suite/jp/r/jp_update_sjis.result@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +3 -27
    Updated results

  mysql-test/suite/jp/r/jp_update_ucs2.result@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +3 -27
    Updated results

  mysql-test/suite/jp/r/jp_update_ujis.result@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +3 -27
    Updated results

  mysql-test/suite/jp/r/jp_update_utf8.result@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +3 -27
    Updated results

  mysql-test/suite/jp/r/jp_where_sjis.result@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +10 -33
    Updated results

  mysql-test/suite/jp/r/jp_where_ucs2.result@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +3 -43
    Updated results

  mysql-test/suite/jp/r/jp_where_ujis.result@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +3 -24
    Updated results

  mysql-test/suite/jp/r/jp_where_utf8.result@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +3 -24
    Updated results

  mysql-test/suite/jp/t/disabled.def@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +13 -0
    Disable tests which suffer to an unacceptable extend
        from bug 36597 Testsuite "jp": Suspicious results for some tests

  mysql-test/suite/jp/t/disabled.def@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +0 -0

  mysql-test/suite/jp/t/jp_alter_sjis.test@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +9 -107
    Updated results

  mysql-test/suite/jp/t/jp_alter_ucs2.test@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +8 -107
    Updated results

  mysql-test/suite/jp/t/jp_alter_ujis.test@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +9 -107
    Updated results

  mysql-test/suite/jp/t/jp_alter_utf8.test@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +10 -107
    Updated results

  mysql-test/suite/jp/t/jp_charlength_sjis.test@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +6 -21
    Updated results

  mysql-test/suite/jp/t/jp_charlength_ucs2.test@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +5 -21
    Updated results

  mysql-test/suite/jp/t/jp_charlength_ujis.test@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +5 -21
    Updated results

  mysql-test/suite/jp/t/jp_charlength_utf8.test@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +6 -21
    Updated results

  mysql-test/suite/jp/t/jp_charset_sjis.test@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +9 -33
    Updated results

  mysql-test/suite/jp/t/jp_charset_ucs2.test@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +8 -55
    Updated results

  mysql-test/suite/jp/t/jp_charset_ujis.test@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +8 -33
    Updated results

  mysql-test/suite/jp/t/jp_charset_utf8.test@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +10 -33
    Updated results

  mysql-test/suite/jp/t/jp_convert_sjis.test@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +10 -27
    Updated results

  mysql-test/suite/jp/t/jp_convert_ucs2.test@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +8 -50
    Updated results

  mysql-test/suite/jp/t/jp_convert_ujis.test@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +8 -28
    Updated results

  mysql-test/suite/jp/t/jp_convert_utf8.test@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +9 -28
    Updated results

  mysql-test/suite/jp/t/jp_create_db_sjis.test@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +1 -0
    Updated results

  mysql-test/suite/jp/t/jp_create_db_utf8.test@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +1 -0
    Updated results

  mysql-test/suite/jp/t/jp_create_tbl_sjis.test@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +23 -93
    Updated results

  mysql-test/suite/jp/t/jp_create_tbl_ucs2.test@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +22 -93
    Updated results

  mysql-test/suite/jp/t/jp_create_tbl_ujis.test@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +22 -93
    Updated results

  mysql-test/suite/jp/t/jp_create_tbl_utf8.test@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +23 -93
    Updated results

  mysql-test/suite/jp/t/jp_enum_sjis-master.opt@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +1 -0
    
    

  mysql-test/suite/jp/t/jp_enum_sjis-master.opt@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +0 -0

  mysql-test/suite/jp/t/jp_enum_sjis.test@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +12 -39
    Updated results

  mysql-test/suite/jp/t/jp_enum_ucs2-master.opt@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +1 -0
    
    

  mysql-test/suite/jp/t/jp_enum_ucs2-master.opt@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +0 -0

  mysql-test/suite/jp/t/jp_enum_ucs2.test@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +33 -63
    Updated results

  mysql-test/suite/jp/t/jp_enum_ujis-master.opt@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +1 -0
    
    

  mysql-test/suite/jp/t/jp_enum_ujis-master.opt@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +0 -0

  mysql-test/suite/jp/t/jp_enum_ujis.test@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +4 -33
    Updated results

  mysql-test/suite/jp/t/jp_enum_utf8-master.opt@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +1 -0
    
    

  mysql-test/suite/jp/t/jp_enum_utf8-master.opt@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +0 -0

  mysql-test/suite/jp/t/jp_enum_utf8.test@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +5 -33
    Updated results

  mysql-test/suite/jp/t/jp_insert_sjis.test@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +6 -78
    Updated results

  mysql-test/suite/jp/t/jp_insert_ucs2.test@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +5 -78
    Updated results

  mysql-test/suite/jp/t/jp_insert_ujis.test@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +5 -78
    Updated results

  mysql-test/suite/jp/t/jp_insert_utf8.test@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +6 -78
    Updated results

  mysql-test/suite/jp/t/jp_instr_sjis.test@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +6 -34
    Updated results

  mysql-test/suite/jp/t/jp_instr_ucs2.test@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +5 -34
    Updated results

  mysql-test/suite/jp/t/jp_instr_ujis.test@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +5 -34
    Updated results

  mysql-test/suite/jp/t/jp_instr_utf8.test@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +6 -34
    Updated results

  mysql-test/suite/jp/t/jp_join_sjis.test@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +27 -66
    Updated results

  mysql-test/suite/jp/t/jp_join_ucs2.test@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +32 -72
    Updated results

  mysql-test/suite/jp/t/jp_join_ujis.test@stripped, 2008-05-15 18:01:08+02:00, mleich@stripped +32 -72
    Updated results

  mysql-test/suite/jp/t/jp_join_utf8.test@stripped, 2008-05-15 18:01:09+02:00, mleich@stripped +40 -79
    Updated results

  mysql-test/suite/jp/t/jp_left_sjis.test@stripped, 2008-05-15 18:01:09+02:00, mleich@stripped +6 -36
    Updated results

  mysql-test/suite/jp/t/jp_left_ucs2.test@stripped, 2008-05-15 18:01:09+02:00, mleich@stripped +5 -36
    Updated results

  mysql-test/suite/jp/t/jp_left_ujis.test@stripped, 2008-05-15 18:01:09+02:00, mleich@stripped +5 -36
    Updated results

  mysql-test/suite/jp/t/jp_left_utf8.test@stripped, 2008-05-15 18:01:09+02:00, mleich@stripped +6 -36
    Updated results

  mysql-test/suite/jp/t/jp_length_sjis.test@stripped, 2008-05-15 18:01:09+02:00, mleich@stripped +6 -21
    Updated results

  mysql-test/suite/jp/t/jp_length_ucs2.test@stripped, 2008-05-15 18:01:09+02:00, mleich@stripped +5 -21
    Updated results

  mysql-test/suite/jp/t/jp_length_ujis.test@stripped, 2008-05-15 18:01:09+02:00, mleich@stripped +5 -21
    Updated results

  mysql-test/suite/jp/t/jp_length_utf8.test@stripped, 2008-05-15 18:01:09+02:00, mleich@stripped +6 -21
    Updated results

  mysql-test/suite/jp/t/jp_like_sjis.test@stripped, 2008-05-15 18:01:09+02:00, mleich@stripped +5 -41
    Updated results

  mysql-test/suite/jp/t/jp_like_ucs2.test@stripped, 2008-05-15 18:01:09+02:00, mleich@stripped +5 -67
    Updated results

  mysql-test/suite/jp/t/jp_like_ujis.test@stripped, 2008-05-15 18:01:09+02:00, mleich@stripped +5 -41
    Updated results

  mysql-test/suite/jp/t/jp_like_utf8.test@stripped, 2008-05-15 18:01:09+02:00, mleich@stripped +6 -41
    Updated results

  mysql-test/suite/jp/t/jp_locate_sjis.test@stripped, 2008-05-15 18:01:09+02:00, mleich@stripped +6 -35
    Updated results

  mysql-test/suite/jp/t/jp_locate_ucs2.test@stripped, 2008-05-15 18:01:09+02:00, mleich@stripped +5 -35
    Updated results

  mysql-test/suite/jp/t/jp_locate_ujis.test@stripped, 2008-05-15 18:01:09+02:00, mleich@stripped +5 -35
    Updated results

  mysql-test/suite/jp/t/jp_locate_utf8.test@stripped, 2008-05-15 18:01:09+02:00, mleich@stripped +6 -35
    Updated results

  mysql-test/suite/jp/t/jp_lpad_sjis.test@stripped, 2008-05-15 18:01:09+02:00, mleich@stripped +6 -21
    Updated results

  mysql-test/suite/jp/t/jp_lpad_ucs2.test@stripped, 2008-05-15 18:01:09+02:00, mleich@stripped +5 -21
    Updated results

  mysql-test/suite/jp/t/jp_lpad_ujis.test@stripped, 2008-05-15 18:01:09+02:00, mleich@stripped +5 -21
    Updated results

  mysql-test/suite/jp/t/jp_lpad_utf8.test@stripped, 2008-05-15 18:01:09+02:00, mleich@stripped +6 -21
    Updated results

  mysql-test/suite/jp/t/jp_ltrim_sjis.test@stripped, 2008-05-15 18:01:09+02:00, mleich@stripped +6 -40
    Updated results

  mysql-test/suite/jp/t/jp_ltrim_ucs2.test@stripped, 2008-05-15 18:01:09+02:00, mleich@stripped +5 -40
    Updated results

  mysql-test/suite/jp/t/jp_ltrim_ujis.test@stripped, 2008-05-15 18:01:09+02:00, mleich@stripped +5 -40
    Updated results

  mysql-test/suite/jp/t/jp_ltrim_utf8.test@stripped, 2008-05-15 18:01:09+02:00, mleich@stripped +6 -40
    Updated results

  mysql-test/suite/jp/t/jp_ps_sjis.test@stripped, 2008-05-15 18:01:09+02:00, mleich@stripped +8 -114
    Updated results

  mysql-test/suite/jp/t/jp_ps_ujis.test@stripped, 2008-05-15 18:01:09+02:00, mleich@stripped +6 -114
    Updated results

  mysql-test/suite/jp/t/jp_replace_sjis.test@stripped, 2008-05-15 18:01:09+02:00, mleich@stripped +6 -33
    Updated results

  mysql-test/suite/jp/t/jp_replace_ucs2.test@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +5 -33
    Updated results

  mysql-test/suite/jp/t/jp_replace_ujis.test@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +5 -33
    Updated results

  mysql-test/suite/jp/t/jp_replace_utf8.test@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +6 -33
    Updated results

  mysql-test/suite/jp/t/jp_reverse_sjis.test@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +6 -21
    Updated results

  mysql-test/suite/jp/t/jp_reverse_ucs2.test@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +5 -21
    Updated results

  mysql-test/suite/jp/t/jp_reverse_ujis.test@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +5 -21
    Updated results

  mysql-test/suite/jp/t/jp_reverse_utf8.test@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +6 -21
    Updated results

  mysql-test/suite/jp/t/jp_right_sjis.test@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +6 -36
    Updated results

  mysql-test/suite/jp/t/jp_right_ucs2.test@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +5 -36
    Updated results

  mysql-test/suite/jp/t/jp_right_ujis.test@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +5 -36
    Updated results

  mysql-test/suite/jp/t/jp_right_utf8.test@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +6 -36
    Updated results

  mysql-test/suite/jp/t/jp_rpad_sjis.test@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +6 -21
    Updated results

  mysql-test/suite/jp/t/jp_rpad_ucs2.test@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +5 -21
    Updated results

  mysql-test/suite/jp/t/jp_rpad_ujis.test@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +5 -21
    Updated results

  mysql-test/suite/jp/t/jp_rpad_utf8.test@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +7 -21
    Updated results

  mysql-test/suite/jp/t/jp_rtrim_sjis.test@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +6 -40
    Updated results

  mysql-test/suite/jp/t/jp_rtrim_ucs2.test@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +5 -40
    Updated results

  mysql-test/suite/jp/t/jp_rtrim_ujis.test@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +5 -40
    Updated results

  mysql-test/suite/jp/t/jp_rtrim_utf8.test@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +6 -40
    Updated results

  mysql-test/suite/jp/t/jp_select_sjis.test@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +6 -20
    Updated results

  mysql-test/suite/jp/t/jp_select_ucs2.test@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +1 -38
    Updated results

  mysql-test/suite/jp/t/jp_select_ujis.test@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +5 -20
    Updated results

  mysql-test/suite/jp/t/jp_select_utf8.test@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +6 -20
    Updated results

  mysql-test/suite/jp/t/jp_subquery_sjis.test@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +8 -36
    Updated results

  mysql-test/suite/jp/t/jp_subquery_ucs2.test@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +25 -46
    Updated results

  mysql-test/suite/jp/t/jp_subquery_ujis.test@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +25 -46
    Updated results

  mysql-test/suite/jp/t/jp_subquery_utf8.test@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +11 -36
    Updated results

  mysql-test/suite/jp/t/jp_substring_sjis.test@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +7 -104
    Updated results

  mysql-test/suite/jp/t/jp_substring_ucs2.test@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +5 -104
    Updated results

  mysql-test/suite/jp/t/jp_substring_ujis.test@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +5 -104
    Updated results

  mysql-test/suite/jp/t/jp_substring_utf8.test@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +6 -104
    Updated results

  mysql-test/suite/jp/t/jp_trim_sjis.test@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +7 -213
    Updated results

  mysql-test/suite/jp/t/jp_trim_ucs2.test@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +5 -53
    Updated results

  mysql-test/suite/jp/t/jp_trim_ujis.test@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +5 -53
    Updated results

  mysql-test/suite/jp/t/jp_trim_utf8.test@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +6 -53
    Updated results

  mysql-test/suite/jp/t/jp_union_ujis.test@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +5 -31
    Updated results

  mysql-test/suite/jp/t/jp_update_sjis.test@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +6 -24
    Updated results

  mysql-test/suite/jp/t/jp_update_ucs2.test@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +5 -24
    Updated results

  mysql-test/suite/jp/t/jp_update_ujis.test@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +5 -24
    Updated results

  mysql-test/suite/jp/t/jp_update_utf8.test@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +6 -24
    Updated results

  mysql-test/suite/jp/t/jp_where_sjis.test@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +15 -26
    Updated results

  mysql-test/suite/jp/t/jp_where_ucs2.test@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +5 -43
    Updated results

  mysql-test/suite/jp/t/jp_where_ujis.test@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +5 -21
    Updated results

  mysql-test/suite/jp/t/jp_where_utf8.test@stripped, 2008-05-15 18:01:10+02:00, mleich@stripped +7 -22
    Updated results

diff -Nrup a/mysql-test/suite/jp/include/trim_sjis.inc b/mysql-test/suite/jp/include/trim_sjis.inc
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/jp/include/trim_sjis.inc	2008-05-15 18:01:10 +02:00
@@ -0,0 +1,70 @@
+#
+# Test TRIM() function with Japanese characters sjis encoding
+#
+
+--source include/have_sjis.inc
+--character_set sjis
+SET NAMES sjis;
+SET character_set_database = sjis;
+
+--disable_warnings
+--enable_warnings
+--replace_result $engine <engine_to_be_tested>
+--replace_result $engine <engine_to_be_tested>
+--replace_result $engine <engine_to_be_tested>
+
+# Nothing to trim
+# Test data for TRIM(TRAILING [remstr] FROM str)
+# Test data for TRIM(LEADING [remstr] FROM str)
+# Test data for TRIM(BOTH [remstr] FROM str)
+# Test data for TRIM without [remstr] (remove spaces) 
+
+
diff -Nrup a/mysql-test/suite/jp/r/jp_alter_sjis.result b/mysql-test/suite/jp/r/jp_alter_sjis.result
--- a/mysql-test/suite/jp/r/jp_alter_sjis.result	2005-01-07 13:27:27 +01:00
+++ b/mysql-test/suite/jp/r/jp_alter_sjis.result	2008-05-15 18:01:06 +02:00
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=sjis
-Field	Type	Null	Key	Default	Extra
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-Field	Type	Null	Key	Default	Extra
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-Field	Type	Null	Key	Default	Extra
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-Field	Type	Null	Key	Default	Extra
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-Field	Type	Null	Key	Default	Extra
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-Field	Type	Null	Key	Default	Extra
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
diff -Nrup a/mysql-test/suite/jp/r/jp_alter_ucs2.result b/mysql-test/suite/jp/r/jp_alter_ucs2.result
--- a/mysql-test/suite/jp/r/jp_alter_ucs2.result	2005-01-07 13:27:28 +01:00
+++ b/mysql-test/suite/jp/r/jp_alter_ucs2.result	2008-05-15 18:01:06 +02:00
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
-Field	Type	Null	Key	Default	Extra
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
-Field	Type	Null	Key	Default	Extra
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
-Field	Type	Null	Key	Default	Extra
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
-Field	Type	Null	Key	Default	Extra
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
-Field	Type	Null	Key	Default	Extra
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
-Field	Type	Null	Key	Default	Extra
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
diff -Nrup a/mysql-test/suite/jp/r/jp_alter_ujis.result b/mysql-test/suite/jp/r/jp_alter_ujis.result
--- a/mysql-test/suite/jp/r/jp_alter_ujis.result	2005-01-07 13:27:28 +01:00
+++ b/mysql-test/suite/jp/r/jp_alter_ujis.result	2008-05-15 18:01:06 +02:00
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 Field	Type	Null	Key	Default	Extra
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=ujis
-Field	Type	Null	Key	Default	Extra
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
-Field	Type	Null	Key	Default	Extra
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
-Field	Type	Null	Key	Default	Extra
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
-Field	Type	Null	Key	Default	Extra
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
-Field	Type	Null	Key	Default	Extra
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
-Field	Type	Null	Key	Default	Extra
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
diff -Nrup a/mysql-test/suite/jp/r/jp_alter_utf8.result b/mysql-test/suite/jp/r/jp_alter_utf8.result
--- a/mysql-test/suite/jp/r/jp_alter_utf8.result	2005-01-07 13:27:28 +01:00
+++ b/mysql-test/suite/jp/r/jp_alter_utf8.result	2008-05-15 18:01:06 +02:00
@@ -31,17 +31,17 @@ NULL	ウウウウウ	NULL	NULL
 DESC `アアア`;
 Field	Type	Null	Key	Default	Extra
 カカ	char(1)	YES	MUL	NULL	
-キキキ	char(6)		PRI		
-ククク	char(1)	YES	MUL	NULL	
+キキキ	char(6)	NO	PRI		
+ククク	char(1)	YES	UNI	NULL	
 ケケケ	char(1)	YES		NULL	
 SHOW CREATE TABLE `アアア`;
 Table	Create Table
 アアア	CREATE TABLE `アアア` (
-  `カカ` char(1) default NULL,
-  `キキキ` char(6) NOT NULL default '',
-  `ククク` char(1) default NULL,
-  `ケケケ` char(1) default NULL,
-  PRIMARY KEY  (`キキキ`),
+  `カカ` char(1) DEFAULT NULL,
+  `キキキ` char(6) NOT NULL DEFAULT '',
+  `ククク` char(1) DEFAULT NULL,
+  `ケケケ` char(1) DEFAULT NULL,
+  PRIMARY KEY (`キキキ`),
   UNIQUE KEY `ククク` (`ククク`),
   KEY `カカカ` (`カカ`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
@@ -58,11 +58,11 @@ SELECT * FROM `アアア`;
 ウウウウウ
 DESC `アアア`;
 Field	Type	Null	Key	Default	Extra
-キキキ	char(6)				
+キキキ	char(6)	NO			
 SHOW CREATE TABLE `アアア`;
 Table	Create Table
 アアア	CREATE TABLE `アアア` (
-  `キキキ` char(6) NOT NULL default ''
+  `キキキ` char(6) NOT NULL DEFAULT ''
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
 ALTER TABLE `あああ` ADD `かかか` char(1) FIRST;
 ALTER TABLE `あああ` ADD `くくく` char(1) AFTER `ききき`;
@@ -80,17 +80,17 @@ NULL	ううううう	NULL	NULL
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
 かか	char(1)	YES	MUL	NULL	
-ききき	char(6)		PRI		
-くくく	char(1)	YES	MUL	NULL	
+ききき	char(6)	NO	PRI		
+くくく	char(1)	YES	UNI	NULL	
 けけけ	char(1)	YES		NULL	
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
-  `かか` char(1) default NULL,
-  `ききき` char(6) NOT NULL default '',
-  `くくく` char(1) default NULL,
-  `けけけ` char(1) default NULL,
-  PRIMARY KEY  (`ききき`),
+  `かか` char(1) DEFAULT NULL,
+  `ききき` char(6) NOT NULL DEFAULT '',
+  `くくく` char(1) DEFAULT NULL,
+  `けけけ` char(1) DEFAULT NULL,
+  PRIMARY KEY (`ききき`),
   UNIQUE KEY `くくく` (`くくく`),
   KEY `かかか` (`かか`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
@@ -107,11 +107,11 @@ SELECT * FROM `あああ`;
 ううううう
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
-ききき	char(6)				
+ききき	char(6)	NO			
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
-  `ききき` char(6) NOT NULL default ''
+  `ききき` char(6) NOT NULL DEFAULT ''
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
 ALTER TABLE `龖龖龖` ADD `丄丄丄` char(1) FIRST;
 ALTER TABLE `龖龖龖` ADD `丅丅丅` char(1) AFTER `丂丂丂`;
@@ -129,17 +129,17 @@ NULL	丅丅丅丅丅	NULL	NULL
 DESC `龖龖龖`;
 Field	Type	Null	Key	Default	Extra
 丄丄	char(1)	YES	MUL	NULL	
-丂丂丂	char(6)		PRI		
-丅丅丅	char(1)	YES	MUL	NULL	
+丂丂丂	char(6)	NO	PRI		
+丅丅丅	char(1)	YES	UNI	NULL	
 乚乚乚	char(1)	YES		NULL	
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
-  `丄丄` char(1) default NULL,
-  `丂丂丂` char(6) NOT NULL default '',
-  `丅丅丅` char(1) default NULL,
-  `乚乚乚` char(1) default NULL,
-  PRIMARY KEY  (`丂丂丂`),
+  `丄丄` char(1) DEFAULT NULL,
+  `丂丂丂` char(6) NOT NULL DEFAULT '',
+  `丅丅丅` char(1) DEFAULT NULL,
+  `乚乚乚` char(1) DEFAULT NULL,
+  PRIMARY KEY (`丂丂丂`),
   UNIQUE KEY `丅丅丅` (`丅丅丅`),
   KEY `丄丄丄` (`丄丄`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
@@ -156,11 +156,11 @@ SELECT * FROM `龖龖龖`;
 丅丅丅丅丅
 DESC `龖龖龖`;
 Field	Type	Null	Key	Default	Extra
-丂丂丂	char(6)				
+丂丂丂	char(6)	NO			
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
-  `丂丂丂` char(6) NOT NULL default ''
+  `丂丂丂` char(6) NOT NULL DEFAULT ''
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
 DROP TABLE `アアア`;
 DROP TABLE `イイイ`;
@@ -193,17 +193,17 @@ NULL	ウウウウウ	NULL	NULL
 DESC `アアア`;
 Field	Type	Null	Key	Default	Extra
 カカ	char(1)	YES	MUL	NULL	
-キキキ	char(6)		PRI		
-ククク	char(1)	YES	MUL	NULL	
+キキキ	char(6)	NO	PRI		
+ククク	char(1)	YES	UNI	NULL	
 ケケケ	char(1)	YES		NULL	
 SHOW CREATE TABLE `アアア`;
 Table	Create Table
 アアア	CREATE TABLE `アアア` (
-  `カカ` char(1) default NULL,
-  `キキキ` char(6) NOT NULL default '',
-  `ククク` char(1) default NULL,
-  `ケケケ` char(1) default NULL,
-  PRIMARY KEY  (`キキキ`),
+  `カカ` char(1) DEFAULT NULL,
+  `キキキ` char(6) NOT NULL DEFAULT '',
+  `ククク` char(1) DEFAULT NULL,
+  `ケケケ` char(1) DEFAULT NULL,
+  PRIMARY KEY (`キキキ`),
   UNIQUE KEY `ククク` (`ククク`),
   KEY `カカカ` (`カカ`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
@@ -220,11 +220,11 @@ SELECT * FROM `アアア`;
 ウウウウウ
 DESC `アアア`;
 Field	Type	Null	Key	Default	Extra
-キキキ	char(6)				
+キキキ	char(6)	NO			
 SHOW CREATE TABLE `アアア`;
 Table	Create Table
 アアア	CREATE TABLE `アアア` (
-  `キキキ` char(6) NOT NULL default ''
+  `キキキ` char(6) NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 ALTER TABLE `あああ` ADD `かかか` char(1) FIRST;
 ALTER TABLE `あああ` ADD `くくく` char(1) AFTER `ききき`;
@@ -242,17 +242,17 @@ NULL	ううううう	NULL	NULL
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
 かか	char(1)	YES	MUL	NULL	
-ききき	char(6)		PRI		
-くくく	char(1)	YES	MUL	NULL	
+ききき	char(6)	NO	PRI		
+くくく	char(1)	YES	UNI	NULL	
 けけけ	char(1)	YES		NULL	
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
-  `かか` char(1) default NULL,
-  `ききき` char(6) NOT NULL default '',
-  `くくく` char(1) default NULL,
-  `けけけ` char(1) default NULL,
-  PRIMARY KEY  (`ききき`),
+  `かか` char(1) DEFAULT NULL,
+  `ききき` char(6) NOT NULL DEFAULT '',
+  `くくく` char(1) DEFAULT NULL,
+  `けけけ` char(1) DEFAULT NULL,
+  PRIMARY KEY (`ききき`),
   UNIQUE KEY `くくく` (`くくく`),
   KEY `かかか` (`かか`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
@@ -269,11 +269,11 @@ SELECT * FROM `あああ`;
 ううううう
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
-ききき	char(6)				
+ききき	char(6)	NO			
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
-  `ききき` char(6) NOT NULL default ''
+  `ききき` char(6) NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 ALTER TABLE `龖龖龖` ADD `丄丄丄` char(1) FIRST;
 ALTER TABLE `龖龖龖` ADD `丅丅丅` char(1) AFTER `丂丂丂`;
@@ -291,17 +291,17 @@ NULL	丅丅丅丅丅	NULL	NULL
 DESC `龖龖龖`;
 Field	Type	Null	Key	Default	Extra
 丄丄	char(1)	YES	MUL	NULL	
-丂丂丂	char(6)		PRI		
-丅丅丅	char(1)	YES	MUL	NULL	
+丂丂丂	char(6)	NO	PRI		
+丅丅丅	char(1)	YES	UNI	NULL	
 乚乚乚	char(1)	YES		NULL	
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
-  `丄丄` char(1) default NULL,
-  `丂丂丂` char(6) NOT NULL default '',
-  `丅丅丅` char(1) default NULL,
-  `乚乚乚` char(1) default NULL,
-  PRIMARY KEY  (`丂丂丂`),
+  `丄丄` char(1) DEFAULT NULL,
+  `丂丂丂` char(6) NOT NULL DEFAULT '',
+  `丅丅丅` char(1) DEFAULT NULL,
+  `乚乚乚` char(1) DEFAULT NULL,
+  PRIMARY KEY (`丂丂丂`),
   UNIQUE KEY `丅丅丅` (`丅丅丅`),
   KEY `丄丄丄` (`丄丄`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
@@ -318,11 +318,11 @@ SELECT * FROM `龖龖龖`;
 丅丅丅丅丅
 DESC `龖龖龖`;
 Field	Type	Null	Key	Default	Extra
-丂丂丂	char(6)				
+丂丂丂	char(6)	NO			
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
-  `丂丂丂` char(6) NOT NULL default ''
+  `丂丂丂` char(6) NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 DROP TABLE `アアア`;
 DROP TABLE `イイイ`;
@@ -330,12 +330,12 @@ DROP TABLE `あああ`;
 DROP TABLE `いいい`;
 DROP TABLE `龖龖龖`;
 DROP TABLE `龗龗龗`;
-CREATE TABLE `アアア`(`キキキ` char(5)) DEFAULT CHARSET = utf8 engine=HEAP;
-CREATE TABLE `イイイ`(`ケケケ` char(5)) DEFAULT CHARSET = utf8 engine=HEAP;
-CREATE TABLE `あああ`(`ききき` char(5)) DEFAULT CHARSET = utf8 engine=HEAP;
-CREATE TABLE `いいい`(`けけけ` char(5)) DEFAULT CHARSET = utf8 engine=HEAP;
-CREATE TABLE `龖龖龖`(`丂丂丂` char(5)) DEFAULT CHARSET = utf8 engine=HEAP;
-CREATE TABLE `龗龗龗`(`乚乚乚` char(5)) DEFAULT CHARSET = utf8 engine=HEAP;
+CREATE TABLE `アアア`(`キキキ` char(5)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TABLE `イイイ`(`ケケケ` char(5)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TABLE `あああ`(`ききき` char(5)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TABLE `いいい`(`けけけ` char(5)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TABLE `龖龖龖`(`丂丂丂` char(5)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TABLE `龗龗龗`(`乚乚乚` char(5)) DEFAULT CHARSET = utf8 engine=MEMORY;
 INSERT INTO `アアア` VALUES ('アアアアア'),('イイイイイ'),('ウウウウウ');
 INSERT INTO `あああ` VALUES ('あああああ'),('いいいいい'),('ううううう');
 INSERT INTO `龖龖龖` VALUES ('丂丂丂丂丂'),('丄丄丄丄丄'),('丅丅丅丅丅');
@@ -355,20 +355,20 @@ NULL	ウウウウウ	NULL	NULL
 DESC `アアア`;
 Field	Type	Null	Key	Default	Extra
 カカ	char(1)	YES	MUL	NULL	
-キキキ	char(6)		PRI		
-ククク	char(1)	YES	MUL	NULL	
+キキキ	char(6)	NO	PRI		
+ククク	char(1)	YES	UNI	NULL	
 ケケケ	char(1)	YES		NULL	
 SHOW CREATE TABLE `アアア`;
 Table	Create Table
 アアア	CREATE TABLE `アアア` (
-  `カカ` char(1) default NULL,
-  `キキキ` char(6) NOT NULL default '',
-  `ククク` char(1) default NULL,
-  `ケケケ` char(1) default NULL,
-  PRIMARY KEY  (`キキキ`),
+  `カカ` char(1) DEFAULT NULL,
+  `キキキ` char(6) NOT NULL DEFAULT '',
+  `ククク` char(1) DEFAULT NULL,
+  `ケケケ` char(1) DEFAULT NULL,
+  PRIMARY KEY (`キキキ`),
   UNIQUE KEY `ククク` (`ククク`),
   KEY `カカカ` (`カカ`)
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 ALTER TABLE `アアア` DROP INDEX `カカカ`;
 ALTER TABLE `アアア` DROP PRIMARY KEY;
 ALTER TABLE `アアア` DROP INDEX `ククク`;
@@ -382,12 +382,12 @@ SELECT * FROM `アアア`;
 ウウウウウ
 DESC `アアア`;
 Field	Type	Null	Key	Default	Extra
-キキキ	char(6)				
+キキキ	char(6)	NO			
 SHOW CREATE TABLE `アアア`;
 Table	Create Table
 アアア	CREATE TABLE `アアア` (
-  `キキキ` char(6) NOT NULL default ''
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+  `キキキ` char(6) NOT NULL DEFAULT ''
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 ALTER TABLE `あああ` ADD `かかか` char(1) FIRST;
 ALTER TABLE `あああ` ADD `くくく` char(1) AFTER `ききき`;
 ALTER TABLE `あああ` ADD `けけけ` char(1);
@@ -404,20 +404,20 @@ NULL	ううううう	NULL	NULL
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
 かか	char(1)	YES	MUL	NULL	
-ききき	char(6)		PRI		
-くくく	char(1)	YES	MUL	NULL	
+ききき	char(6)	NO	PRI		
+くくく	char(1)	YES	UNI	NULL	
 けけけ	char(1)	YES		NULL	
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
-  `かか` char(1) default NULL,
-  `ききき` char(6) NOT NULL default '',
-  `くくく` char(1) default NULL,
-  `けけけ` char(1) default NULL,
-  PRIMARY KEY  (`ききき`),
+  `かか` char(1) DEFAULT NULL,
+  `ききき` char(6) NOT NULL DEFAULT '',
+  `くくく` char(1) DEFAULT NULL,
+  `けけけ` char(1) DEFAULT NULL,
+  PRIMARY KEY (`ききき`),
   UNIQUE KEY `くくく` (`くくく`),
   KEY `かかか` (`かか`)
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 ALTER TABLE `あああ` DROP INDEX `かかか`;
 ALTER TABLE `あああ` DROP PRIMARY KEY;
 ALTER TABLE `あああ` DROP INDEX `くくく`;
@@ -431,12 +431,12 @@ SELECT * FROM `あああ`;
 ううううう
 DESC `あああ`;
 Field	Type	Null	Key	Default	Extra
-ききき	char(6)				
+ききき	char(6)	NO			
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
-  `ききき` char(6) NOT NULL default ''
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+  `ききき` char(6) NOT NULL DEFAULT ''
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 ALTER TABLE `龖龖龖` ADD `丄丄丄` char(1) FIRST;
 ALTER TABLE `龖龖龖` ADD `丅丅丅` char(1) AFTER `丂丂丂`;
 ALTER TABLE `龖龖龖` ADD `乚乚乚` char(1);
@@ -453,20 +453,20 @@ NULL	丅丅丅丅丅	NULL	NULL
 DESC `龖龖龖`;
 Field	Type	Null	Key	Default	Extra
 丄丄	char(1)	YES	MUL	NULL	
-丂丂丂	char(6)		PRI		
-丅丅丅	char(1)	YES	MUL	NULL	
+丂丂丂	char(6)	NO	PRI		
+丅丅丅	char(1)	YES	UNI	NULL	
 乚乚乚	char(1)	YES		NULL	
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
-  `丄丄` char(1) default NULL,
-  `丂丂丂` char(6) NOT NULL default '',
-  `丅丅丅` char(1) default NULL,
-  `乚乚乚` char(1) default NULL,
-  PRIMARY KEY  (`丂丂丂`),
+  `丄丄` char(1) DEFAULT NULL,
+  `丂丂丂` char(6) NOT NULL DEFAULT '',
+  `丅丅丅` char(1) DEFAULT NULL,
+  `乚乚乚` char(1) DEFAULT NULL,
+  PRIMARY KEY (`丂丂丂`),
   UNIQUE KEY `丅丅丅` (`丅丅丅`),
   KEY `丄丄丄` (`丄丄`)
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 ALTER TABLE `龖龖龖` DROP INDEX `丄丄丄`;
 ALTER TABLE `龖龖龖` DROP PRIMARY KEY;
 ALTER TABLE `龖龖龖` DROP INDEX `丅丅丅`;
@@ -480,165 +480,12 @@ SELECT * FROM `龖龖龖`;
 丅丅丅丅丅
 DESC `龖龖龖`;
 Field	Type	Null	Key	Default	Extra
-丂丂丂	char(6)				
+丂丂丂	char(6)	NO			
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
-  `丂丂丂` char(6) NOT NULL default ''
-) ENGINE=HEAP DEFAULT CHARSET=utf8
-DROP TABLE `アアア`;
-DROP TABLE `イイイ`;
-DROP TABLE `あああ`;
-DROP TABLE `いいい`;
-DROP TABLE `龖龖龖`;
-DROP TABLE `龗龗龗`;
-CREATE TABLE `アアア`(`キキキ` char(5)) DEFAULT CHARSET = utf8 engine=BDB;
-CREATE TABLE `イイイ`(`ケケケ` char(5)) DEFAULT CHARSET = utf8 engine=BDB;
-CREATE TABLE `あああ`(`ききき` char(5)) DEFAULT CHARSET = utf8 engine=BDB;
-CREATE TABLE `いいい`(`けけけ` char(5)) DEFAULT CHARSET = utf8 engine=BDB;
-CREATE TABLE `龖龖龖`(`丂丂丂` char(5)) DEFAULT CHARSET = utf8 engine=BDB;
-CREATE TABLE `龗龗龗`(`乚乚乚` char(5)) DEFAULT CHARSET = utf8 engine=BDB;
-INSERT INTO `アアア` VALUES ('アアアアア'),('イイイイイ'),('ウウウウウ');
-INSERT INTO `あああ` VALUES ('あああああ'),('いいいいい'),('ううううう');
-INSERT INTO `龖龖龖` VALUES ('丂丂丂丂丂'),('丄丄丄丄丄'),('丅丅丅丅丅');
-ALTER TABLE `アアア` ADD `カカカ` char(1) FIRST;
-ALTER TABLE `アアア` ADD `ククク` char(1) AFTER `キキキ`;
-ALTER TABLE `アアア` ADD `ケケケ` char(1);
-ALTER TABLE `アアア` ADD INDEX (`カカカ`);
-ALTER TABLE `アアア` ADD PRIMARY KEY (`キキキ`);
-ALTER TABLE `アアア` CHANGE `カカカ` `カカ` char(1);
-ALTER TABLE `アアア` MODIFY `キキキ` char(6);
-SELECT * FROM `アアア`;
-カカ	キキキ	ククク	ケケケ
-NULL	アアアアア	NULL	NULL
-NULL	イイイイイ	NULL	NULL
-NULL	ウウウウウ	NULL	NULL
-DESC `アアア`;
-Field	Type	Null	Key	Default	Extra
-カカ	char(1)	YES	MUL	NULL	
-キキキ	char(6)		PRI		
-ククク	char(1)	YES		NULL	
-ケケケ	char(1)	YES		NULL	
-SHOW CREATE TABLE `アアア`;
-Table	Create Table
-アアア	CREATE TABLE `アアア` (
-  `カカ` char(1) default NULL,
-  `キキキ` char(6) NOT NULL default '',
-  `ククク` char(1) default NULL,
-  `ケケケ` char(1) default NULL,
-  PRIMARY KEY  (`キキキ`),
-  KEY `カカカ` (`カカ`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
-ALTER TABLE `アアア` DROP INDEX `カカカ`;
-ALTER TABLE `アアア` DROP PRIMARY KEY;
-ALTER TABLE `アアア` DROP `カカ`;
-ALTER TABLE `アアア` DROP `ククク`;
-ALTER TABLE `アアア` DROP `ケケケ`;
-SELECT * FROM `アアア`;
-キキキ
-アアアアア
-イイイイイ
-ウウウウウ
-DESC `アアア`;
-Field	Type	Null	Key	Default	Extra
-キキキ	char(6)				
-SHOW CREATE TABLE `アアア`;
-Table	Create Table
-アアア	CREATE TABLE `アアア` (
-  `キキキ` char(6) NOT NULL default ''
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
-ALTER TABLE `あああ` ADD `かかか` char(1) FIRST;
-ALTER TABLE `あああ` ADD `くくく` char(1) AFTER `ききき`;
-ALTER TABLE `あああ` ADD `けけけ` char(1);
-ALTER TABLE `あああ` ADD INDEX (`かかか`);
-ALTER TABLE `あああ` ADD PRIMARY KEY (`ききき`);
-ALTER TABLE `あああ` CHANGE `かかか` `かか` char(1);
-ALTER TABLE `あああ` MODIFY `ききき` char(6);
-SELECT * FROM `あああ`;
-かか	ききき	くくく	けけけ
-NULL	あああああ	NULL	NULL
-NULL	いいいいい	NULL	NULL
-NULL	ううううう	NULL	NULL
-DESC `あああ`;
-Field	Type	Null	Key	Default	Extra
-かか	char(1)	YES	MUL	NULL	
-ききき	char(6)		PRI		
-くくく	char(1)	YES		NULL	
-けけけ	char(1)	YES		NULL	
-SHOW CREATE TABLE `あああ`;
-Table	Create Table
-あああ	CREATE TABLE `あああ` (
-  `かか` char(1) default NULL,
-  `ききき` char(6) NOT NULL default '',
-  `くくく` char(1) default NULL,
-  `けけけ` char(1) default NULL,
-  PRIMARY KEY  (`ききき`),
-  KEY `かかか` (`かか`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
-ALTER TABLE `あああ` DROP INDEX `かかか`;
-ALTER TABLE `あああ` DROP PRIMARY KEY;
-ALTER TABLE `あああ` DROP `かか`;
-ALTER TABLE `あああ` DROP `くくく`;
-ALTER TABLE `あああ` DROP `けけけ`;
-SELECT * FROM `あああ`;
-ききき
-あああああ
-いいいいい
-ううううう
-DESC `あああ`;
-Field	Type	Null	Key	Default	Extra
-ききき	char(6)				
-SHOW CREATE TABLE `あああ`;
-Table	Create Table
-あああ	CREATE TABLE `あああ` (
-  `ききき` char(6) NOT NULL default ''
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
-ALTER TABLE `龖龖龖` ADD `丄丄丄` char(1) FIRST;
-ALTER TABLE `龖龖龖` ADD `丅丅丅` char(1) AFTER `丂丂丂`;
-ALTER TABLE `龖龖龖` ADD `乚乚乚` char(1);
-ALTER TABLE `龖龖龖` ADD INDEX (`丄丄丄`);
-ALTER TABLE `龖龖龖` ADD PRIMARY KEY (`丂丂丂`);
-ALTER TABLE `龖龖龖` CHANGE `丄丄丄` `丄丄` char(1);
-ALTER TABLE `龖龖龖` MODIFY `丂丂丂` char(6);
-SELECT * FROM `龖龖龖`;
-丄丄	丂丂丂	丅丅丅	乚乚乚
-NULL	丂丂丂丂丂	NULL	NULL
-NULL	丄丄丄丄丄	NULL	NULL
-NULL	丅丅丅丅丅	NULL	NULL
-DESC `龖龖龖`;
-Field	Type	Null	Key	Default	Extra
-丄丄	char(1)	YES	MUL	NULL	
-丂丂丂	char(6)		PRI		
-丅丅丅	char(1)	YES		NULL	
-乚乚乚	char(1)	YES		NULL	
-SHOW CREATE TABLE `龖龖龖`;
-Table	Create Table
-龖龖龖	CREATE TABLE `龖龖龖` (
-  `丄丄` char(1) default NULL,
-  `丂丂丂` char(6) NOT NULL default '',
-  `丅丅丅` char(1) default NULL,
-  `乚乚乚` char(1) default NULL,
-  PRIMARY KEY  (`丂丂丂`),
-  KEY `丄丄丄` (`丄丄`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
-ALTER TABLE `龖龖龖` DROP INDEX `丄丄丄`;
-ALTER TABLE `龖龖龖` DROP PRIMARY KEY;
-ALTER TABLE `龖龖龖` DROP `丄丄`;
-ALTER TABLE `龖龖龖` DROP `丅丅丅`;
-ALTER TABLE `龖龖龖` DROP `乚乚乚`;
-SELECT * FROM `龖龖龖`;
-丂丂丂
-丂丂丂丂丂
-丄丄丄丄丄
-丅丅丅丅丅
-DESC `龖龖龖`;
-Field	Type	Null	Key	Default	Extra
-丂丂丂	char(6)				
-SHOW CREATE TABLE `龖龖龖`;
-Table	Create Table
-龖龖龖	CREATE TABLE `龖龖龖` (
-  `丂丂丂` char(6) NOT NULL default ''
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
+  `丂丂丂` char(6) NOT NULL DEFAULT ''
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 DROP TABLE `アアア`;
 DROP TABLE `イイイ`;
 DROP TABLE `あああ`;
diff -Nrup a/mysql-test/suite/jp/r/jp_charlength_sjis.result b/mysql-test/suite/jp/r/jp_charlength_sjis.result
--- a/mysql-test/suite/jp/r/jp_charlength_sjis.result	2005-01-07 13:27:28 +01:00
+++ b/mysql-test/suite/jp/r/jp_charlength_sjis.result	2008-05-15 18:01:06 +02:00
 SET NAMES sjis;
 SET character_set_database = sjis;
 	0
 	0
-	0
-	0
-	0
diff -Nrup a/mysql-test/suite/jp/r/jp_charlength_ucs2.result b/mysql-test/suite/jp/r/jp_charlength_ucs2.result
--- a/mysql-test/suite/jp/r/jp_charlength_ucs2.result	2005-01-07 13:27:28 +01:00
+++ b/mysql-test/suite/jp/r/jp_charlength_ucs2.result	2008-05-15 18:01:06 +02:00
 SET NAMES ujis;
 SET character_set_database = ucs2;
 SET collation_connection = ucs2_general_ci;
 	0
 	0
-	0
-	0
-	0
diff -Nrup a/mysql-test/suite/jp/r/jp_charlength_ujis.result b/mysql-test/suite/jp/r/jp_charlength_ujis.result
--- a/mysql-test/suite/jp/r/jp_charlength_ujis.result	2005-01-07 13:27:28 +01:00
+++ b/mysql-test/suite/jp/r/jp_charlength_ujis.result	2008-05-15 18:01:06 +02:00
 SET NAMES ujis;
 SET character_set_database = ujis;
 	0
 	0
-	0
-	0
-	0
diff -Nrup a/mysql-test/suite/jp/r/jp_charlength_utf8.result b/mysql-test/suite/jp/r/jp_charlength_utf8.result
--- a/mysql-test/suite/jp/r/jp_charlength_utf8.result	2005-01-07 13:27:28 +01:00
+++ b/mysql-test/suite/jp/r/jp_charlength_utf8.result	2008-05-15 18:01:06 +02:00
@@ -7,9 +7,6 @@ drop table if exists `T6`;
 drop table if exists `T7`;
 drop table if exists `T8`;
 drop table if exists `T9`;
-drop table if exists `T10`;
-drop table if exists `T11`;
-drop table if exists `T12`;
 SET NAMES utf8;
 SET character_set_database = utf8;
 CREATE TABLE `T1` (`C1` char(5), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `T3` (`C1` char(5),
 CREATE TABLE `T4` (`C1` char(5), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `T5` (`C1` char(5), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `T6` (`C1` char(5), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `T7` (`C1` char(5), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `T8` (`C1` char(5), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `T9` (`C1` char(5), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `T10` (`C1` char(5), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `T11` (`C1` char(5), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `T12` (`C1` char(5), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `T7` (`C1` char(5), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `T8` (`C1` char(5), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `T9` (`C1` char(5), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = MEMORY;
 INSERT INTO `T1` VALUES ('アイウエオ'),('アイウエ'),('アイウ'),('アイ'),('ア'),('');
 INSERT INTO `T2` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `T3` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
 INSERT INTO `T7` VALUES ('アイウエオ'),('アイウエ'),('アイウ'),('アイ'),('ア'),('');
 INSERT INTO `T8` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
 INSERT INTO `T9` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
-INSERT INTO `T10` VALUES ('アイウエオ'),('アイウエ'),('アイウ'),('アイ'),('ア'),('');
-INSERT INTO `T11` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
-INSERT INTO `T12` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
 SELECT `C1`, CHAR_LENGTH(`C1`) FROM `T1`;
 C1	CHAR_LENGTH(`C1`)
 	0
@@ -108,30 +99,6 @@ SELECT `C1`, CHAR_LENGTH(`C1`) F
 龔龖	2
 龔	1
 	0
-SELECT `C1`, CHAR_LENGTH(`C1`) FROM `T10`;
-C1	CHAR_LENGTH(`C1`)
-アイウエオ	5
-アイウエ	4
-アイウ	3
-アイ	2
-ア	1
-	0
-SELECT `C1`, CHAR_LENGTH(`C1`) FROM `T11`;
-C1	CHAR_LENGTH(`C1`)
-あいうえお	5
-あいうえ	4
-あいう	3
-あい	2
-あ	1
-	0
-SELECT `C1`, CHAR_LENGTH(`C1`) FROM `T12`;
-C1	CHAR_LENGTH(`C1`)
-龔龖龗龞龡	5
-龔龖龗龞	4
-龔龖龗	3
-龔龖	2
-龔	1
-	0
 DROP TABLE `T1`;
 DROP TABLE `T2`;
 DROP TABLE `T3`;
@@ -141,6 +108,3 @@ DROP TABLE `T6`;
 DROP TABLE `T7`;
 DROP TABLE `T8`;
 DROP TABLE `T9`;
-DROP TABLE `T10`;
-DROP TABLE `T11`;
-DROP TABLE `T12`;
diff -Nrup a/mysql-test/suite/jp/r/jp_charset_sjis.result b/mysql-test/suite/jp/r/jp_charset_sjis.result
--- a/mysql-test/suite/jp/r/jp_charset_sjis.result	2005-01-07 13:27:28 +01:00
+++ b/mysql-test/suite/jp/r/jp_charset_sjis.result	2008-05-15 18:01:06 +02:00
 SET NAMES sjis;
 SET character_set_database = sjis;
@@ -33,9 +27,6 @@ LOAD DATA LOCAL INFILE 'suite/jp/std_dat
 sjis
@@ -171,51 +162,6 @@ sjis
 ujis
-sjis
-sjis
-sjis
-utf8
-ucs2
-sjis
-ujis
-utf8
-ucs2
-sjis
-ujis
-utf8
-ucs2
-sjis
-ujis
diff -Nrup a/mysql-test/suite/jp/r/jp_charset_ucs2.result b/mysql-test/suite/jp/r/jp_charset_ucs2.result
--- a/mysql-test/suite/jp/r/jp_charset_ucs2.result	2005-01-07 13:27:28 +01:00
+++ b/mysql-test/suite/jp/r/jp_charset_ucs2.result	2008-05-15 18:01:06 +02:00
 SET NAMES ujis;
 SET character_set_database = ucs2;
 ('PQRSTUVWXYZ[\\]^_')
-('PQRSTUVWXYZ[\\]^_')
 ucs2
@@ -247,51 +219,6 @@ sjis
 ujis
-ucs2
-ucs2
-ucs2
-utf8
-ucs2
-sjis
-ujis
-utf8
-ucs2
-sjis
-ujis
-utf8
-ucs2
-sjis
-ujis
diff -Nrup a/mysql-test/suite/jp/r/jp_charset_ujis.result b/mysql-test/suite/jp/r/jp_charset_ujis.result
--- a/mysql-test/suite/jp/r/jp_charset_ujis.result	2005-01-07 13:27:28 +01:00
+++ b/mysql-test/suite/jp/r/jp_charset_ujis.result	2008-05-15 18:01:06 +02:00
 SET NAMES ujis;
 SET character_set_database = ujis;
@@ -33,9 +27,6 @@ LOAD DATA LOCAL INFILE 'suite/jp/std_dat
 ujis
@@ -171,51 +162,6 @@ sjis
 ujis
-ujis
-ujis
-ujis
-utf8
-ucs2
-sjis
-ujis
-utf8
-ucs2
-sjis
-ujis
-utf8
-ucs2
-sjis
-ujis
diff -Nrup a/mysql-test/suite/jp/r/jp_charset_utf8.result b/mysql-test/suite/jp/r/jp_charset_utf8.result
--- a/mysql-test/suite/jp/r/jp_charset_utf8.result	2005-01-07 13:27:28 +01:00
+++ b/mysql-test/suite/jp/r/jp_charset_utf8.result	2008-05-15 18:01:06 +02:00
@@ -7,9 +7,6 @@ drop table if exists `T6`;
 drop table if exists `T7`;
 drop table if exists `T8`;
 drop table if exists `T9`;
-drop table if exists `T10`;
-drop table if exists `T11`;
-drop table if exists `T12`;
 SET NAMES utf8;
 SET character_set_database = utf8;
 CREATE TABLE `T1` (`C1` char(20)) DEFAULT CHARSET = utf8 engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `T3` (`C1` char(20)
 CREATE TABLE `T4` (`C1` char(20)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `T5` (`C1` char(20)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `T6` (`C1` char(20)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `T7` (`C1` char(20)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `T8` (`C1` char(20)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `T9` (`C1` char(20)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `T10` (`C1` char(20)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `T11` (`C1` char(20)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `T12` (`C1` char(20)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `T7` (`C1` char(20)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `T8` (`C1` char(20)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `T9` (`C1` char(20)) DEFAULT CHARSET = utf8 engine = MEMORY;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `T1`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `T2`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `T3`;
@@ -33,9 +27,6 @@ LOAD DATA LOCAL INFILE 'suite/jp/std_dat
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `T7`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `T8`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `T9`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `T10`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `T11`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `T12`;
 SELECT DISTINCT CHARSET(`C1`) FROM `T1`;
 CHARSET(`C1`)
 utf8
@@ -171,51 +162,6 @@ sjis
 SELECT DISTINCT CHARSET(CONVERT(`C1` USING ujis)) FROM `T9`;
 CHARSET(CONVERT(`C1` USING ujis))
 ujis
-SELECT DISTINCT CHARSET(`C1`) FROM `T10`;
-CHARSET(`C1`)
-utf8
-SELECT DISTINCT CHARSET(`C1`) FROM `T11`;
-CHARSET(`C1`)
-utf8
-SELECT DISTINCT CHARSET(`C1`) FROM `T12`;
-CHARSET(`C1`)
-utf8
-SELECT DISTINCT CHARSET(CONVERT(`C1` USING utf8)) FROM `T10`;
-CHARSET(CONVERT(`C1` USING utf8))
-utf8
-SELECT DISTINCT CHARSET(CONVERT(`C1` USING ucs2)) FROM `T10`;
-CHARSET(CONVERT(`C1` USING ucs2))
-ucs2
-SELECT DISTINCT CHARSET(CONVERT(`C1` USING sjis)) FROM `T10`;
-CHARSET(CONVERT(`C1` USING sjis))
-sjis
-SELECT DISTINCT CHARSET(CONVERT(`C1` USING ujis)) FROM `T10`;
-CHARSET(CONVERT(`C1` USING ujis))
-ujis
-SELECT DISTINCT CHARSET(CONVERT(`C1` USING utf8)) FROM `T11`;
-CHARSET(CONVERT(`C1` USING utf8))
-utf8
-SELECT DISTINCT CHARSET(CONVERT(`C1` USING ucs2)) FROM `T11`;
-CHARSET(CONVERT(`C1` USING ucs2))
-ucs2
-SELECT DISTINCT CHARSET(CONVERT(`C1` USING sjis)) FROM `T11`;
-CHARSET(CONVERT(`C1` USING sjis))
-sjis
-SELECT DISTINCT CHARSET(CONVERT(`C1` USING ujis)) FROM `T11`;
-CHARSET(CONVERT(`C1` USING ujis))
-ujis
-SELECT DISTINCT CHARSET(CONVERT(`C1` USING utf8)) FROM `T12`;
-CHARSET(CONVERT(`C1` USING utf8))
-utf8
-SELECT DISTINCT CHARSET(CONVERT(`C1` USING ucs2)) FROM `T12`;
-CHARSET(CONVERT(`C1` USING ucs2))
-ucs2
-SELECT DISTINCT CHARSET(CONVERT(`C1` USING sjis)) FROM `T12`;
-CHARSET(CONVERT(`C1` USING sjis))
-sjis
-SELECT DISTINCT CHARSET(CONVERT(`C1` USING ujis)) FROM `T12`;
-CHARSET(CONVERT(`C1` USING ujis))
-ujis
 drop table `T1`;
 drop table `T2`;
 drop table `T3`;
@@ -225,6 +171,3 @@ drop table `T6`;
 drop table `T7`;
 drop table `T8`;
 drop table `T9`;
-drop table `T10`;
-drop table `T11`;
-drop table `T12`;
diff -Nrup a/mysql-test/suite/jp/r/jp_convert_sjis.result b/mysql-test/suite/jp/r/jp_convert_sjis.result
--- a/mysql-test/suite/jp/r/jp_convert_sjis.result	2005-01-07 13:27:28 +01:00
+++ b/mysql-test/suite/jp/r/jp_convert_sjis.result	2008-05-15 18:01:06 +02:00
@@ -33,9 +27,6 @@ LOAD DATA LOCAL INFILE 'suite/jp/std_dat
  !"#$%&'()*+,-./	 !"#$%&'()*+,-./
- !"#$%&'()*+,-./	 !"#$%&'()*+,-./
-0123456789:;<=>?	0123456789:;<=>?
-@ABCDEFGHIJKLMNO	@ABCDEFGHIJKLMNO
-abcdefghijklmno	abcdefghijklmno
-pqrstuvwxyz{|}~	pqrstuvwxyz{|}~
- !"#$%&'()*+,-./	 !"#$%&'()*+,-./
-0123456789:;<=>?	0123456789:;<=>?
-@ABCDEFGHIJKLMNO	@ABCDEFGHIJKLMNO
-abcdefghijklmno	abcdefghijklmno
-pqrstuvwxyz{|}~	pqrstuvwxyz{|}~
- !"#$%&'()*+,-./	 !"#$%&'()*+,-./
-0123456789:;<=>?	0123456789:;<=>?
-@ABCDEFGHIJKLMNO	@ABCDEFGHIJKLMNO
-abcdefghijklmno	abcdefghijklmno
-pqrstuvwxyz{|}~	pqrstuvwxyz{|}~
diff -Nrup a/mysql-test/suite/jp/r/jp_convert_ucs2.result b/mysql-test/suite/jp/r/jp_convert_ucs2.result
--- a/mysql-test/suite/jp/r/jp_convert_ucs2.result	2005-01-07 13:27:29 +01:00
+++ b/mysql-test/suite/jp/r/jp_convert_ucs2.result	2008-05-15 18:01:06 +02:00
 SET NAMES ujis;
 SET character_set_database = ucs2;
 SET collation_connection = ucs2_general_ci;
 ('PQRSTUVWXYZ[\\]^_')
-('PQRSTUVWXYZ[\\]^_')
-PQRSTUVWXYZ[\]^_	PQRSTUVWXYZ[\]^_
-PQRSTUVWXYZ[\]^_	PQRSTUVWXYZ[\]^_
-PQRSTUVWXYZ[\]^_	PQRSTUVWXYZ[\]^_
diff -Nrup a/mysql-test/suite/jp/r/jp_convert_ujis.result b/mysql-test/suite/jp/r/jp_convert_ujis.result
--- a/mysql-test/suite/jp/r/jp_convert_ujis.result	2005-01-07 13:27:29 +01:00
+++ b/mysql-test/suite/jp/r/jp_convert_ujis.result	2008-05-15 18:01:06 +02:00
 SET NAMES ujis;
 SET character_set_database = ujis;
@@ -33,9 +27,6 @@ LOAD DATA LOCAL INFILE 'suite/jp/std_dat
  !"#$%&'()*+,-./	 !"#$%&'()*+,-./
- !"#$%&'()*+,-./	 !"#$%&'()*+,-./
-0123456789:;<=>?	0123456789:;<=>?
-@ABCDEFGHIJKLMNO	@ABCDEFGHIJKLMNO
-PQRSTUVWXYZ[\]^_	PQRSTUVWXYZ[\]^_
-abcdefghijklmno	abcdefghijklmno
-pqrstuvwxyz{|}~	pqrstuvwxyz{|}~
- !"#$%&'()*+,-./	 !"#$%&'()*+,-./
-0123456789:;<=>?	0123456789:;<=>?
-@ABCDEFGHIJKLMNO	@ABCDEFGHIJKLMNO
-PQRSTUVWXYZ[\]^_	PQRSTUVWXYZ[\]^_
-abcdefghijklmno	abcdefghijklmno
-pqrstuvwxyz{|}~	pqrstuvwxyz{|}~
- !"#$%&'()*+,-./	 !"#$%&'()*+,-./
-0123456789:;<=>?	0123456789:;<=>?
-@ABCDEFGHIJKLMNO	@ABCDEFGHIJKLMNO
-PQRSTUVWXYZ[\]^_	PQRSTUVWXYZ[\]^_
-abcdefghijklmno	abcdefghijklmno
-pqrstuvwxyz{|}~	pqrstuvwxyz{|}~
diff -Nrup a/mysql-test/suite/jp/r/jp_convert_utf8.result b/mysql-test/suite/jp/r/jp_convert_utf8.result
--- a/mysql-test/suite/jp/r/jp_convert_utf8.result	2005-01-07 13:27:29 +01:00
+++ b/mysql-test/suite/jp/r/jp_convert_utf8.result	2008-05-15 18:01:06 +02:00
@@ -7,9 +7,6 @@ drop table if exists `T6`;
 drop table if exists `T7`;
 drop table if exists `T8`;
 drop table if exists `T9`;
-drop table if exists `T10`;
-drop table if exists `T11`;
-drop table if exists `T12`;
 SET NAMES utf8;
 SET character_set_database = utf8;
 CREATE TABLE `T1` (`C1` char(20), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `T3` (`C1` char(20)
 CREATE TABLE `T4` (`C1` char(20), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `T5` (`C1` char(20), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `T6` (`C1` char(20), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `T7` (`C1` char(20), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `T8` (`C1` char(20), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `T9` (`C1` char(20), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `T10` (`C1` char(20), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `T11` (`C1` char(20), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `T12` (`C1` char(20), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `T7` (`C1` char(20), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `T8` (`C1` char(20), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `T9` (`C1` char(20), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = MEMORY;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `T1`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `T2`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `T3`;
@@ -33,9 +27,6 @@ LOAD DATA LOCAL INFILE 'suite/jp/std_dat
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `T7`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `T8`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `T9`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `T10`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `T11`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `T12`;
 SELECT `C1`, CONVERT(`C1` using ujis) FROM `T1`;
 C1	CONVERT(`C1` using ujis)
  !"#$%&'()*+,-./	 !"#$%&'()*+,-./
@@ -1134,372 +1125,6 @@ SELECT `C1`, CONVERT(`C1` using 
 齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒	????????????????????
 龔龖龗龞龡龢龣龥・・・・・・・・・・・・	????????・・・・・・・・・・・・
 ・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-SELECT `C1`, CONVERT(`C1` using ujis) FROM `T10`;
-C1	CONVERT(`C1` using ujis)
- !"#$%&'()*+,-./	 !"#$%&'()*+,-./
-0123456789:;<=>?	0123456789:;<=>?
-@ABCDEFGHIJKLMNO	@ABCDEFGHIJKLMNO
-PQRSTUVWXYZ[\]^_	PQRSTUVWXYZ[\]^_
-abcdefghijklmno	abcdefghijklmno
-pqrstuvwxyz{|}~	pqrstuvwxyz{|}~
- 。「」、・ヲァィゥェォャュョッ	 。「」、・ヲァィゥェォャュョッ
-ーアイウエオカキクケコサシスセソ	ーアイウエオカキクケコサシスセソ
-タチツテトナニヌネノハヒフヘホマ	タチツテトナニヌネノハヒフヘホマ
-ミムメモヤユヨラリルレロワン゙゚	ミムメモヤユヨラリルレロワン゙゚
-SELECT `C1`, CONVERT(`C1` using ucs2) FROM `T10`;
-C1	CONVERT(`C1` using ucs2)
- !"#$%&'()*+,-./	 !"#$%&'()*+,-./
-0123456789:;<=>?	0123456789:;<=>?
-@ABCDEFGHIJKLMNO	@ABCDEFGHIJKLMNO
-PQRSTUVWXYZ[\]^_	PQRSTUVWXYZ[\]^_
-abcdefghijklmno	abcdefghijklmno
-pqrstuvwxyz{|}~	pqrstuvwxyz{|}~
- 。「」、・ヲァィゥェォャュョッ	 。「」、・ヲァィゥェォャュョッ
-ーアイウエオカキクケコサシスセソ	ーアイウエオカキクケコサシスセソ
-タチツテトナニヌネノハヒフヘホマ	タチツテトナニヌネノハヒフヘホマ
-ミムメモヤユヨラリルレロワン゙゚	ミムメモヤユヨラリルレロワン゙゚
-SELECT `C1`, CONVERT(`C1` using sjis) FROM `T10`;
-C1	CONVERT(`C1` using sjis)
- !"#$%&'()*+,-./	 !"#$%&'()*+,-./
-0123456789:;<=>?	0123456789:;<=>?
-@ABCDEFGHIJKLMNO	@ABCDEFGHIJKLMNO
-PQRSTUVWXYZ[\]^_	PQRSTUVWXYZ[\]^_
-abcdefghijklmno	abcdefghijklmno
-pqrstuvwxyz{|}~	pqrstuvwxyz{|}~
- 。「」、・ヲァィゥェォャュョッ	 。「」、・ヲァィゥェォャュョッ
-ーアイウエオカキクケコサシスセソ	ーアイウエオカキクケコサシスセソ
-タチツテトナニヌネノハヒフヘホマ	タチツテトナニヌネノハヒフヘホマ
-ミムメモヤユヨラリルレロワン゙゚	ミムメモヤユヨラリルレロワン゙゚
-SELECT `C1`, CONVERT(`C1` using ujis) FROM `T11`;
-C1	CONVERT(`C1` using ujis)
-  、。,.・:;?!゛゜´`¨^ ̄_ヽ	  、。,.・:;?!゛゜´`¨^ ̄_ヽ
-ヾゝゞ〃仝々〆〇ー―‐/\〜‖|…‥‘’	ヾゝゞ〃仝々〆〇ー―‐/?〜‖|…‥‘’
-“”()〔〕[]{}〈〉《》「」『』【】	“”()〔〕[]{}〈〉《》「」『』【】
-+‐±×÷=≠<>≦≧∞∴♂♀°′″℃¥	+‐±×÷=≠<>≦≧∞∴♂♀°′″℃¥
-$¢£%#&*@§☆★○●◎◇・・・・・	$¢£%#&*@§☆★○●◎◇・・・・・
-・◆□■△▲▽▼※〒→←↑↓〓・・・・・	・◆□■△▲▽▼※〒→←↑↓〓・・・・・
-・・・・・・∈∋⊆⊇⊂⊃∪∩・・・・・・	・・・・・・∈∋⊆⊇⊂⊃∪∩・・・・・・
-・・∧∨¬⇒⇔∀∃・・・・・・・・・・・	・・∧∨¬⇒⇔∀∃・・・・・・・・・・・
-∠⊥⌒∂∇≡≒≪≫√∽∝∵∫∬・・・・・	∠⊥⌒∂∇≡≒≪≫√∽∝∵∫∬・・・・・
-・・ʼn♯♭♪†‡¶・・・・◯・・・・ 	・・ʼn♯♭♪†‡¶・・・・◯・・・・ 
-・・・・・・・・・・・・・・・・0123	・・・・・・・・・・・・・・・・0123
-456789・・・・・・・ABCDEFG	456789・・・・・・・ABCDEFG
-HIJKLMNOPQRSTUVWXYZ・	HIJKLMNOPQRSTUVWXYZ・
-・・・・・abcdefghijklmno	・・・・・abcdefghijklmno
-pqrstuvwxyz・・・・・・・・・	pqrstuvwxyz・・・・・・・・・
-・ぁあぃいぅうぇえぉおかがきぎくぐけげこ	・ぁあぃいぅうぇえぉおかがきぎくぐけげこ
-ごさざしじすずせぜそぞただちぢっつづてで	ごさざしじすずせぜそぞただちぢっつづてで
-とどなにぬねのはばぱひびぴふぶぷへべぺほ	とどなにぬねのはばぱひびぴふぶぷへべぺほ
-ぼぽまみむめもゃやゅゆょよらりるれろゎわ	ぼぽまみむめもゃやゅゆょよらりるれろゎわ
-ゐゑをん・・・・・・・・・・・・・・・・	ゐゑをん・・・・・・・・・・・・・・・・
-・ァアィイゥウェエォオカガキギクグケゲコ	・ァアィイゥウェエォオカガキギクグケゲコ
-ゴサザシジスズセゼソゾタダチヂッツヅテデ	ゴサザシジスズセゼソゾタダチヂッツヅテデ
-トドナニヌネノハバパヒビピフブプヘベペホ	トドナニヌネノハバパヒビピフブプヘベペホ
-ボポマミムメモャヤュユョヨラリルレロヮワ	ボポマミムメモャヤュユョヨラリルレロヮワ
-ヰヱヲンヴヵヶ・・・・・・・・・・・・・	ヰヱヲンヴヵヶ・・・・・・・・・・・・・
-・ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤ	・ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤ
-ΥΦΧΨΩ・・・・・・・・αβγδεζη	ΥΦΧΨΩ・・・・・・・・αβγδεζη
-θικλμνξοπρστυφχψω・・・	θικλμνξοπρστυφχψω・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・АБВГДЕЁЖЗИЙКЛМНОПРС	・АБВГДЕЁЖЗИЙКЛМНОПРС
-ТУФХЦЧШЩЪЫЬЭЮЯ・・・・・・	ТУФХЦЧШЩЪЫЬЭЮЯ・・・・・・
-・・・・・・・・・абвгдеёжзий	・・・・・・・・・абвгдеёжзий
-клмнопрстуфхцчшщъыьэ	клмнопрстуфхцчшщъыьэ
-юя・・・・・・・・・・・・・・・・・・	юя・・・・・・・・・・・・・・・・・・
-・─│┌┐┘└├┬┤┴┼━┃┏┓┛┗┣┳	・─│┌┐┘└├┬┤┴┼━┃┏┓┛┗┣┳
-┫┻╋┠┯┨┷┿┝┰┥┸╂・・・・・・・	┫┻╋┠┯┨┷┿┝┰┥┸╂・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵	・亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵
-梓圧斡扱宛姐虻飴絢綾鮎或粟袷安庵按暗案闇	梓圧斡扱宛姐虻飴絢綾鮎或粟袷安庵按暗案闇
-鞍杏以伊位依偉囲夷委威尉惟意慰易椅為畏異	鞍杏以伊位依偉囲夷委威尉惟意慰易椅為畏異
-移維緯胃萎衣謂違遺医井亥域育郁磯一壱溢逸	移維緯胃萎衣謂違遺医井亥域育郁磯一壱溢逸
-稲茨芋鰯允印咽員因姻引飲淫胤蔭・・・・・	稲茨芋鰯允印咽員因姻引飲淫胤蔭・・・・・
-・蓮連錬呂魯櫓炉賂路露労婁廊弄朗楼榔浪漏	・蓮連錬呂魯櫓炉賂路露労婁廊弄朗楼榔浪漏
-牢狼篭老聾蝋郎六麓禄肋録論倭和話歪賄脇惑	牢狼篭老聾蝋郎六麓禄肋録論倭和話歪賄脇惑
-枠鷲亙亘鰐詫藁蕨椀湾碗腕・・・・・・・・	枠鷲亙亘鰐詫藁蕨椀湾碗腕・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞	・弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞
-亟亠亢亰亳亶从仍仄仆仂仗仞仭仟价伉佚估佛	亟亠亢亰亳亶从仍仄仆仂仗仞仭仟价伉佚估佛
-佝佗佇佶侈侏侘佻佩佰侑佯來侖儘俔俟俎俘俛	佝佗佇佶侈侏侘佻佩佰侑佯來侖儘俔俟俎俘俛
-俑俚俐俤俥倚倨倔倪倥倅伜俶倡倩倬俾俯們倆	俑俚俐俤俥倚倨倔倪倥倅伜俶倡倩倬俾俯們倆
-偃假會偕偐偈做偖偬偸傀傚傅傴傲・・・・・	偃假會偕偐偈做偖偬偸傀傚傅傴傲・・・・・
-・鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻	・鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻
-鶸鶺鷆鷏鷂鷙鷓鷸鷦鷭鷯鷽鸚鸛鸞鹵鹹鹽麁麈	鶸鶺鷆鷏鷂鷙鷓鷸鷦鷭鷯鷽鸚鸛鸞鹵鹹鹽麁麈
-麋麌麒麕麑麝麥麩麸麪麭靡黌黎黏黐黔黜點黝	麋麌麒麕麑麝麥麩麸麪麭靡黌黎黏黐黔黜點黝
-黠黥黨黯黴黶黷黹黻黼黽鼇鼈皷鼕鼡鼬鼾齊齒	黠黥黨黯黴黶黷黹黻黼黽鼇鼈皷鼕鼡鼬鼾齊齒
-齔齣齟齠齡齦齧齬齪齷齲齶龕龜龠・・・・・	齔齣齟齠齡齦齧齬齪齷齲齶龕龜龠・・・・・
-・堯槇遙瑤凜熙・・・・・・・・・・・・・	・堯槇遙瑤凜熙・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-SELECT `C1`, CONVERT(`C1` using ucs2) FROM `T11`;
-C1	CONVERT(`C1` using ucs2)
-  、。,.・:;?!゛゜´`¨^ ̄_ヽ	  、。,.・:;?!゛゜´`¨^ ̄_ヽ
-ヾゝゞ〃仝々〆〇ー―‐/\〜‖|…‥‘’	ヾゝゞ〃仝々〆〇ー―‐/\〜‖|…‥‘’
-“”()〔〕[]{}〈〉《》「」『』【】	“”()〔〕[]{}〈〉《》「」『』【】
-+‐±×÷=≠<>≦≧∞∴♂♀°′″℃¥	+‐±×÷=≠<>≦≧∞∴♂♀°′″℃¥
-$¢£%#&*@§☆★○●◎◇・・・・・	$¢£%#&*@§☆★○●◎◇・・・・・
-・◆□■△▲▽▼※〒→←↑↓〓・・・・・	・◆□■△▲▽▼※〒→←↑↓〓・・・・・
-・・・・・・∈∋⊆⊇⊂⊃∪∩・・・・・・	・・・・・・∈∋⊆⊇⊂⊃∪∩・・・・・・
-・・∧∨¬⇒⇔∀∃・・・・・・・・・・・	・・∧∨¬⇒⇔∀∃・・・・・・・・・・・
-∠⊥⌒∂∇≡≒≪≫√∽∝∵∫∬・・・・・	∠⊥⌒∂∇≡≒≪≫√∽∝∵∫∬・・・・・
-・・ʼn♯♭♪†‡¶・・・・◯・・・・ 	・・ʼn♯♭♪†‡¶・・・・◯・・・・ 
-・・・・・・・・・・・・・・・・0123	・・・・・・・・・・・・・・・・0123
-456789・・・・・・・ABCDEFG	456789・・・・・・・ABCDEFG
-HIJKLMNOPQRSTUVWXYZ・	HIJKLMNOPQRSTUVWXYZ・
-・・・・・abcdefghijklmno	・・・・・abcdefghijklmno
-pqrstuvwxyz・・・・・・・・・	pqrstuvwxyz・・・・・・・・・
-・ぁあぃいぅうぇえぉおかがきぎくぐけげこ	・ぁあぃいぅうぇえぉおかがきぎくぐけげこ
-ごさざしじすずせぜそぞただちぢっつづてで	ごさざしじすずせぜそぞただちぢっつづてで
-とどなにぬねのはばぱひびぴふぶぷへべぺほ	とどなにぬねのはばぱひびぴふぶぷへべぺほ
-ぼぽまみむめもゃやゅゆょよらりるれろゎわ	ぼぽまみむめもゃやゅゆょよらりるれろゎわ
-ゐゑをん・・・・・・・・・・・・・・・・	ゐゑをん・・・・・・・・・・・・・・・・
-・ァアィイゥウェエォオカガキギクグケゲコ	・ァアィイゥウェエォオカガキギクグケゲコ
-ゴサザシジスズセゼソゾタダチヂッツヅテデ	ゴサザシジスズセゼソゾタダチヂッツヅテデ
-トドナニヌネノハバパヒビピフブプヘベペホ	トドナニヌネノハバパヒビピフブプヘベペホ
-ボポマミムメモャヤュユョヨラリルレロヮワ	ボポマミムメモャヤュユョヨラリルレロヮワ
-ヰヱヲンヴヵヶ・・・・・・・・・・・・・	ヰヱヲンヴヵヶ・・・・・・・・・・・・・
-・ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤ	・ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤ
-ΥΦΧΨΩ・・・・・・・・αβγδεζη	ΥΦΧΨΩ・・・・・・・・αβγδεζη
-θικλμνξοπρστυφχψω・・・	θικλμνξοπρστυφχψω・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・АБВГДЕЁЖЗИЙКЛМНОПРС	・АБВГДЕЁЖЗИЙКЛМНОПРС
-ТУФХЦЧШЩЪЫЬЭЮЯ・・・・・・	ТУФХЦЧШЩЪЫЬЭЮЯ・・・・・・
-・・・・・・・・・абвгдеёжзий	・・・・・・・・・абвгдеёжзий
-клмнопрстуфхцчшщъыьэ	клмнопрстуфхцчшщъыьэ
-юя・・・・・・・・・・・・・・・・・・	юя・・・・・・・・・・・・・・・・・・
-・─│┌┐┘└├┬┤┴┼━┃┏┓┛┗┣┳	・─│┌┐┘└├┬┤┴┼━┃┏┓┛┗┣┳
-┫┻╋┠┯┨┷┿┝┰┥┸╂・・・・・・・	┫┻╋┠┯┨┷┿┝┰┥┸╂・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵	・亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵
-梓圧斡扱宛姐虻飴絢綾鮎或粟袷安庵按暗案闇	梓圧斡扱宛姐虻飴絢綾鮎或粟袷安庵按暗案闇
-鞍杏以伊位依偉囲夷委威尉惟意慰易椅為畏異	鞍杏以伊位依偉囲夷委威尉惟意慰易椅為畏異
-移維緯胃萎衣謂違遺医井亥域育郁磯一壱溢逸	移維緯胃萎衣謂違遺医井亥域育郁磯一壱溢逸
-稲茨芋鰯允印咽員因姻引飲淫胤蔭・・・・・	稲茨芋鰯允印咽員因姻引飲淫胤蔭・・・・・
-・蓮連錬呂魯櫓炉賂路露労婁廊弄朗楼榔浪漏	・蓮連錬呂魯櫓炉賂路露労婁廊弄朗楼榔浪漏
-牢狼篭老聾蝋郎六麓禄肋録論倭和話歪賄脇惑	牢狼篭老聾蝋郎六麓禄肋録論倭和話歪賄脇惑
-枠鷲亙亘鰐詫藁蕨椀湾碗腕・・・・・・・・	枠鷲亙亘鰐詫藁蕨椀湾碗腕・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞	・弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞
-亟亠亢亰亳亶从仍仄仆仂仗仞仭仟价伉佚估佛	亟亠亢亰亳亶从仍仄仆仂仗仞仭仟价伉佚估佛
-佝佗佇佶侈侏侘佻佩佰侑佯來侖儘俔俟俎俘俛	佝佗佇佶侈侏侘佻佩佰侑佯來侖儘俔俟俎俘俛
-俑俚俐俤俥倚倨倔倪倥倅伜俶倡倩倬俾俯們倆	俑俚俐俤俥倚倨倔倪倥倅伜俶倡倩倬俾俯們倆
-偃假會偕偐偈做偖偬偸傀傚傅傴傲・・・・・	偃假會偕偐偈做偖偬偸傀傚傅傴傲・・・・・
-・鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻	・鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻
-鶸鶺鷆鷏鷂鷙鷓鷸鷦鷭鷯鷽鸚鸛鸞鹵鹹鹽麁麈	鶸鶺鷆鷏鷂鷙鷓鷸鷦鷭鷯鷽鸚鸛鸞鹵鹹鹽麁麈
-麋麌麒麕麑麝麥麩麸麪麭靡黌黎黏黐黔黜點黝	麋麌麒麕麑麝麥麩麸麪麭靡黌黎黏黐黔黜點黝
-黠黥黨黯黴黶黷黹黻黼黽鼇鼈皷鼕鼡鼬鼾齊齒	黠黥黨黯黴黶黷黹黻黼黽鼇鼈皷鼕鼡鼬鼾齊齒
-齔齣齟齠齡齦齧齬齪齷齲齶龕龜龠・・・・・	齔齣齟齠齡齦齧齬齪齷齲齶龕龜龠・・・・・
-・堯槇遙瑤凜熙・・・・・・・・・・・・・	・堯槇遙瑤凜熙・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-SELECT `C1`, CONVERT(`C1` using sjis) FROM `T11`;
-C1	CONVERT(`C1` using sjis)
-  、。,.・:;?!゛゜´`¨^ ̄_ヽ	  、。,.・:;?!゛゜´`¨^ ̄_ヽ
-ヾゝゞ〃仝々〆〇ー―‐/\〜‖|…‥‘’	ヾゝゞ〃仝々〆〇ー―‐/?〜‖|…‥‘’
-“”()〔〕[]{}〈〉《》「」『』【】	“”()〔〕[]{}〈〉《》「」『』【】
-+‐±×÷=≠<>≦≧∞∴♂♀°′″℃¥	+‐±×÷=≠<>≦≧∞∴♂♀°′″℃¥
-$¢£%#&*@§☆★○●◎◇・・・・・	$¢£%#&*@§☆★○●◎◇・・・・・
-・◆□■△▲▽▼※〒→←↑↓〓・・・・・	・◆□■△▲▽▼※〒→←↑↓〓・・・・・
-・・・・・・∈∋⊆⊇⊂⊃∪∩・・・・・・	・・・・・・∈∋⊆⊇⊂⊃∪∩・・・・・・
-・・∧∨¬⇒⇔∀∃・・・・・・・・・・・	・・∧∨¬⇒⇔∀∃・・・・・・・・・・・
-∠⊥⌒∂∇≡≒≪≫√∽∝∵∫∬・・・・・	∠⊥⌒∂∇≡≒≪≫√∽∝∵∫∬・・・・・
-・・ʼn♯♭♪†‡¶・・・・◯・・・・ 	・・ʼn♯♭♪†‡¶・・・・◯・・・・ 
-・・・・・・・・・・・・・・・・0123	・・・・・・・・・・・・・・・・0123
-456789・・・・・・・ABCDEFG	456789・・・・・・・ABCDEFG
-HIJKLMNOPQRSTUVWXYZ・	HIJKLMNOPQRSTUVWXYZ・
-・・・・・abcdefghijklmno	・・・・・abcdefghijklmno
-pqrstuvwxyz・・・・・・・・・	pqrstuvwxyz・・・・・・・・・
-・ぁあぃいぅうぇえぉおかがきぎくぐけげこ	・ぁあぃいぅうぇえぉおかがきぎくぐけげこ
-ごさざしじすずせぜそぞただちぢっつづてで	ごさざしじすずせぜそぞただちぢっつづてで
-とどなにぬねのはばぱひびぴふぶぷへべぺほ	とどなにぬねのはばぱひびぴふぶぷへべぺほ
-ぼぽまみむめもゃやゅゆょよらりるれろゎわ	ぼぽまみむめもゃやゅゆょよらりるれろゎわ
-ゐゑをん・・・・・・・・・・・・・・・・	ゐゑをん・・・・・・・・・・・・・・・・
-・ァアィイゥウェエォオカガキギクグケゲコ	・ァアィイゥウェエォオカガキギクグケゲコ
-ゴサザシジスズセゼソゾタダチヂッツヅテデ	ゴサザシジスズセゼソゾタダチヂッツヅテデ
-トドナニヌネノハバパヒビピフブプヘベペホ	トドナニヌネノハバパヒビピフブプヘベペホ
-ボポマミムメモャヤュユョヨラリルレロヮワ	ボポマミムメモャヤュユョヨラリルレロヮワ
-ヰヱヲンヴヵヶ・・・・・・・・・・・・・	ヰヱヲンヴヵヶ・・・・・・・・・・・・・
-・ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤ	・ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤ
-ΥΦΧΨΩ・・・・・・・・αβγδεζη	ΥΦΧΨΩ・・・・・・・・αβγδεζη
-θικλμνξοπρστυφχψω・・・	θικλμνξοπρστυφχψω・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・АБВГДЕЁЖЗИЙКЛМНОПРС	・АБВГДЕЁЖЗИЙКЛМНОПРС
-ТУФХЦЧШЩЪЫЬЭЮЯ・・・・・・	ТУФХЦЧШЩЪЫЬЭЮЯ・・・・・・
-・・・・・・・・・абвгдеёжзий	・・・・・・・・・абвгдеёжзий
-клмнопрстуфхцчшщъыьэ	клмнопрстуфхцчшщъыьэ
-юя・・・・・・・・・・・・・・・・・・	юя・・・・・・・・・・・・・・・・・・
-・─│┌┐┘└├┬┤┴┼━┃┏┓┛┗┣┳	・─│┌┐┘└├┬┤┴┼━┃┏┓┛┗┣┳
-┫┻╋┠┯┨┷┿┝┰┥┸╂・・・・・・・	┫┻╋┠┯┨┷┿┝┰┥┸╂・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵	・亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵
-梓圧斡扱宛姐虻飴絢綾鮎或粟袷安庵按暗案闇	梓圧斡扱宛姐虻飴絢綾鮎或粟袷安庵按暗案闇
-鞍杏以伊位依偉囲夷委威尉惟意慰易椅為畏異	鞍杏以伊位依偉囲夷委威尉惟意慰易椅為畏異
-移維緯胃萎衣謂違遺医井亥域育郁磯一壱溢逸	移維緯胃萎衣謂違遺医井亥域育郁磯一壱溢逸
-稲茨芋鰯允印咽員因姻引飲淫胤蔭・・・・・	稲茨芋鰯允印咽員因姻引飲淫胤蔭・・・・・
-・蓮連錬呂魯櫓炉賂路露労婁廊弄朗楼榔浪漏	・蓮連錬呂魯櫓炉賂路露労婁廊弄朗楼榔浪漏
-牢狼篭老聾蝋郎六麓禄肋録論倭和話歪賄脇惑	牢狼篭老聾蝋郎六麓禄肋録論倭和話歪賄脇惑
-枠鷲亙亘鰐詫藁蕨椀湾碗腕・・・・・・・・	枠鷲亙亘鰐詫藁蕨椀湾碗腕・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞	・弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞
-亟亠亢亰亳亶从仍仄仆仂仗仞仭仟价伉佚估佛	亟亠亢亰亳亶从仍仄仆仂仗仞仭仟价伉佚估佛
-佝佗佇佶侈侏侘佻佩佰侑佯來侖儘俔俟俎俘俛	佝佗佇佶侈侏侘佻佩佰侑佯來侖儘俔俟俎俘俛
-俑俚俐俤俥倚倨倔倪倥倅伜俶倡倩倬俾俯們倆	俑俚俐俤俥倚倨倔倪倥倅伜俶倡倩倬俾俯們倆
-偃假會偕偐偈做偖偬偸傀傚傅傴傲・・・・・	偃假會偕偐偈做偖偬偸傀傚傅傴傲・・・・・
-・鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻	・鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻
-鶸鶺鷆鷏鷂鷙鷓鷸鷦鷭鷯鷽鸚鸛鸞鹵鹹鹽麁麈	鶸鶺鷆鷏鷂鷙鷓鷸鷦鷭鷯鷽鸚鸛鸞鹵鹹鹽麁麈
-麋麌麒麕麑麝麥麩麸麪麭靡黌黎黏黐黔黜點黝	麋麌麒麕麑麝麥麩麸麪麭靡黌黎黏黐黔黜點黝
-黠黥黨黯黴黶黷黹黻黼黽鼇鼈皷鼕鼡鼬鼾齊齒	黠黥黨黯黴黶黷黹黻黼黽鼇鼈皷鼕鼡鼬鼾齊齒
-齔齣齟齠齡齦齧齬齪齷齲齶龕龜龠・・・・・	齔齣齟齠齡齦齧齬齪齷齲齶龕龜龠・・・・・
-・堯槇遙瑤凜熙・・・・・・・・・・・・・	・堯槇遙瑤凜熙・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-SELECT `C1`, CONVERT(`C1` using ujis) FROM `T12`;
-C1	CONVERT(`C1` using ujis)
-・・・・・・・・・・・・・・・˘ˇ¸˙˝	・・・・・・・・・・・・・・・˘ˇ¸˙˝
-・˛˚~΄΅・・・・・・・・¡¦¿・・・	・˛˚?΄΅・・・・・・・・¡¦¿・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・ºª©®™	・・・・・・・・・・・・・・・ºª©®™
-¤№・・・・・・・・・・・・・・・・・・	¤№・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・ΆΈΉΊΪ・Ό・ΎΫ・Ώ・・・	・・・・・ΆΈΉΊΪ・Ό・ΎΫ・Ώ・・・
-・άέήίϊΐόςύϋΰώ・・・・・・・	・άέήίϊΐόςύϋΰώ・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・ЂЃЄЅІЇ	・・・・・・・・・・・・・・ЂЃЄЅІЇ
-ЈЉЊЋЌЎЏ・・・・・・・・・・・・・	ЈЉЊЋЌЎЏ・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・ђѓєѕіїјљњћќўџ・・・・・	・・ђѓєѕіїјљњћќўџ・・・・・
-・ÆĐ・Ħ・IJ・ŁĿ・ŊØŒ・ŦÞ・・・	・ÆĐ・Ħ・IJ・ŁĿ・ŊØŒ・ŦÞ・・・
-・・・・・・・・・・・・・æđðħıijĸ	・・・・・・・・・・・・・æđðħıijĸ
-łŀʼnŋøœßŧþ・・・・・・・・・・・	łŀʼnŋøœßŧþ・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・ÁÀÄÂĂǍĀĄÅÃĆĈČÇĊĎÉÈË	・ÁÀÄÂĂǍĀĄÅÃĆĈČÇĊĎÉÈË
-ÊĚĖĒĘ・ĜĞĢĠĤÍÌÏÎǏİĪĮĨ	ÊĚĖĒĘ・ĜĞĢĠĤÍÌÏÎǏİĪĮĨ
-ĴĶĹĽĻŃŇŅÑÓÒÖÔǑŐŌÕŔŘŖ	ĴĶĹĽĻŃŇŅÑÓÒÖÔǑŐŌÕŔŘŖ
-ŚŜŠŞŤŢÚÙÜÛŬǓŰŪŲŮŨǗǛǙ	ŚŜŠŞŤŢÚÙÜÛŬǓŰŪŲŮŨǗǛǙ
-ǕŴÝŸŶŹŽŻ・・・・・・・・・・・・	ǕŴÝŸŶŹŽŻ・・・・・・・・・・・・
-・áàäâăǎāąåãćĉčçċďéèë	・áàäâăǎāąåãćĉčçċďéèë
-êěėēęǵĝğ・ġĥíìïîǐ・īįĩ	êěėēęǵĝğ・ġĥíìïîǐ・īįĩ
-ĵķĺľļńňņñóòöôǒőōõŕřŗ	ĵķĺľļńňņñóòöôǒőōõŕřŗ
-śŝšşťţúùüûŭǔűūųůũǘǜǚ	śŝšşťţúùüûŭǔűūųůũǘǜǚ
-ǖŵýÿŷźžż・・・・・・・・・・・・	ǖŵýÿŷźžż・・・・・・・・・・・・
-・丂丄丅丌丒丟丣两丨丫丮丯丰丵乀乁乄乇乑	・丂丄丅丌丒丟丣两丨丫丮丯丰丵乀乁乄乇乑
-乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠	乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠
-仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众	仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众
-伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘	伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘
-佟佣佪佬佮佱佷佸佹佺佽佾侁侂侄・・・・・	佟佣佪佬佮佱佷佸佹佺佽佾侁侂侄・・・・・
-・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪	・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪
-鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖	鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖
-齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒	齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒
-龔龖龗龞龡龢龣龥・・・・・・・・・・・・	龔龖龗龞龡龢龣龥・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-SELECT `C1`, CONVERT(`C1` using ucs2) FROM `T12`;
-C1	CONVERT(`C1` using ucs2)
-・・・・・・・・・・・・・・・˘ˇ¸˙˝	・・・・・・・・・・・・・・・˘ˇ¸˙˝
-・˛˚~΄΅・・・・・・・・¡¦¿・・・	・˛˚~΄΅・・・・・・・・¡¦¿・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・ºª©®™	・・・・・・・・・・・・・・・ºª©®™
-¤№・・・・・・・・・・・・・・・・・・	¤№・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・ΆΈΉΊΪ・Ό・ΎΫ・Ώ・・・	・・・・・ΆΈΉΊΪ・Ό・ΎΫ・Ώ・・・
-・άέήίϊΐόςύϋΰώ・・・・・・・	・άέήίϊΐόςύϋΰώ・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・ЂЃЄЅІЇ	・・・・・・・・・・・・・・ЂЃЄЅІЇ
-ЈЉЊЋЌЎЏ・・・・・・・・・・・・・	ЈЉЊЋЌЎЏ・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・ђѓєѕіїјљњћќўџ・・・・・	・・ђѓєѕіїјљњћќўџ・・・・・
-・ÆĐ・Ħ・IJ・ŁĿ・ŊØŒ・ŦÞ・・・	・ÆĐ・Ħ・IJ・ŁĿ・ŊØŒ・ŦÞ・・・
-・・・・・・・・・・・・・æđðħıijĸ	・・・・・・・・・・・・・æđðħıijĸ
-łŀʼnŋøœßŧþ・・・・・・・・・・・	łŀʼnŋøœßŧþ・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・ÁÀÄÂĂǍĀĄÅÃĆĈČÇĊĎÉÈË	・ÁÀÄÂĂǍĀĄÅÃĆĈČÇĊĎÉÈË
-ÊĚĖĒĘ・ĜĞĢĠĤÍÌÏÎǏİĪĮĨ	ÊĚĖĒĘ・ĜĞĢĠĤÍÌÏÎǏİĪĮĨ
-ĴĶĹĽĻŃŇŅÑÓÒÖÔǑŐŌÕŔŘŖ	ĴĶĹĽĻŃŇŅÑÓÒÖÔǑŐŌÕŔŘŖ
-ŚŜŠŞŤŢÚÙÜÛŬǓŰŪŲŮŨǗǛǙ	ŚŜŠŞŤŢÚÙÜÛŬǓŰŪŲŮŨǗǛǙ
-ǕŴÝŸŶŹŽŻ・・・・・・・・・・・・	ǕŴÝŸŶŹŽŻ・・・・・・・・・・・・
-・áàäâăǎāąåãćĉčçċďéèë	・áàäâăǎāąåãćĉčçċďéèë
-êěėēęǵĝğ・ġĥíìïîǐ・īįĩ	êěėēęǵĝğ・ġĥíìïîǐ・īįĩ
-ĵķĺľļńňņñóòöôǒőōõŕřŗ	ĵķĺľļńňņñóòöôǒőōõŕřŗ
-śŝšşťţúùüûŭǔűūųůũǘǜǚ	śŝšşťţúùüûŭǔűūųůũǘǜǚ
-ǖŵýÿŷźžż・・・・・・・・・・・・	ǖŵýÿŷźžż・・・・・・・・・・・・
-・丂丄丅丌丒丟丣两丨丫丮丯丰丵乀乁乄乇乑	・丂丄丅丌丒丟丣两丨丫丮丯丰丵乀乁乄乇乑
-乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠	乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠
-仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众	仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众
-伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘	伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘
-佟佣佪佬佮佱佷佸佹佺佽佾侁侂侄・・・・・	佟佣佪佬佮佱佷佸佹佺佽佾侁侂侄・・・・・
-・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪	・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪
-鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖	鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖
-齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒	齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒
-龔龖龗龞龡龢龣龥・・・・・・・・・・・・	龔龖龗龞龡龢龣龥・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-SELECT `C1`, CONVERT(`C1` using sjis) FROM `T12`;
-C1	CONVERT(`C1` using sjis)
-・・・・・・・・・・・・・・・˘ˇ¸˙˝	・・・・・・・・・・・・・・・?????
-・˛˚~΄΅・・・・・・・・¡¦¿・・・	・?????・・・・・・・・???・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・ºª©®™	・・・・・・・・・・・・・・・?????
-¤№・・・・・・・・・・・・・・・・・・	??・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・ΆΈΉΊΪ・Ό・ΎΫ・Ώ・・・	・・・・・?????・?・??・?・・・
-・άέήίϊΐόςύϋΰώ・・・・・・・	・????????????・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・ЂЃЄЅІЇ	・・・・・・・・・・・・・・??????
-ЈЉЊЋЌЎЏ・・・・・・・・・・・・・	???????・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・ђѓєѕіїјљњћќўџ・・・・・	・・?????????????・・・・・
-・ÆĐ・Ħ・IJ・ŁĿ・ŊØŒ・ŦÞ・・・	・??・?・?・??・???・??・・・
-・・・・・・・・・・・・・æđðħıijĸ	・・・・・・・・・・・・・???????
-łŀʼnŋøœßŧþ・・・・・・・・・・・	?????????・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
-・ÁÀÄÂĂǍĀĄÅÃĆĈČÇĊĎÉÈË	・???????????????????
-ÊĚĖĒĘ・ĜĞĢĠĤÍÌÏÎǏİĪĮĨ	?????・??????????????
-ĴĶĹĽĻŃŇŅÑÓÒÖÔǑŐŌÕŔŘŖ	????????????????????
-ŚŜŠŞŤŢÚÙÜÛŬǓŰŪŲŮŨǗǛǙ	????????????????????
-ǕŴÝŸŶŹŽŻ・・・・・・・・・・・・	????????・・・・・・・・・・・・
-・áàäâăǎāąåãćĉčçċďéèë	・???????????????????
-êěėēęǵĝğ・ġĥíìïîǐ・īįĩ	????????・???????・???
-ĵķĺľļńňņñóòöôǒőōõŕřŗ	????????????????????
-śŝšşťţúùüûŭǔűūųůũǘǜǚ	????????????????????
-ǖŵýÿŷźžż・・・・・・・・・・・・	????????・・・・・・・・・・・・
-・丂丄丅丌丒丟丣两丨丫丮丯丰丵乀乁乄乇乑	・???????????????????
-乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠	????????????????????
-仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众	????????????????????
-伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘	????????????????????
-佟佣佪佬佮佱佷佸佹佺佽佾侁侂侄・・・・・	???????????????・・・・・
-・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪	・???????????????????
-鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖	????????????????????
-齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒	????????????????????
-龔龖龗龞龡龢龣龥・・・・・・・・・・・・	????????・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・	・・・・・・・・・・・・・・・・・・・・
 drop table `T1`;
 drop table `T2`;
 drop table `T3`;
@@ -1509,6 +1134,3 @@ drop table `T6`;
 drop table `T7`;
 drop table `T8`;
 drop table `T9`;
-drop table `T10`;
-drop table `T11`;
-drop table `T12`;
diff -Nrup a/mysql-test/suite/jp/r/jp_create_db_sjis.result b/mysql-test/suite/jp/r/jp_create_db_sjis.result
--- a/mysql-test/suite/jp/r/jp_create_db_sjis.result	2005-01-07 13:27:29 +01:00
+++ b/mysql-test/suite/jp/r/jp_create_db_sjis.result	2008-05-15 18:01:06 +02:00
 SHOW DATABASES;
 Database
-mysql
-test
+information_schema
+mysql
+test
diff -Nrup a/mysql-test/suite/jp/r/jp_create_db_ucs2.result b/mysql-test/suite/jp/r/jp_create_db_ucs2.result
--- a/mysql-test/suite/jp/r/jp_create_db_ucs2.result	2005-01-07 13:27:29 +01:00
+++ b/mysql-test/suite/jp/r/jp_create_db_ucs2.result	2008-05-15 18:01:06 +02:00
 SHOW DATABASES;
 Database
-mysql
-test
+information_schema
+mysql
+test
diff -Nrup a/mysql-test/suite/jp/r/jp_create_db_ujis.result b/mysql-test/suite/jp/r/jp_create_db_ujis.result
--- a/mysql-test/suite/jp/r/jp_create_db_ujis.result	2005-01-07 13:27:29 +01:00
+++ b/mysql-test/suite/jp/r/jp_create_db_ujis.result	2008-05-15 18:01:06 +02:00
 SHOW DATABASES;
 Database
-mysql
-test
+information_schema
+mysql
+test
diff -Nrup a/mysql-test/suite/jp/r/jp_create_db_utf8.result b/mysql-test/suite/jp/r/jp_create_db_utf8.result
--- a/mysql-test/suite/jp/r/jp_create_db_utf8.result	2005-01-07 13:27:29 +01:00
+++ b/mysql-test/suite/jp/r/jp_create_db_utf8.result	2008-05-15 18:01:06 +02:00
@@ -8,11 +8,12 @@ CREATE DATABASE `日本語`;
 CREATE DATABASE `龔龖龗`;
 SHOW DATABASES;
 Database
-mysql
-test
+information_schema
 日本語
 龔龖龗
 ニホンゴ
+mysql
+test
 USE `ニホンゴ`;
 USE `日本語`;
 USE `龔龖龗`;
diff -Nrup a/mysql-test/suite/jp/r/jp_create_tbl_sjis.result b/mysql-test/suite/jp/r/jp_create_tbl_sjis.result
--- a/mysql-test/suite/jp/r/jp_create_tbl_sjis.result	2005-01-07 13:27:29 +01:00
+++ b/mysql-test/suite/jp/r/jp_create_tbl_sjis.result	2008-05-15 18:01:06 +02:00
+Warnings:
+Warnings:
+Warnings:
+Warnings:
+Warnings:
+Warnings:
@@ -84,77 +96,77 @@ Field	Type	Null	Key	Default	Extra
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
+Warnings:
+Warnings:
+Warnings:
+Warnings:
+Warnings:
+Warnings:
@@ -240,77 +264,77 @@ Field	Type	Null	Key	Default	Extra
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
+Warnings:
+Warnings:
+Warnings:
+Warnings:
+Warnings:
+Warnings:
 Field	Type	Null	Key	Default	Extra
@@ -396,234 +432,78 @@ Field	Type	Null	Key	Default	Extra
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=sjis
-Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
diff -Nrup a/mysql-test/suite/jp/r/jp_create_tbl_ucs2.result b/mysql-test/suite/jp/r/jp_create_tbl_ucs2.result
--- a/mysql-test/suite/jp/r/jp_create_tbl_ucs2.result	2005-01-07 13:27:29 +01:00
+++ b/mysql-test/suite/jp/r/jp_create_tbl_ucs2.result	2008-05-15 18:01:06 +02:00
+Warnings:
+Warnings:
+Warnings:
+Warnings:
+Warnings:
+Warnings:
@@ -84,77 +96,77 @@ Field	Type	Null	Key	Default	Extra
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
+Warnings:
+Warnings:
+Warnings:
+Warnings:
+Warnings:
+Warnings:
@@ -240,77 +264,77 @@ Field	Type	Null	Key	Default	Extra
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
+Warnings:
+Warnings:
+Warnings:
+Warnings:
+Warnings:
+Warnings:
 Field	Type	Null	Key	Default	Extra
@@ -396,234 +432,78 @@ Field	Type	Null	Key	Default	Extra
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
-Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
diff -Nrup a/mysql-test/suite/jp/r/jp_create_tbl_ujis.result b/mysql-test/suite/jp/r/jp_create_tbl_ujis.result
--- a/mysql-test/suite/jp/r/jp_create_tbl_ujis.result	2005-01-07 13:27:29 +01:00
+++ b/mysql-test/suite/jp/r/jp_create_tbl_ujis.result	2008-05-15 18:01:06 +02:00
+Warnings:
+Warnings:
+Warnings:
+Warnings:
+Warnings:
+Warnings:
@@ -84,77 +96,77 @@ Field	Type	Null	Key	Default	Extra
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
+Warnings:
+Warnings:
+Warnings:
+Warnings:
+Warnings:
+Warnings:
@@ -240,77 +264,77 @@ Field	Type	Null	Key	Default	Extra
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
+Warnings:
+Warnings:
+Warnings:
+Warnings:
+Warnings:
+Warnings:
 Field	Type	Null	Key	Default	Extra
@@ -396,234 +432,78 @@ Field	Type	Null	Key	Default	Extra
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=ujis
-Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
diff -Nrup a/mysql-test/suite/jp/r/jp_create_tbl_utf8.result b/mysql-test/suite/jp/r/jp_create_tbl_utf8.result
--- a/mysql-test/suite/jp/r/jp_create_tbl_utf8.result	2005-01-07 13:27:30 +01:00
+++ b/mysql-test/suite/jp/r/jp_create_tbl_utf8.result	2008-05-15 18:01:06 +02:00
@@ -22,11 +22,23 @@ CREATE TABLE `いいい`(`ききき` cha
 CREATE TABLE `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = utf8 engine=INNODB;
 CREATE TABLE `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = utf8 engine=INNODB;
 CREATE TABLE IF NOT EXISTS `アアア`(`カカカ` char(1)) DEFAULT CHARSET = utf8 engine=INNODB;
+Warnings:
+Note	1050	Table 'アアア' already exists
 CREATE TABLE IF NOT EXISTS `イイイ`(`キキキ` char(1)) DEFAULT CHARSET = utf8 engine=INNODB;
+Warnings:
+Note	1050	Table 'イイイ' already exists
 CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = utf8 engine=INNODB;
+Warnings:
+Note	1050	Table 'あああ' already exists
 CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = utf8 engine=INNODB;
+Warnings:
+Note	1050	Table 'いいい' already exists
 CREATE TABLE IF NOT EXISTS `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = utf8 engine=INNODB;
+Warnings:
+Note	1050	Table '龖龖龖' already exists
 CREATE TABLE IF NOT EXISTS `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = utf8 engine=INNODB;
+Warnings:
+Note	1050	Table '龗龗龗' already exists
 CREATE TABLE IF NOT EXISTS `ウウウ`(`ククク` char(1)) DEFAULT CHARSET = utf8 engine=INNODB;
 CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = utf8 engine=INNODB;
 CREATE TABLE IF NOT EXISTS `龞龞龞`(`丅丅丅`char(1)) DEFAULT CHARSET = utf8 engine=INNODB;
@@ -84,77 +96,77 @@ Field	Type	Null	Key	Default	Extra
 SHOW CREATE TABLE `アアア`;
 Table	Create Table
 アアア	CREATE TABLE `アアア` (
-  `カカカ` char(1) default NULL
+  `カカカ` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `イイイ`;
 Table	Create Table
 イイイ	CREATE TABLE `イイイ` (
-  `キキキ` char(1) default NULL
+  `キキキ` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `ウウウ`;
 Table	Create Table
 ウウウ	CREATE TABLE `ウウウ` (
-  `ククク` char(1) default NULL
+  `ククク` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `エエエ`;
 Table	Create Table
 エエエ	CREATE TEMPORARY TABLE `エエエ` (
-  `ケケケ` char(1) default NULL
+  `ケケケ` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `オオオ`;
 Table	Create Table
 オオオ	CREATE TEMPORARY TABLE `オオオ` (
-  `コココ` char(1) default NULL
+  `コココ` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
-  `かかか` char(1) default NULL
+  `かかか` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `いいい`;
 Table	Create Table
 いいい	CREATE TABLE `いいい` (
-  `ききき` char(1) default NULL
+  `ききき` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `ううう`;
 Table	Create Table
 ううう	CREATE TABLE `ううう` (
-  `くくく` char(1) default NULL
+  `くくく` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `えええ`;
 Table	Create Table
 えええ	CREATE TEMPORARY TABLE `えええ` (
-  `けけけ` char(1) default NULL
+  `けけけ` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `おおお`;
 Table	Create Table
 おおお	CREATE TEMPORARY TABLE `おおお` (
-  `こここ` char(1) default NULL
+  `こここ` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
-  `丂丂丂` char(1) default NULL
+  `丂丂丂` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `龗龗龗`;
 Table	Create Table
 龗龗龗	CREATE TABLE `龗龗龗` (
-  `丄丄丄` char(1) default NULL
+  `丄丄丄` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `龞龞龞`;
 Table	Create Table
 龞龞龞	CREATE TABLE `龞龞龞` (
-  `丅丅丅` char(1) default NULL
+  `丅丅丅` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `龡龡龡`;
 Table	Create Table
 龡龡龡	CREATE TEMPORARY TABLE `龡龡龡` (
-  `丌丌丌` char(1) default NULL
+  `丌丌丌` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `龢龢龢`;
 Table	Create Table
 龢龢龢	CREATE TEMPORARY TABLE `龢龢龢` (
-  `丒丒丒` char(1) default NULL
+  `丒丒丒` char(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
 DROP TABLE `アアア`;
 DROP TABLE `イイイ`;
@@ -178,11 +190,23 @@ CREATE TABLE `いいい`(`ききき` cha
 CREATE TABLE `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = utf8 engine=MyISAM;
 CREATE TABLE `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = utf8 engine=MyISAM;
 CREATE TABLE IF NOT EXISTS `アアア`(`カカカ` char(1)) DEFAULT CHARSET = utf8 engine=MyISAM;
+Warnings:
+Note	1050	Table 'アアア' already exists
 CREATE TABLE IF NOT EXISTS `イイイ`(`キキキ` char(1)) DEFAULT CHARSET = utf8 engine=MyISAM;
+Warnings:
+Note	1050	Table 'イイイ' already exists
 CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = utf8 engine=MyISAM;
+Warnings:
+Note	1050	Table 'あああ' already exists
 CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = utf8 engine=MyISAM;
+Warnings:
+Note	1050	Table 'いいい' already exists
 CREATE TABLE IF NOT EXISTS `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = utf8 engine=MyISAM;
+Warnings:
+Note	1050	Table '龖龖龖' already exists
 CREATE TABLE IF NOT EXISTS `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = utf8 engine=MyISAM;
+Warnings:
+Note	1050	Table '龗龗龗' already exists
 CREATE TABLE IF NOT EXISTS `ウウウ`(`ククク` char(1)) DEFAULT CHARSET = utf8 engine=MyISAM;
 CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = utf8 engine=MyISAM;
 CREATE TABLE IF NOT EXISTS `龞龞龞`(`丅丅丅`char(1)) DEFAULT CHARSET = utf8 engine=MyISAM;
@@ -240,77 +264,77 @@ Field	Type	Null	Key	Default	Extra
 SHOW CREATE TABLE `アアア`;
 Table	Create Table
 アアア	CREATE TABLE `アアア` (
-  `カカカ` char(1) default NULL
+  `カカカ` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `イイイ`;
 Table	Create Table
 イイイ	CREATE TABLE `イイイ` (
-  `キキキ` char(1) default NULL
+  `キキキ` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `ウウウ`;
 Table	Create Table
 ウウウ	CREATE TABLE `ウウウ` (
-  `ククク` char(1) default NULL
+  `ククク` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `エエエ`;
 Table	Create Table
 エエエ	CREATE TEMPORARY TABLE `エエエ` (
-  `ケケケ` char(1) default NULL
+  `ケケケ` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `オオオ`;
 Table	Create Table
 オオオ	CREATE TEMPORARY TABLE `オオオ` (
-  `コココ` char(1) default NULL
+  `コココ` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
-  `かかか` char(1) default NULL
+  `かかか` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `いいい`;
 Table	Create Table
 いいい	CREATE TABLE `いいい` (
-  `ききき` char(1) default NULL
+  `ききき` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `ううう`;
 Table	Create Table
 ううう	CREATE TABLE `ううう` (
-  `くくく` char(1) default NULL
+  `くくく` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `えええ`;
 Table	Create Table
 えええ	CREATE TEMPORARY TABLE `えええ` (
-  `けけけ` char(1) default NULL
+  `けけけ` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `おおお`;
 Table	Create Table
 おおお	CREATE TEMPORARY TABLE `おおお` (
-  `こここ` char(1) default NULL
+  `こここ` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
-  `丂丂丂` char(1) default NULL
+  `丂丂丂` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `龗龗龗`;
 Table	Create Table
 龗龗龗	CREATE TABLE `龗龗龗` (
-  `丄丄丄` char(1) default NULL
+  `丄丄丄` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `龞龞龞`;
 Table	Create Table
 龞龞龞	CREATE TABLE `龞龞龞` (
-  `丅丅丅` char(1) default NULL
+  `丅丅丅` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `龡龡龡`;
 Table	Create Table
 龡龡龡	CREATE TEMPORARY TABLE `龡龡龡` (
-  `丌丌丌` char(1) default NULL
+  `丌丌丌` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `龢龢龢`;
 Table	Create Table
 龢龢龢	CREATE TEMPORARY TABLE `龢龢龢` (
-  `丒丒丒` char(1) default NULL
+  `丒丒丒` char(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 DROP TABLE `アアア`;
 DROP TABLE `イイイ`;
@@ -327,27 +351,39 @@ DROP TABLE `龗龗龗`;
 DROP TABLE `龞龞龞`;
 DROP TABLE `龡龡龡`;
 DROP TABLE `龢龢龢`;
-CREATE TABLE `アアア`(`カカカ` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
-CREATE TABLE `イイイ`(`キキキ` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
-CREATE TABLE `あああ`(`かかか` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
-CREATE TABLE `いいい`(`ききき` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
-CREATE TABLE `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
-CREATE TABLE `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
-CREATE TABLE IF NOT EXISTS `アアア`(`カカカ` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
-CREATE TABLE IF NOT EXISTS `イイイ`(`キキキ` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
-CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
-CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
-CREATE TABLE IF NOT EXISTS `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
-CREATE TABLE IF NOT EXISTS `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
-CREATE TABLE IF NOT EXISTS `ウウウ`(`ククク` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
-CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
-CREATE TABLE IF NOT EXISTS `龞龞龞`(`丅丅丅`char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
-CREATE TEMPORARY TABLE `エエエ`(`ケケケ` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
-CREATE TEMPORARY TABLE `オオオ`(`コココ` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
-CREATE TEMPORARY TABLE `えええ`(`けけけ` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
-CREATE TEMPORARY TABLE `おおお`(`こここ` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
-CREATE TEMPORARY TABLE `龡龡龡`(`丌丌丌` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
-CREATE TEMPORARY TABLE `龢龢龢`(`丒丒丒` char(1)) DEFAULT CHARSET = utf8 engine=HEAP;
+CREATE TABLE `アアア`(`カカカ` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TABLE `イイイ`(`キキキ` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TABLE `あああ`(`かかか` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TABLE `いいい`(`ききき` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TABLE `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TABLE `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TABLE IF NOT EXISTS `アアア`(`カカカ` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+Warnings:
+Note	1050	Table 'アアア' already exists
+CREATE TABLE IF NOT EXISTS `イイイ`(`キキキ` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+Warnings:
+Note	1050	Table 'イイイ' already exists
+CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+Warnings:
+Note	1050	Table 'あああ' already exists
+CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+Warnings:
+Note	1050	Table 'いいい' already exists
+CREATE TABLE IF NOT EXISTS `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+Warnings:
+Note	1050	Table '龖龖龖' already exists
+CREATE TABLE IF NOT EXISTS `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+Warnings:
+Note	1050	Table '龗龗龗' already exists
+CREATE TABLE IF NOT EXISTS `ウウウ`(`ククク` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TABLE IF NOT EXISTS `龞龞龞`(`丅丅丅`char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TEMPORARY TABLE `エエエ`(`ケケケ` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TEMPORARY TABLE `オオオ`(`コココ` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TEMPORARY TABLE `えええ`(`けけけ` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TEMPORARY TABLE `おおお`(`こここ` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TEMPORARY TABLE `龡龡龡`(`丌丌丌` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
+CREATE TEMPORARY TABLE `龢龢龢`(`丒丒丒` char(1)) DEFAULT CHARSET = utf8 engine=MEMORY;
 DESC `アアア`;
 Field	Type	Null	Key	Default	Extra
 カカカ	char(1)	YES		NULL	
@@ -396,234 +432,78 @@ Field	Type	Null	Key	Default	Extra
 SHOW CREATE TABLE `アアア`;
 Table	Create Table
 アアア	CREATE TABLE `アアア` (
-  `カカカ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+  `カカカ` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `イイイ`;
 Table	Create Table
 イイイ	CREATE TABLE `イイイ` (
-  `キキキ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+  `キキキ` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `ウウウ`;
 Table	Create Table
 ウウウ	CREATE TABLE `ウウウ` (
-  `ククク` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+  `ククク` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `エエエ`;
 Table	Create Table
 エエエ	CREATE TEMPORARY TABLE `エエエ` (
-  `ケケケ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+  `ケケケ` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `オオオ`;
 Table	Create Table
 オオオ	CREATE TEMPORARY TABLE `オオオ` (
-  `コココ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+  `コココ` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
-  `かかか` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+  `かかか` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `いいい`;
 Table	Create Table
 いいい	CREATE TABLE `いいい` (
-  `ききき` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+  `ききき` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `ううう`;
 Table	Create Table
 ううう	CREATE TABLE `ううう` (
-  `くくく` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+  `くくく` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `えええ`;
 Table	Create Table
 えええ	CREATE TEMPORARY TABLE `えええ` (
-  `けけけ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+  `けけけ` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `おおお`;
 Table	Create Table
 おおお	CREATE TEMPORARY TABLE `おおお` (
-  `こここ` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+  `こここ` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
-  `丂丂丂` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+  `丂丂丂` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `龗龗龗`;
 Table	Create Table
 龗龗龗	CREATE TABLE `龗龗龗` (
-  `丄丄丄` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+  `丄丄丄` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `龞龞龞`;
 Table	Create Table
 龞龞龞	CREATE TABLE `龞龞龞` (
-  `丅丅丅` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+  `丅丅丅` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `龡龡龡`;
 Table	Create Table
 龡龡龡	CREATE TEMPORARY TABLE `龡龡龡` (
-  `丌丌丌` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+  `丌丌丌` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `龢龢龢`;
 Table	Create Table
 龢龢龢	CREATE TEMPORARY TABLE `龢龢龢` (
-  `丒丒丒` char(1) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=utf8
-DROP TABLE `アアア`;
-DROP TABLE `イイイ`;
-DROP TABLE `ウウウ`;
-DROP TABLE `エエエ`;
-DROP TABLE `オオオ`;
-DROP TABLE `あああ`;
-DROP TABLE `いいい`;
-DROP TABLE `ううう`;
-DROP TABLE `えええ`;
-DROP TABLE `おおお`;
-DROP TABLE `龖龖龖`;
-DROP TABLE `龗龗龗`;
-DROP TABLE `龞龞龞`;
-DROP TABLE `龡龡龡`;
-DROP TABLE `龢龢龢`;
-CREATE TABLE `アアア`(`カカカ` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
-CREATE TABLE `イイイ`(`キキキ` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
-CREATE TABLE `あああ`(`かかか` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
-CREATE TABLE `いいい`(`ききき` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
-CREATE TABLE `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
-CREATE TABLE `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
-CREATE TABLE IF NOT EXISTS `アアア`(`カカカ` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
-CREATE TABLE IF NOT EXISTS `イイイ`(`キキキ` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
-CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
-CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
-CREATE TABLE IF NOT EXISTS `龖龖龖`(`丂丂丂` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
-CREATE TABLE IF NOT EXISTS `龗龗龗`(`丄丄丄` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
-CREATE TABLE IF NOT EXISTS `ウウウ`(`ククク` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
-CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
-CREATE TABLE IF NOT EXISTS `龞龞龞`(`丅丅丅`char(1)) DEFAULT CHARSET = utf8 engine=BDB;
-CREATE TEMPORARY TABLE `エエエ`(`ケケケ` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
-CREATE TEMPORARY TABLE `オオオ`(`コココ` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
-CREATE TEMPORARY TABLE `えええ`(`けけけ` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
-CREATE TEMPORARY TABLE `おおお`(`こここ` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
-CREATE TEMPORARY TABLE `龡龡龡`(`丌丌丌` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
-CREATE TEMPORARY TABLE `龢龢龢`(`丒丒丒` char(1)) DEFAULT CHARSET = utf8 engine=BDB;
-DESC `アアア`;
-Field	Type	Null	Key	Default	Extra
-カカカ	char(1)	YES		NULL	
-DESC `イイイ`;
-Field	Type	Null	Key	Default	Extra
-キキキ	char(1)	YES		NULL	
-DESC `ウウウ`;
-Field	Type	Null	Key	Default	Extra
-ククク	char(1)	YES		NULL	
-DESC `エエエ`;
-Field	Type	Null	Key	Default	Extra
-ケケケ	char(1)	YES		NULL	
-DESC `オオオ`;
-Field	Type	Null	Key	Default	Extra
-コココ	char(1)	YES		NULL	
-DESC `あああ`;
-Field	Type	Null	Key	Default	Extra
-かかか	char(1)	YES		NULL	
-DESC `いいい`;
-Field	Type	Null	Key	Default	Extra
-ききき	char(1)	YES		NULL	
-DESC `ううう`;
-Field	Type	Null	Key	Default	Extra
-くくく	char(1)	YES		NULL	
-DESC `えええ`;
-Field	Type	Null	Key	Default	Extra
-けけけ	char(1)	YES		NULL	
-DESC `おおお`;
-Field	Type	Null	Key	Default	Extra
-こここ	char(1)	YES		NULL	
-DESC `龖龖龖`;
-Field	Type	Null	Key	Default	Extra
-丂丂丂	char(1)	YES		NULL	
-DESC `龗龗龗`;
-Field	Type	Null	Key	Default	Extra
-丄丄丄	char(1)	YES		NULL	
-DESC `龞龞龞`;
-Field	Type	Null	Key	Default	Extra
-丅丅丅	char(1)	YES		NULL	
-DESC `龡龡龡`;
-Field	Type	Null	Key	Default	Extra
-丌丌丌	char(1)	YES		NULL	
-DESC `龢龢龢`;
-Field	Type	Null	Key	Default	Extra
-丒丒丒	char(1)	YES		NULL	
-SHOW CREATE TABLE `アアア`;
-Table	Create Table
-アアア	CREATE TABLE `アアア` (
-  `カカカ` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
-SHOW CREATE TABLE `イイイ`;
-Table	Create Table
-イイイ	CREATE TABLE `イイイ` (
-  `キキキ` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
-SHOW CREATE TABLE `ウウウ`;
-Table	Create Table
-ウウウ	CREATE TABLE `ウウウ` (
-  `ククク` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
-SHOW CREATE TABLE `エエエ`;
-Table	Create Table
-エエエ	CREATE TEMPORARY TABLE `エエエ` (
-  `ケケケ` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
-SHOW CREATE TABLE `オオオ`;
-Table	Create Table
-オオオ	CREATE TEMPORARY TABLE `オオオ` (
-  `コココ` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
-SHOW CREATE TABLE `あああ`;
-Table	Create Table
-あああ	CREATE TABLE `あああ` (
-  `かかか` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
-SHOW CREATE TABLE `いいい`;
-Table	Create Table
-いいい	CREATE TABLE `いいい` (
-  `ききき` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
-SHOW CREATE TABLE `ううう`;
-Table	Create Table
-ううう	CREATE TABLE `ううう` (
-  `くくく` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
-SHOW CREATE TABLE `えええ`;
-Table	Create Table
-えええ	CREATE TEMPORARY TABLE `えええ` (
-  `けけけ` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
-SHOW CREATE TABLE `おおお`;
-Table	Create Table
-おおお	CREATE TEMPORARY TABLE `おおお` (
-  `こここ` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
-SHOW CREATE TABLE `龖龖龖`;
-Table	Create Table
-龖龖龖	CREATE TABLE `龖龖龖` (
-  `丂丂丂` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
-SHOW CREATE TABLE `龗龗龗`;
-Table	Create Table
-龗龗龗	CREATE TABLE `龗龗龗` (
-  `丄丄丄` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
-SHOW CREATE TABLE `龞龞龞`;
-Table	Create Table
-龞龞龞	CREATE TABLE `龞龞龞` (
-  `丅丅丅` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
-SHOW CREATE TABLE `龡龡龡`;
-Table	Create Table
-龡龡龡	CREATE TEMPORARY TABLE `龡龡龡` (
-  `丌丌丌` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
-SHOW CREATE TABLE `龢龢龢`;
-Table	Create Table
-龢龢龢	CREATE TEMPORARY TABLE `龢龢龢` (
-  `丒丒丒` char(1) default NULL
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
+  `丒丒丒` char(1) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 DROP TABLE `アアア`;
 DROP TABLE `イイイ`;
 DROP TABLE `ウウウ`;
diff -Nrup a/mysql-test/suite/jp/r/jp_enum_sjis.result b/mysql-test/suite/jp/r/jp_enum_sjis.result
--- a/mysql-test/suite/jp/r/jp_enum_sjis.result	2005-01-07 13:27:30 +01:00
+++ b/mysql-test/suite/jp/r/jp_enum_sjis.result	2008-05-15 18:01:07 +02:00
+drop table if exists t1;
 SET NAMES sjis;
 SET character_set_database = sjis;
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=sjis
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 Field	Type	Null	Key	Default	Extra
@@ -195,15 +154,6 @@ Field	Type	Null	Key	Default	Extra
 Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=sjis
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
+c1
+DROP TABLE t1;
 Field	Type	Null	Key	Default	Extra
 Field	Type	Null	Key	Default	Extra
 Field	Type	Null	Key	Default	Extra
 Field	Type	Null	Key	Default	Extra
 Field	Type	Null	Key	Default	Extra
 Field	Type	Null	Key	Default	Extra
 Field	Type	Null	Key	Default	Extra
 Field	Type	Null	Key	Default	Extra
 Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
diff -Nrup a/mysql-test/suite/jp/r/jp_enum_ucs2.result b/mysql-test/suite/jp/r/jp_enum_ucs2.result
--- a/mysql-test/suite/jp/r/jp_enum_ucs2.result	2005-01-07 13:27:30 +01:00
+++ b/mysql-test/suite/jp/r/jp_enum_ucs2.result	2008-05-15 18:01:07 +02:00
 SET NAMES ujis;
 SET character_set_database = ucs2;
 SET collation_connection = ucs2_general_ci;
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 Field	Type	Null	Key	Default	Extra
@@ -196,14 +154,113 @@ Field	Type	Null	Key	Default	Extra
 Field	Type	Null	Key	Default	Extra
+Table	Create Table
+) ENGINE=InnoDB DEFAULT CHARSET=ucs2
+Table	Create Table
+) ENGINE=InnoDB DEFAULT CHARSET=ucs2
+Table	Create Table
+) ENGINE=InnoDB DEFAULT CHARSET=ucs2
+Table	Create Table
+) ENGINE=MyISAM DEFAULT CHARSET=ucs2
+Table	Create Table
+) ENGINE=MyISAM DEFAULT CHARSET=ucs2
+Table	Create Table
+) ENGINE=MyISAM DEFAULT CHARSET=ucs2
+Table	Create Table
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
+Table	Create Table
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
+Table	Create Table
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 Field	Type	Null	Key	Default	Extra
+Field	Type	Null	Key	Default	Extra
+Field	Type	Null	Key	Default	Extra
+Field	Type	Null	Key	Default	Extra
 Field	Type	Null	Key	Default	Extra
+Field	Type	Null	Key	Default	Extra
+Field	Type	Null	Key	Default	Extra
+Field	Type	Null	Key	Default	Extra
 Field	Type	Null	Key	Default	Extra
diff -Nrup a/mysql-test/suite/jp/r/jp_enum_ujis.result b/mysql-test/suite/jp/r/jp_enum_ujis.result
--- a/mysql-test/suite/jp/r/jp_enum_ujis.result	2005-01-07 13:27:30 +01:00
+++ b/mysql-test/suite/jp/r/jp_enum_ujis.result	2008-05-15 18:01:07 +02:00
 SET NAMES ujis;
 SET character_set_database = ujis;
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=ujis
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 Field	Type	Null	Key	Default	Extra
@@ -195,15 +153,6 @@ Field	Type	Null	Key	Default	Extra
 Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 Table	Create Table
 ) ENGINE=InnoDB DEFAULT CHARSET=ujis
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 Table	Create Table
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 Table	Create Table
-) ENGINE=HEAP DEFAULT CHARSET=ujis
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
-Table	Create Table
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis
 Field	Type	Null	Key	Default	Extra
 Field	Type	Null	Key	Default	Extra
 Field	Type	Null	Key	Default	Extra
 Field	Type	Null	Key	Default	Extra
 Field	Type	Null	Key	Default	Extra
 Field	Type	Null	Key	Default	Extra
 Field	Type	Null	Key	Default	Extra
 Field	Type	Null	Key	Default	Extra
 Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
-Field	Type	Null	Key	Default	Extra
diff -Nrup a/mysql-test/suite/jp/r/jp_enum_utf8.result b/mysql-test/suite/jp/r/jp_enum_utf8.result
--- a/mysql-test/suite/jp/r/jp_enum_utf8.result	2005-01-07 13:27:30 +01:00
+++ b/mysql-test/suite/jp/r/jp_enum_utf8.result	2008-05-15 18:01:07 +02:00
@@ -7,9 +7,6 @@ drop table if exists `T6`;
 drop table if exists `T7`;
 drop table if exists `T8`;
 drop table if exists `T9`;
-drop table if exists `T10`;
-drop table if exists `T11`;
-drop table if exists `T12`;
 SET NAMES utf8;
 SET character_set_database = utf8;
 CREATE TABLE `T1` (`C1` ENUM('ア','イ','ウ'), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = innodb;
 CREATE TABLE `T4` (`C1` ENUM('ア','イ','ウ'), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `T5` (`C1` ENUM('あ','い','う'), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `T6` (`C1` ENUM('龔','龖','龗'), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `T7` (`C1` ENUM('ア','イ','ウ'), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `T8` (`C1` ENUM('あ','い','う'), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `T9` (`C1` ENUM('龔','龖','龗'), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `T10` (`C1` ENUM('ア','イ','ウ'), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `T11` (`C1` ENUM('あ','い','う'), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `T12` (`C1` ENUM('龔','龖','龗'), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `T7` (`C1` ENUM('ア','イ','ウ'), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `T8` (`C1` ENUM('あ','い','う'), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `T9` (`C1` ENUM('龔','龖','龗'), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = MEMORY;
 INSERT INTO `T1` VALUES ('ア'),('イ'),('ウ');
 INSERT INTO `T2` VALUES ('あ'),('い'),('う');
 INSERT INTO `T3` VALUES ('龔'),('龖'),('龗');
 INSERT INTO `T7` VALUES ('ア'),('イ'),('ウ');
 INSERT INTO `T8` VALUES ('あ'),('い'),('う');
 INSERT INTO `T9` VALUES ('龔'),('龖'),('龗');
-INSERT INTO `T10` VALUES ('ア'),('イ'),('ウ');
-INSERT INTO `T11` VALUES ('あ'),('い'),('う');
-INSERT INTO `T12` VALUES ('龔'),('龖'),('龗');
 SELECT * FROM `T1`;
 C1
 ア
@@ -81,93 +72,60 @@ SELECT * FROM `T9`;
 龔
 龖
 龗
-SELECT * FROM `T10`;
-C1
-ア
-イ
-ウ
-SELECT * FROM `T11`;
-C1
-あ
-い
-う
-SELECT * FROM `T12`;
-C1
-龔
-龖
-龗
 SHOW CREATE TABLE `T1`;
 Table	Create Table
 T1	CREATE TABLE `T1` (
-  `C1` enum('ア','イ','ウ') default NULL,
+  `C1` enum('ア','イ','ウ') DEFAULT NULL,
   KEY `C1` (`C1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `T2`;
 Table	Create Table
 T2	CREATE TABLE `T2` (
-  `C1` enum('あ','い','う') default NULL,
+  `C1` enum('あ','い','う') DEFAULT NULL,
   KEY `C1` (`C1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `T3`;
 Table	Create Table
 T3	CREATE TABLE `T3` (
-  `C1` enum('龔','龖','龗') default NULL,
+  `C1` enum('龔','龖','龗') DEFAULT NULL,
   KEY `C1` (`C1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `T4`;
 Table	Create Table
 T4	CREATE TABLE `T4` (
-  `C1` enum('ア','イ','ウ') default NULL,
+  `C1` enum('ア','イ','ウ') DEFAULT NULL,
   KEY `C1` (`C1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `T5`;
 Table	Create Table
 T5	CREATE TABLE `T5` (
-  `C1` enum('あ','い','う') default NULL,
+  `C1` enum('あ','い','う') DEFAULT NULL,
   KEY `C1` (`C1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `T6`;
 Table	Create Table
 T6	CREATE TABLE `T6` (
-  `C1` enum('龔','龖','龗') default NULL,
+  `C1` enum('龔','龖','龗') DEFAULT NULL,
   KEY `C1` (`C1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `T7`;
 Table	Create Table
 T7	CREATE TABLE `T7` (
-  `C1` enum('ア','イ','ウ') default NULL,
+  `C1` enum('ア','イ','ウ') DEFAULT NULL,
   KEY `C1` (`C1`)
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `T8`;
 Table	Create Table
 T8	CREATE TABLE `T8` (
-  `C1` enum('あ','い','う') default NULL,
+  `C1` enum('あ','い','う') DEFAULT NULL,
   KEY `C1` (`C1`)
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `T9`;
 Table	Create Table
 T9	CREATE TABLE `T9` (
-  `C1` enum('龔','龖','龗') default NULL,
-  KEY `C1` (`C1`)
-) ENGINE=HEAP DEFAULT CHARSET=utf8
-SHOW CREATE TABLE `T10`;
-Table	Create Table
-T10	CREATE TABLE `T10` (
-  `C1` enum('ア','イ','ウ') default NULL,
-  KEY `C1` (`C1`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
-SHOW CREATE TABLE `T11`;
-Table	Create Table
-T11	CREATE TABLE `T11` (
-  `C1` enum('あ','い','う') default NULL,
-  KEY `C1` (`C1`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
-SHOW CREATE TABLE `T12`;
-Table	Create Table
-T12	CREATE TABLE `T12` (
-  `C1` enum('龔','龖','龗') default NULL,
+  `C1` enum('龔','龖','龗') DEFAULT NULL,
   KEY `C1` (`C1`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 DESC `T1`;
 Field	Type	Null	Key	Default	Extra
 C1	enum('ア','イ','ウ')	YES	MUL	NULL	
@@ -195,15 +153,6 @@ Field	Type	Null	Key	Default	Extra
 DESC `T9`;
 Field	Type	Null	Key	Default	Extra
 C1	enum('龔','龖','龗')	YES	MUL	NULL	
-DESC `T10`;
-Field	Type	Null	Key	Default	Extra
-C1	enum('ア','イ','ウ')	YES	MUL	NULL	
-DESC `T11`;
-Field	Type	Null	Key	Default	Extra
-C1	enum('あ','い','う')	YES	MUL	NULL	
-DESC `T12`;
-Field	Type	Null	Key	Default	Extra
-C1	enum('龔','龖','龗')	YES	MUL	NULL	
 ALTER TABLE `T1` ADD `C2` CHAR(1) NOT NULL FIRST;
 ALTER TABLE `T2` ADD `C2` CHAR(1) NOT NULL FIRST;
 ALTER TABLE `T3` ADD `C2` CHAR(1) NOT NULL FIRST;
@@ -213,140 +162,104 @@ ALTER TABLE `T6` ADD `C2` CHAR(1
 ALTER TABLE `T7` ADD `C2` CHAR(1) NOT NULL FIRST;
 ALTER TABLE `T8` ADD `C2` CHAR(1) NOT NULL FIRST;
 ALTER TABLE `T9` ADD `C2` CHAR(1) NOT NULL FIRST;
-ALTER TABLE `T10` ADD `C2` CHAR(1) NOT NULL FIRST;
-ALTER TABLE `T11` ADD `C2` CHAR(1) NOT NULL FIRST;
-ALTER TABLE `T12` ADD `C2` CHAR(1) NOT NULL FIRST;
 SHOW CREATE TABLE `T1`;
 Table	Create Table
 T1	CREATE TABLE `T1` (
-  `C2` char(1) NOT NULL default '',
-  `C1` enum('ア','イ','ウ') default NULL,
+  `C2` char(1) NOT NULL,
+  `C1` enum('ア','イ','ウ') DEFAULT NULL,
   KEY `C1` (`C1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `T2`;
 Table	Create Table
 T2	CREATE TABLE `T2` (
-  `C2` char(1) NOT NULL default '',
-  `C1` enum('あ','い','う') default NULL,
+  `C2` char(1) NOT NULL,
+  `C1` enum('あ','い','う') DEFAULT NULL,
   KEY `C1` (`C1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `T3`;
 Table	Create Table
 T3	CREATE TABLE `T3` (
-  `C2` char(1) NOT NULL default '',
-  `C1` enum('龔','龖','龗') default NULL,
+  `C2` char(1) NOT NULL,
+  `C1` enum('龔','龖','龗') DEFAULT NULL,
   KEY `C1` (`C1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `T4`;
 Table	Create Table
 T4	CREATE TABLE `T4` (
-  `C2` char(1) NOT NULL default '',
-  `C1` enum('ア','イ','ウ') default NULL,
+  `C2` char(1) NOT NULL,
+  `C1` enum('ア','イ','ウ') DEFAULT NULL,
   KEY `C1` (`C1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `T5`;
 Table	Create Table
 T5	CREATE TABLE `T5` (
-  `C2` char(1) NOT NULL default '',
-  `C1` enum('あ','い','う') default NULL,
+  `C2` char(1) NOT NULL,
+  `C1` enum('あ','い','う') DEFAULT NULL,
   KEY `C1` (`C1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `T6`;
 Table	Create Table
 T6	CREATE TABLE `T6` (
-  `C2` char(1) NOT NULL default '',
-  `C1` enum('龔','龖','龗') default NULL,
+  `C2` char(1) NOT NULL,
+  `C1` enum('龔','龖','龗') DEFAULT NULL,
   KEY `C1` (`C1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `T7`;
 Table	Create Table
 T7	CREATE TABLE `T7` (
-  `C2` char(1) NOT NULL default '',
-  `C1` enum('ア','イ','ウ') default NULL,
+  `C2` char(1) NOT NULL,
+  `C1` enum('ア','イ','ウ') DEFAULT NULL,
   KEY `C1` (`C1`)
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `T8`;
 Table	Create Table
 T8	CREATE TABLE `T8` (
-  `C2` char(1) NOT NULL default '',
-  `C1` enum('あ','い','う') default NULL,
+  `C2` char(1) NOT NULL,
+  `C1` enum('あ','い','う') DEFAULT NULL,
   KEY `C1` (`C1`)
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW CREATE TABLE `T9`;
 Table	Create Table
 T9	CREATE TABLE `T9` (
-  `C2` char(1) NOT NULL default '',
-  `C1` enum('龔','龖','龗') default NULL,
-  KEY `C1` (`C1`)
-) ENGINE=HEAP DEFAULT CHARSET=utf8
-SHOW CREATE TABLE `T10`;
-Table	Create Table
-T10	CREATE TABLE `T10` (
-  `C2` char(1) NOT NULL default '',
-  `C1` enum('ア','イ','ウ') default NULL,
-  KEY `C1` (`C1`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
-SHOW CREATE TABLE `T11`;
-Table	Create Table
-T11	CREATE TABLE `T11` (
-  `C2` char(1) NOT NULL default '',
-  `C1` enum('あ','い','う') default NULL,
-  KEY `C1` (`C1`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
-SHOW CREATE TABLE `T12`;
-Table	Create Table
-T12	CREATE TABLE `T12` (
-  `C2` char(1) NOT NULL default '',
-  `C1` enum('龔','龖','龗') default NULL,
+  `C2` char(1) NOT NULL,
+  `C1` enum('龔','龖','龗') DEFAULT NULL,
   KEY `C1` (`C1`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
 DESC `T1`;
 Field	Type	Null	Key	Default	Extra
-C2	char(1)				
+C2	char(1)	NO		NULL	
 C1	enum('ア','イ','ウ')	YES	MUL	NULL	
 DESC `T2`;
 Field	Type	Null	Key	Default	Extra
-C2	char(1)				
+C2	char(1)	NO		NULL	
 C1	enum('あ','い','う')	YES	MUL	NULL	
 DESC `T3`;
 Field	Type	Null	Key	Default	Extra
-C2	char(1)				
+C2	char(1)	NO		NULL	
 C1	enum('龔','龖','龗')	YES	MUL	NULL	
 DESC `T4`;
 Field	Type	Null	Key	Default	Extra
-C2	char(1)				
+C2	char(1)	NO		NULL	
 C1	enum('ア','イ','ウ')	YES	MUL	NULL	
 DESC `T5`;
 Field	Type	Null	Key	Default	Extra
-C2	char(1)				
+C2	char(1)	NO		NULL	
 C1	enum('あ','い','う')	YES	MUL	NULL	
 DESC `T6`;
 Field	Type	Null	Key	Default	Extra
-C2	char(1)				
+C2	char(1)	NO		NULL	
 C1	enum('龔','龖','龗')	YES	MUL	NULL	
 DESC `T7`;
 Field	Type	Null	Key	Default	Extra
-C2	char(1)				
+C2	char(1)	NO		NULL	
 C1	enum('ア','イ','ウ')	YES	MUL	NULL	
 DESC `T8`;
 Field	Type	Null	Key	Default	Extra
-C2	char(1)				
+C2	char(1)	NO		NULL	
 C1	enum('あ','い','う')	YES	MUL	NULL	
 DESC `T9`;
 Field	Type	Null	Key	Default	Extra
-C2	char(1)				
-C1	enum('龔','龖','龗')	YES	MUL	NULL	
-DESC `T10`;
-Field	Type	Null	Key	Default	Extra
-C2	char(1)				
-C1	enum('ア','イ','ウ')	YES	MUL	NULL	
-DESC `T11`;
-Field	Type	Null	Key	Default	Extra
-C2	char(1)				
-C1	enum('あ','い','う')	YES	MUL	NULL	
-DESC `T12`;
-Field	Type	Null	Key	Default	Extra
-C2	char(1)				
+C2	char(1)	NO		NULL	
 C1	enum('龔','龖','龗')	YES	MUL	NULL	
 DROP TABLE `T1`;
 DROP TABLE `T2`;
@@ -357,6 +270,3 @@ DROP TABLE `T6`;
 DROP TABLE `T7`;
 DROP TABLE `T8`;
 DROP TABLE `T9`;
-DROP TABLE `T10`;
-DROP TABLE `T11`;
-DROP TABLE `T12`;
diff -Nrup a/mysql-test/suite/jp/r/jp_insert_sjis.result b/mysql-test/suite/jp/r/jp_insert_sjis.result
--- a/mysql-test/suite/jp/r/jp_insert_sjis.result	2005-01-07 13:27:30 +01:00
+++ b/mysql-test/suite/jp/r/jp_insert_sjis.result	2008-05-15 18:01:07 +02:00
 SET NAMES sjis;
 SET character_set_database = sjis;
diff -Nrup a/mysql-test/suite/jp/r/jp_insert_ucs2.result b/mysql-test/suite/jp/r/jp_insert_ucs2.result
--- a/mysql-test/suite/jp/r/jp_insert_ucs2.result	2005-01-07 13:27:30 +01:00
+++ b/mysql-test/suite/jp/r/jp_insert_ucs2.result	2008-05-15 18:01:07 +02:00
 SET NAMES ujis;
 SET character_set_database = ucs2;
 SET collation_connection = ucs2_general_ci;
diff -Nrup a/mysql-test/suite/jp/r/jp_insert_ujis.result b/mysql-test/suite/jp/r/jp_insert_ujis.result
--- a/mysql-test/suite/jp/r/jp_insert_ujis.result	2005-01-07 13:27:30 +01:00
+++ b/mysql-test/suite/jp/r/jp_insert_ujis.result	2008-05-15 18:01:07 +02:00
 SET NAMES ujis;
 SET character_set_database = ujis;
 SET collation_connection = ujis_japanese_ci;
diff -Nrup a/mysql-test/suite/jp/r/jp_insert_utf8.result b/mysql-test/suite/jp/r/jp_insert_utf8.result
--- a/mysql-test/suite/jp/r/jp_insert_utf8.result	2005-01-07 13:27:30 +01:00
+++ b/mysql-test/suite/jp/r/jp_insert_utf8.result	2008-05-15 18:01:07 +02:00
@@ -7,9 +7,6 @@ drop table if exists `T6`;
 drop table if exists `T7`;
 drop table if exists `T8`;
 drop table if exists `T9`;
-drop table if exists `T10`;
-drop table if exists `T11`;
-drop table if exists `T12`;
 SET NAMES utf8;
 SET character_set_database = utf8;
 CREATE TABLE `T1` (`C1` char(5)) DEFAULT CHARSET = utf8 engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `T3` (`C1` char(5))
 CREATE TABLE `T4` (`C1` char(5)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `T5` (`C1` char(5)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `T6` (`C1` char(5)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `T7` (`C1` char(5)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `T8` (`C1` char(5)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `T9` (`C1` char(5)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `T10` (`C1` char(5)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `T11` (`C1` char(5)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `T12` (`C1` char(5)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `T7` (`C1` char(5)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `T8` (`C1` char(5)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `T9` (`C1` char(5)) DEFAULT CHARSET = utf8 engine = MEMORY;
 INSERT INTO `T1` VALUES ('アイウエオ');
 INSERT INTO `T2` VALUES ('あいうえお');
 INSERT INTO `T3` VALUES ('龔龖龗龞龡');
 INSERT INTO `T7` VALUES ('アイウエオ');
 INSERT INTO `T8` VALUES ('あいうえお');
 INSERT INTO `T9` VALUES ('龔龖龗龞龡');
-INSERT INTO `T10` VALUES ('アイウエオ');
-INSERT INTO `T11` VALUES ('あいうえお');
-INSERT INTO `T12` VALUES ('龔龖龗龞龡');
 SELECT INSERT(`C1`,1,1,'カ') FROM `T1`;
 INSERT(`C1`,1,1,'カ')
 カイウエオ
@@ -711,186 +702,6 @@ INSERT(`C1`,4,2,'丂丂' )
 SELECT INSERT(`C1`,5,1,'丂') FROM `T9`;
 INSERT(`C1`,5,1,'丂')
 龔龖龗龞丂
-SELECT INSERT(`C1`,1,1,'カ') FROM `T10`;
-INSERT(`C1`,1,1,'カ')
-カイウエオ
-SELECT INSERT(`C1`,1,2,'カカ') FROM `T10`;
-INSERT(`C1`,1,2,'カカ')
-カカウエオ
-SELECT INSERT(`C1`,1,3,'カカカ') FROM `T10`;
-INSERT(`C1`,1,3,'カカカ')
-カカカエオ
-SELECT INSERT(`C1`,1,4,'カカカカ') FROM `T10`;
-INSERT(`C1`,1,4,'カカカカ')
-カカカカオ
-SELECT INSERT(`C1`,1,5,'カカカカカ') FROM `T10`;
-INSERT(`C1`,1,5,'カカカカカ')
-カカカカカ
-SELECT INSERT(`C1`,2,1,'カ') FROM `T10`;
-INSERT(`C1`,2,1,'カ')
-アカウエオ
-SELECT INSERT(`C1`,2,2,'カカ') FROM `T10`;
-INSERT(`C1`,2,2,'カカ')
-アカカエオ
-SELECT INSERT(`C1`,2,3,'カカカ') FROM `T10`;
-INSERT(`C1`,2,3,'カカカ')
-アカカカオ
-SELECT INSERT(`C1`,2,4,'カカカカ') FROM `T10`;
-INSERT(`C1`,2,4,'カカカカ')
-アカカカカ
-SELECT INSERT(`C1`,3,1,'カ') FROM `T10`;
-INSERT(`C1`,3,1,'カ')
-アイカエオ
-SELECT INSERT(`C1`,3,2,'カカ') FROM `T10`;
-INSERT(`C1`,3,2,'カカ')
-アイカカオ
-SELECT INSERT(`C1`,3,3,'カカカ') FROM `T10`;
-INSERT(`C1`,3,3,'カカカ')
-アイカカカ
-SELECT INSERT(`C1`,4,1,'カ') FROM `T10`;
-INSERT(`C1`,4,1,'カ')
-アイウカオ
-SELECT INSERT(`C1`,4,2,'カカ') FROM `T10`;
-INSERT(`C1`,4,2,'カカ')
-アイウカカ
-SELECT INSERT(`C1`,5,1,'カ') FROM `T10`;
-INSERT(`C1`,5,1,'カ')
-アイウエカ
-SELECT INSERT(`C1`,1,1,'か') FROM `T11`;
-INSERT(`C1`,1,1,'か')
-かいうえお
-SELECT INSERT(`C1`,1,2,'かか') FROM `T11`;
-INSERT(`C1`,1,2,'かか')
-かかうえお
-SELECT INSERT(`C1`,1,3,'かかか') FROM `T11`;
-INSERT(`C1`,1,3,'かかか')
-かかかえお
-SELECT INSERT(`C1`,1,4,'かかかか') FROM `T11`;
-INSERT(`C1`,1,4,'かかかか')
-かかかかお
-SELECT INSERT(`C1`,1,5,'かかかかか') FROM `T11`;
-INSERT(`C1`,1,5,'かかかかか')
-かかかかか
-SELECT INSERT(`C1`,2,1,'か') FROM `T11`;
-INSERT(`C1`,2,1,'か')
-あかうえお
-SELECT INSERT(`C1`,2,2,'かか') FROM `T11`;
-INSERT(`C1`,2,2,'かか')
-あかかえお
-SELECT INSERT(`C1`,2,3,'かかか') FROM `T11`;
-INSERT(`C1`,2,3,'かかか')
-あかかかお
-SELECT INSERT(`C1`,2,4,'かかかか') FROM `T11`;
-INSERT(`C1`,2,4,'かかかか')
-あかかかか
-SELECT INSERT(`C1`,3,1,'か') FROM `T11`;
-INSERT(`C1`,3,1,'か')
-あいかえお
-SELECT INSERT(`C1`,3,2,'かか') FROM `T11`;
-INSERT(`C1`,3,2,'かか')
-あいかかお
-SELECT INSERT(`C1`,3,3,'かかか') FROM `T11`;
-INSERT(`C1`,3,3,'かかか')
-あいかかか
-SELECT INSERT(`C1`,4,1,'か') FROM `T11`;
-INSERT(`C1`,4,1,'か')
-あいうかお
-SELECT INSERT(`C1`,4,2,'かか') FROM `T11`;
-INSERT(`C1`,4,2,'かか')
-あいうかか
-SELECT INSERT(`C1`,5,1,'か') FROM `T11`;
-INSERT(`C1`,5,1,'か')
-あいうえか
-SELECT INSERT(`C1`,1,1,' ') FROM `T11`;
-INSERT(`C1`,1,1,' ')
- いうえお
-SELECT INSERT(`C1`,1,2,'  ') FROM `T11`;
-INSERT(`C1`,1,2,'  ')
-  うえお
-SELECT INSERT(`C1`,1,3,'   ') FROM `T11`;
-INSERT(`C1`,1,3,'   ')
-   えお
-SELECT INSERT(`C1`,1,4,'    ') FROM `T11`;
-INSERT(`C1`,1,4,'    ')
-    お
-SELECT INSERT(`C1`,1,5,'     ') FROM `T11`;
-INSERT(`C1`,1,5,'     ')
-     
-SELECT INSERT(`C1`,2,1,' ') FROM `T11`;
-INSERT(`C1`,2,1,' ')
-あ うえお
-SELECT INSERT(`C1`,2,2,'  ') FROM `T11`;
-INSERT(`C1`,2,2,'  ')
-あ  えお
-SELECT INSERT(`C1`,2,3,'   ') FROM `T11`;
-INSERT(`C1`,2,3,'   ')
-あ   お
-SELECT INSERT(`C1`,2,4,'    ') FROM `T11`;
-INSERT(`C1`,2,4,'    ')
-あ    
-SELECT INSERT(`C1`,3,1,' ') FROM `T11`;
-INSERT(`C1`,3,1,' ')
-あい えお
-SELECT INSERT(`C1`,3,2,'  ') FROM `T11`;
-INSERT(`C1`,3,2,'  ')
-あい  お
-SELECT INSERT(`C1`,3,3,'   ') FROM `T11`;
-INSERT(`C1`,3,3,'   ')
-あい   
-SELECT INSERT(`C1`,4,1,' ') FROM `T11`;
-INSERT(`C1`,4,1,' ')
-あいう お
-SELECT INSERT(`C1`,4,2,'  ') FROM `T11`;
-INSERT(`C1`,4,2,'  ')
-あいう  
-SELECT INSERT(`C1`,5,1,' ') FROM `T11`;
-INSERT(`C1`,5,1,' ')
-あいうえ 
-SELECT INSERT(`C1`,1,1,'丂') FROM `T12`;
-INSERT(`C1`,1,1,'丂')
-丂龖龗龞龡
-SELECT INSERT(`C1`,1,2,'丂丂') FROM `T12`;
-INSERT(`C1`,1,2,'丂丂')
-丂丂龗龞龡
-SELECT INSERT(`C1`,1,3,'丂丂丂') FROM `T12`;
-INSERT(`C1`,1,3,'丂丂丂')
-丂丂丂龞龡
-SELECT INSERT(`C1`,1,4,'丂丂丂丂') FROM `T12`;
-INSERT(`C1`,1,4,'丂丂丂丂')
-丂丂丂丂龡
-SELECT INSERT(`C1`,1,5,'丂丂丂丂丂') FROM `T12`;
-INSERT(`C1`,1,5,'丂丂丂丂丂')
-丂丂丂丂丂
-SELECT INSERT(`C1`,2,1,'丂') FROM `T12`;
-INSERT(`C1`,2,1,'丂')
-龔丂龗龞龡
-SELECT INSERT(`C1`,2,2,'丂丂') FROM `T12`;
-INSERT(`C1`,2,2,'丂丂')
-龔丂丂龞龡
-SELECT INSERT(`C1`,2,3,'丂丂丂') FROM `T12`;
-INSERT(`C1`,2,3,'丂丂丂')
-龔丂丂丂龡
-SELECT INSERT(`C1`,2,4,'丂丂丂丂') FROM `T12`;
-INSERT(`C1`,2,4,'丂丂丂丂')
-龔丂丂丂丂
-SELECT INSERT(`C1`,3,1,'丂') FROM `T12`;
-INSERT(`C1`,3,1,'丂')
-龔龖丂龞龡
-SELECT INSERT(`C1`,3,2,'丂丂') FROM `T12`;
-INSERT(`C1`,3,2,'丂丂')
-龔龖丂丂龡
-SELECT INSERT(`C1`,3,3,'丂丂丂') FROM `T12`;
-INSERT(`C1`,3,3,'丂丂丂')
-龔龖丂丂丂
-SELECT INSERT(`C1`,4,1,'丂') FROM `T12`;
-INSERT(`C1`,4,1,'丂')
-龔龖龗丂龡
-SELECT INSERT(`C1`,4,2,'丂丂') FROM `T12`;
-INSERT(`C1`,4,2,'丂丂')
-龔龖龗丂丂
-SELECT INSERT(`C1`,5,1,'丂') FROM `T12`;
-INSERT(`C1`,5,1,'丂')
-龔龖龗龞丂
 DROP TABLE `T1`;
 DROP TABLE `T2`;
 DROP TABLE `T3`;
@@ -900,6 +711,3 @@ DROP TABLE `T6`;
 DROP TABLE `T7`;
 DROP TABLE `T8`;
 DROP TABLE `T9`;
-DROP TABLE `T10`;
-DROP TABLE `T11`;
-DROP TABLE `T12`;
diff -Nrup a/mysql-test/suite/jp/r/jp_instr_sjis.result b/mysql-test/suite/jp/r/jp_instr_sjis.result
--- a/mysql-test/suite/jp/r/jp_instr_sjis.result	2005-01-07 13:27:30 +01:00
+++ b/mysql-test/suite/jp/r/jp_instr_sjis.result	2008-05-15 18:01:07 +02:00
 SET NAMES sjis;
 SET character_set_database = sjis;
 1
 0
-1
-2
-3
-4
-5
-0
-1
-2
-3
-4
-5
-0
-1
-2
-3
-4
-5
-0
diff -Nrup a/mysql-test/suite/jp/r/jp_instr_ucs2.result b/mysql-test/suite/jp/r/jp_instr_ucs2.result
--- a/mysql-test/suite/jp/r/jp_instr_ucs2.result	2005-01-07 13:27:31 +01:00
+++ b/mysql-test/suite/jp/r/jp_instr_ucs2.result	2008-05-15 18:01:07 +02:00
 SET NAMES ujis;
 SET character_set_database = ucs2;
 SET collation_connection = ucs2_general_ci;
 1
 0
-1
-2
-3
-4
-5
-0
-1
-2
-3
-4
-5
-0
-1
-2
-3
-4
-5
-0
diff -Nrup a/mysql-test/suite/jp/r/jp_instr_ujis.result b/mysql-test/suite/jp/r/jp_instr_ujis.result
--- a/mysql-test/suite/jp/r/jp_instr_ujis.result	2005-01-07 13:27:31 +01:00
+++ b/mysql-test/suite/jp/r/jp_instr_ujis.result	2008-05-15 18:01:07 +02:00
 SET NAMES ujis;
 SET character_set_database = ujis;
 1
 0
-1
-2
-3
-4
-5
-0
-1
-2
-3
-4
-5
-0
-1
-2
-3
-4
-5
-0
diff -Nrup a/mysql-test/suite/jp/r/jp_instr_utf8.result b/mysql-test/suite/jp/r/jp_instr_utf8.result
--- a/mysql-test/suite/jp/r/jp_instr_utf8.result	2005-01-07 13:27:31 +01:00
+++ b/mysql-test/suite/jp/r/jp_instr_utf8.result	2008-05-15 18:01:07 +02:00
@@ -7,7 +7,6 @@ drop table if exists `T6`;
 drop table if exists `T7`;
 drop table if exists `T8`;
 drop table if exists `T9`;
-drop table if exists `T10`;
 SET NAMES utf8;
 SET character_set_database = utf8;
 CREATE TABLE `T1` (`C1` char(5), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = innodb;
@@ -16,12 +15,9 @@ CREATE TABLE `T3` (`C1` char(5),
 CREATE TABLE `T4` (`C1` char(5), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `T5` (`C1` char(5), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `T6` (`C1` char(5), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `T7` (`C1` char(5), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `T8` (`C1` char(5), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `T9` (`C1` char(5), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `T10` (`C1` char(5), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `T11` (`C1` char(5), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `T12` (`C1` char(5), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `T7` (`C1` char(5), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `T8` (`C1` char(5), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `T9` (`C1` char(5), INDEX(`C1`)) DEFAULT CHARSET = utf8 engine = MEMORY;
 INSERT INTO `T1` VALUES ('アイウエオ');
 INSERT INTO `T2` VALUES ('あいうえお');
 INSERT INTO `T3` VALUES ('龔龖龗龞龡');
 INSERT INTO `T7` VALUES ('アイウエオ');
 INSERT INTO `T8` VALUES ('あいうえお');
 INSERT INTO `T9` VALUES ('龔龖龗龞龡');
-INSERT INTO `T10` VALUES ('アイウエオ');
-INSERT INTO `T11` VALUES ('あいうえお');
-INSERT INTO `T12` VALUES ('龔龖龗龞龡');
 SELECT INSTR(`C1`,'ア') from `T1`;
 INSTR(`C1`,'ア')
 1
@@ -196,60 +189,6 @@ INSTR(`C1`,'龡')
 SELECT INSTR(`C1`,'丂') from `T9`;
 INSTR(`C1`,'丂')
 0
-SELECT INSTR(`C1`,'ア') from `T10`;
-INSTR(`C1`,'ア')
-1
-SELECT INSTR(`C1`,'イ') from `T10`;
-INSTR(`C1`,'イ')
-2
-SELECT INSTR(`C1`,'ウ') from `T10`;
-INSTR(`C1`,'ウ')
-3
-SELECT INSTR(`C1`,'エ') from `T10`;
-INSTR(`C1`,'エ')
-4
-SELECT INSTR(`C1`,'オ') from `T10`;
-INSTR(`C1`,'オ')
-5
-SELECT INSTR(`C1`,'ン') from `T10`;
-INSTR(`C1`,'ン')
-0
-SELECT INSTR(`C1`,'あ') from `T11`;
-INSTR(`C1`,'あ')
-1
-SELECT INSTR(`C1`,'い') from `T11`;
-INSTR(`C1`,'い')
-2
-SELECT INSTR(`C1`,'う') from `T11`;
-INSTR(`C1`,'う')
-3
-SELECT INSTR(`C1`,'え') from `T11`;
-INSTR(`C1`,'え')
-4
-SELECT INSTR(`C1`,'お') from `T11`;
-INSTR(`C1`,'お')
-5
-SELECT INSTR(`C1`,'ん') from `T11`;
-INSTR(`C1`,'ん')
-0
-SELECT INSTR(`C1`,'龔') from `T12`;
-INSTR(`C1`,'龔')
-1
-SELECT INSTR(`C1`,'龖') from `T12`;
-INSTR(`C1`,'龖')
-2
-SELECT INSTR(`C1`,'龗') from `T12`;
-INSTR(`C1`,'龗')
-3
-SELECT INSTR(`C1`,'龞') from `T12`;
-INSTR(`C1`,'龞')
-4
-SELECT INSTR(`C1`,'龡') from `T12`;
-INSTR(`C1`,'龡')
-5
-SELECT INSTR(`C1`,'丂') from `T12`;
-INSTR(`C1`,'丂')
-0
 DROP TABLE `T1`;
 DROP TABLE `T2`;
 DROP TABLE `T3`;
@@ -259,6 +198,3 @@ DROP TABLE `T6`;
 DROP TABLE `T7`;
 DROP TABLE `T8`;
 DROP TABLE `T9`;
-DROP TABLE `T10`;
-DROP TABLE `T11`;
-DROP TABLE `T12`;
diff -Nrup a/mysql-test/suite/jp/r/jp_join_sjis.result b/mysql-test/suite/jp/r/jp_join_sjis.result
--- a/mysql-test/suite/jp/r/jp_join_sjis.result	2005-01-07 13:27:31 +01:00
+++ b/mysql-test/suite/jp/r/jp_join_sjis.result	2008-05-15 18:01:07 +02:00
@@ -1,15 +1,21 @@
 SET NAMES sjis;
 SET character_set_database = sjis;
Thread
bk commit into 5.1 tree (mleich:1.2635) BUG#28563mleich15 May