List:Commits« Previous MessageNext Message »
From:mleich Date:May 9 2008 11:11pm
Subject:bk commit into 5.1 tree (mleich:1.2607) 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-09 23:11:01+02:00, mleich@stripped +222 -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
        (warnings during load data and partially unexpected result sets)
    - were disabled if they show differences to the old expected result sets
    - simply got an updated file with expected results if they only show
      the warnings during load data

  mysql-test/suite/jp/include/trim_sjis.inc@stripped, 2008-05-09 23:10:58+02:00,
mleich@stripped +70 -0
    Auxiliary script belonging to jp_trim_sjis

  mysql-test/suite/jp/include/trim_sjis.inc@stripped, 2008-05-09 23:10:58+02:00,
mleich@stripped +0 -0

  mysql-test/suite/jp/r/jp_alter_sjis.result@stripped, 2008-05-09 23:10:03+02:00,
mleich@stripped +93 -246
    Updated results

  mysql-test/suite/jp/r/jp_alter_ucs2.result@stripped, 2008-05-09 23:10:03+02:00,
mleich@stripped +93 -246
    Updated results

  mysql-test/suite/jp/r/jp_alter_ujis.result@stripped, 2008-05-09 23:10:03+02:00,
mleich@stripped +93 -246
    Updated results

  mysql-test/suite/jp/r/jp_alter_utf8.result@stripped, 2008-05-09 23:10:03+02:00,
mleich@stripped +93 -246
    Updated results

  mysql-test/suite/jp/r/jp_charlength_sjis.result@stripped, 2008-05-09 23:10:03+02:00,
mleich@stripped +3 -39
    Updated results

  mysql-test/suite/jp/r/jp_charlength_ucs2.result@stripped, 2008-05-09 23:10:03+02:00,
mleich@stripped +3 -39
    Updated results

  mysql-test/suite/jp/r/jp_charlength_ujis.result@stripped, 2008-05-09 23:10:03+02:00,
mleich@stripped +3 -39
    Updated results

  mysql-test/suite/jp/r/jp_charlength_utf8.result@stripped, 2008-05-09 23:10:03+02:00,
mleich@stripped +3 -39
    Updated results

  mysql-test/suite/jp/r/jp_charset_sjis.result@stripped, 2008-05-09 23:10:03+02:00,
mleich@stripped +9 -60
    Updated results

  mysql-test/suite/jp/r/jp_charset_ucs2.result@stripped, 2008-05-09 23:10:03+02:00,
mleich@stripped +3 -79
    Updated results

  mysql-test/suite/jp/r/jp_charset_ujis.result@stripped, 2008-05-09 23:10:03+02:00,
mleich@stripped +9 -60
    Updated results

  mysql-test/suite/jp/r/jp_charset_utf8.result@stripped, 2008-05-09 23:10:03+02:00,
mleich@stripped +9 -60
    Updated results

  mysql-test/suite/jp/r/jp_convert_sjis.result@stripped, 2008-05-09 23:10:03+02:00,
mleich@stripped +3 -264
    Updated results

  mysql-test/suite/jp/r/jp_convert_ucs2.result@stripped, 2008-05-09 23:10:03+02:00,
mleich@stripped +3 -109
    Updated results

  mysql-test/suite/jp/r/jp_convert_ujis.result@stripped, 2008-05-09 23:10:03+02:00,
mleich@stripped +9 -381
    Updated results

  mysql-test/suite/jp/r/jp_convert_utf8.result@stripped, 2008-05-09 23:10:03+02:00,
mleich@stripped +9 -381
    Updated results

  mysql-test/suite/jp/r/jp_create_db_sjis.result@stripped, 2008-05-09 23:10:03+02:00,
mleich@stripped +3 -2
    Updated results

  mysql-test/suite/jp/r/jp_create_db_ucs2.result@stripped, 2008-05-09 23:10:03+02:00,
mleich@stripped +3 -2
    Updated results

  mysql-test/suite/jp/r/jp_create_db_ujis.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +3 -2
    Updated results

  mysql-test/suite/jp/r/jp_create_db_utf8.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +3 -2
    Updated results

  mysql-test/suite/jp/r/jp_create_tbl_sjis.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +117 -237
    Updated results

  mysql-test/suite/jp/r/jp_create_tbl_ucs2.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +117 -237
    Updated results

  mysql-test/suite/jp/r/jp_create_tbl_ujis.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +117 -237
    Updated results

  mysql-test/suite/jp/r/jp_create_tbl_utf8.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +117 -237
    Updated results

  mysql-test/suite/jp/r/jp_enum_sjis.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +52 -135
    Updated results

  mysql-test/suite/jp/r/jp_enum_ucs2.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +117 -63
    Updated results

  mysql-test/suite/jp/r/jp_enum_ujis.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +45 -135
    Updated results

  mysql-test/suite/jp/r/jp_enum_utf8.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +45 -135
    Updated results

  mysql-test/suite/jp/r/jp_insert_sjis.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +3 -195
    Updated results

  mysql-test/suite/jp/r/jp_insert_ucs2.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +3 -195
    Updated results

  mysql-test/suite/jp/r/jp_insert_ujis.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +3 -195
    Updated results

  mysql-test/suite/jp/r/jp_insert_utf8.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +3 -195
    Updated results

  mysql-test/suite/jp/r/jp_instr_sjis.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +3 -67
    Updated results

  mysql-test/suite/jp/r/jp_instr_ucs2.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +3 -67
    Updated results

  mysql-test/suite/jp/r/jp_instr_ujis.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +3 -67
    Updated results

  mysql-test/suite/jp/r/jp_instr_utf8.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +3 -67
    Updated results

  mysql-test/suite/jp/r/jp_join_sjis.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +132 -267
    Updated results

  mysql-test/suite/jp/r/jp_join_ucs2.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +138 -273
    Updated results

  mysql-test/suite/jp/r/jp_join_ujis.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +138 -273
    Updated results

  mysql-test/suite/jp/r/jp_join_utf8.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +144 -279
    Updated results

  mysql-test/suite/jp/r/jp_left_sjis.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +3 -159
    Updated results

  mysql-test/suite/jp/r/jp_left_ucs2.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +3 -159
    Updated results

  mysql-test/suite/jp/r/jp_left_ujis.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +3 -159
    Updated results

  mysql-test/suite/jp/r/jp_left_utf8.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +3 -159
    Updated results

  mysql-test/suite/jp/r/jp_length_sjis.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +3 -39
    Updated results

  mysql-test/suite/jp/r/jp_length_ucs2.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +3 -39
    Updated results

  mysql-test/suite/jp/r/jp_length_ujis.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +3 -39
    Updated results

  mysql-test/suite/jp/r/jp_length_utf8.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +3 -39
    Updated results

  mysql-test/suite/jp/r/jp_like_sjis.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +9 -65
    Updated results

  mysql-test/suite/jp/r/jp_like_ucs2.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +3 -107
    Updated results

  mysql-test/suite/jp/r/jp_like_ujis.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +9 -65
    Updated results

  mysql-test/suite/jp/r/jp_like_utf8.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +9 -62
    Updated results

  mysql-test/suite/jp/r/jp_locate_sjis.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +3 -67
    Updated results

  mysql-test/suite/jp/r/jp_locate_ucs2.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +3 -67
    Updated results

  mysql-test/suite/jp/r/jp_locate_ujis.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +3 -67
    Updated results

  mysql-test/suite/jp/r/jp_locate_utf8.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +3 -67
    Updated results

  mysql-test/suite/jp/r/jp_lpad_sjis.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +3 -39
    Updated results

  mysql-test/suite/jp/r/jp_lpad_ucs2.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +3 -39
    Updated results

  mysql-test/suite/jp/r/jp_lpad_ujis.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +3 -39
    Updated results

  mysql-test/suite/jp/r/jp_lpad_utf8.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +3 -39
    Updated results

  mysql-test/suite/jp/r/jp_ltrim_sjis.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +3 -58
    Updated results

  mysql-test/suite/jp/r/jp_ltrim_ucs2.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +3 -58
    Updated results

  mysql-test/suite/jp/r/jp_ltrim_ujis.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +3 -58
    Updated results

  mysql-test/suite/jp/r/jp_ltrim_utf8.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +3 -58
    Updated results

  mysql-test/suite/jp/r/jp_ps_sjis.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +4 -231
    Updated results

  mysql-test/suite/jp/r/jp_ps_ujis.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +4 -231
    Updated results

  mysql-test/suite/jp/r/jp_replace_sjis.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +3 -60
    Updated results

  mysql-test/suite/jp/r/jp_replace_ucs2.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +3 -60
    Updated results

  mysql-test/suite/jp/r/jp_replace_ujis.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +3 -60
    Updated results

  mysql-test/suite/jp/r/jp_replace_utf8.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +3 -60
    Updated results

  mysql-test/suite/jp/r/jp_reverse_sjis.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +3 -24
    Updated results

  mysql-test/suite/jp/r/jp_reverse_ucs2.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +3 -24
    Updated results

  mysql-test/suite/jp/r/jp_reverse_ujis.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +3 -24
    Updated results

  mysql-test/suite/jp/r/jp_reverse_utf8.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +3 -24
    Updated results

  mysql-test/suite/jp/r/jp_right_sjis.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +3 -159
    Updated results

  mysql-test/suite/jp/r/jp_right_ucs2.result@stripped, 2008-05-09 23:10:04+02:00,
mleich@stripped +3 -159
    Updated results

  mysql-test/suite/jp/r/jp_right_ujis.result@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +3 -159
    Updated results

  mysql-test/suite/jp/r/jp_right_utf8.result@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +3 -159
    Updated results

  mysql-test/suite/jp/r/jp_rpad_sjis.result@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +3 -39
    Updated results

  mysql-test/suite/jp/r/jp_rpad_ucs2.result@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +3 -39
    Updated results

  mysql-test/suite/jp/r/jp_rpad_ujis.result@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +3 -39
    Updated results

  mysql-test/suite/jp/r/jp_rpad_utf8.result@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +3 -39
    Updated results

  mysql-test/suite/jp/r/jp_rtrim_sjis.result@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +3 -58
    Updated results

  mysql-test/suite/jp/r/jp_rtrim_ucs2.result@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +3 -58
    Updated results

  mysql-test/suite/jp/r/jp_rtrim_ujis.result@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +3 -58
    Updated results

  mysql-test/suite/jp/r/jp_rtrim_utf8.result@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +3 -58
    Updated results

  mysql-test/suite/jp/r/jp_select_sjis.result@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +3 -98
    Updated results

  mysql-test/suite/jp/r/jp_select_ucs2.result@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +0 -56
    Updated results

  mysql-test/suite/jp/r/jp_select_ujis.result@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +9 -137
    Updated results

  mysql-test/suite/jp/r/jp_select_utf8.result@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +9 -137
    Updated results

  mysql-test/suite/jp/r/jp_subquery_sjis.result@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +6 -57
    Updated results

  mysql-test/suite/jp/r/jp_subquery_ucs2.result@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +24 -66
    Updated results

  mysql-test/suite/jp/r/jp_subquery_ujis.result@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +24 -66
    Updated results

  mysql-test/suite/jp/r/jp_subquery_utf8.result@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +6 -57
    Updated results

  mysql-test/suite/jp/r/jp_substring_sjis.result@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +3 -687
    Updated results

  mysql-test/suite/jp/r/jp_substring_ucs2.result@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +3 -351
    Updated results

  mysql-test/suite/jp/r/jp_substring_ujis.result@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +3 -687
    Updated results

  mysql-test/suite/jp/r/jp_substring_utf8.result@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +3 -687
    Updated results

  mysql-test/suite/jp/r/jp_trim_sjis.result@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +108 -270
    Updated results

  mysql-test/suite/jp/r/jp_trim_ucs2.result@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +3 -169
    Updated results

  mysql-test/suite/jp/r/jp_trim_ujis.result@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +3 -169
    Updated results

  mysql-test/suite/jp/r/jp_trim_utf8.result@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +3 -169
    Updated results

  mysql-test/suite/jp/r/jp_union_ujis.result@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +3 -101
    Updated results

  mysql-test/suite/jp/r/jp_update_sjis.result@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +3 -27
    Updated results

  mysql-test/suite/jp/r/jp_update_ucs2.result@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +3 -27
    Updated results

  mysql-test/suite/jp/r/jp_update_ujis.result@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +3 -27
    Updated results

  mysql-test/suite/jp/r/jp_update_utf8.result@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +3 -27
    Updated results

  mysql-test/suite/jp/r/jp_where_sjis.result@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +16 -33
    Updated results

  mysql-test/suite/jp/r/jp_where_ucs2.result@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +3 -43
    Updated results

  mysql-test/suite/jp/r/jp_where_ujis.result@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +9 -24
    Updated results

  mysql-test/suite/jp/r/jp_where_utf8.result@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +9 -24
    Updated results

  mysql-test/suite/jp/t/disabled.def@stripped, 2008-05-09 23:10:07+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-09 23:10:07+02:00, mleich@stripped
+0 -0

  mysql-test/suite/jp/t/jp_alter_sjis.test@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +9 -107
    Improved script

  mysql-test/suite/jp/t/jp_alter_ucs2.test@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +8 -107
    Improved script

  mysql-test/suite/jp/t/jp_alter_ujis.test@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +9 -107
    Improved script

  mysql-test/suite/jp/t/jp_alter_utf8.test@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +10 -107
    Improved script

  mysql-test/suite/jp/t/jp_charlength_sjis.test@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +6 -21
    Improved script

  mysql-test/suite/jp/t/jp_charlength_ucs2.test@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +5 -21
    Improved script

  mysql-test/suite/jp/t/jp_charlength_ujis.test@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +5 -21
    Improved script

  mysql-test/suite/jp/t/jp_charlength_utf8.test@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +6 -21
    Improved script

  mysql-test/suite/jp/t/jp_charset_sjis.test@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +9 -33
    Improved script

  mysql-test/suite/jp/t/jp_charset_ucs2.test@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +8 -55
    Improved script

  mysql-test/suite/jp/t/jp_charset_ujis.test@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +8 -33
    Improved script

  mysql-test/suite/jp/t/jp_charset_utf8.test@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +10 -33
    Improved script

  mysql-test/suite/jp/t/jp_convert_sjis.test@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +10 -27
    Improved script

  mysql-test/suite/jp/t/jp_convert_ucs2.test@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +8 -50
    Improved script

  mysql-test/suite/jp/t/jp_convert_ujis.test@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +8 -28
    Improved script

  mysql-test/suite/jp/t/jp_convert_utf8.test@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +9 -28
    Improved script

  mysql-test/suite/jp/t/jp_create_db_sjis.test@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +1 -0
    Improved script

  mysql-test/suite/jp/t/jp_create_db_utf8.test@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +1 -0
    Improved script

  mysql-test/suite/jp/t/jp_create_tbl_sjis.test@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +23 -93
    Improved script

  mysql-test/suite/jp/t/jp_create_tbl_ucs2.test@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +22 -93
    Improved script

  mysql-test/suite/jp/t/jp_create_tbl_ujis.test@stripped, 2008-05-09 23:10:05+02:00,
mleich@stripped +22 -93
    Improved script

  mysql-test/suite/jp/t/jp_create_tbl_utf8.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +23 -93
    Improved script

  mysql-test/suite/jp/t/jp_enum_sjis.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +12 -39
    Improved script

  mysql-test/suite/jp/t/jp_enum_ucs2.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +33 -63
    Improved script

  mysql-test/suite/jp/t/jp_enum_ujis.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +4 -33
    Improved script

  mysql-test/suite/jp/t/jp_enum_utf8.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +5 -33
    Improved script

  mysql-test/suite/jp/t/jp_insert_sjis.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +6 -78
    Improved script

  mysql-test/suite/jp/t/jp_insert_ucs2.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +5 -78
    Improved script

  mysql-test/suite/jp/t/jp_insert_ujis.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +5 -78
    Improved script

  mysql-test/suite/jp/t/jp_insert_utf8.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +6 -78
    Improved script

  mysql-test/suite/jp/t/jp_instr_sjis.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +6 -34
    Improved script

  mysql-test/suite/jp/t/jp_instr_ucs2.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +5 -34
    Improved script

  mysql-test/suite/jp/t/jp_instr_ujis.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +5 -34
    Improved script

  mysql-test/suite/jp/t/jp_instr_utf8.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +6 -34
    Improved script

  mysql-test/suite/jp/t/jp_join_sjis.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +27 -66
    Improved script

  mysql-test/suite/jp/t/jp_join_ucs2.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +32 -72
    Improved script

  mysql-test/suite/jp/t/jp_join_ujis.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +32 -72
    Improved script

  mysql-test/suite/jp/t/jp_join_utf8.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +40 -79
    Improved script

  mysql-test/suite/jp/t/jp_left_sjis.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +6 -36
    Improved script

  mysql-test/suite/jp/t/jp_left_ucs2.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +5 -36
    Improved script

  mysql-test/suite/jp/t/jp_left_ujis.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +5 -36
    Improved script

  mysql-test/suite/jp/t/jp_left_utf8.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +6 -36
    Improved script

  mysql-test/suite/jp/t/jp_length_sjis.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +6 -21
    Improved script

  mysql-test/suite/jp/t/jp_length_ucs2.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +5 -21
    Improved script

  mysql-test/suite/jp/t/jp_length_ujis.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +5 -21
    Improved script

  mysql-test/suite/jp/t/jp_length_utf8.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +6 -21
    Improved script

  mysql-test/suite/jp/t/jp_like_sjis.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +5 -41
    Improved script

  mysql-test/suite/jp/t/jp_like_ucs2.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +5 -67
    Improved script

  mysql-test/suite/jp/t/jp_like_ujis.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +5 -41
    Improved script

  mysql-test/suite/jp/t/jp_like_utf8.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +6 -41
    Improved script

  mysql-test/suite/jp/t/jp_locate_sjis.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +6 -35
    Improved script

  mysql-test/suite/jp/t/jp_locate_ucs2.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +5 -35
    Improved script

  mysql-test/suite/jp/t/jp_locate_ujis.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +5 -35
    Improved script

  mysql-test/suite/jp/t/jp_locate_utf8.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +6 -35
    Improved script

  mysql-test/suite/jp/t/jp_lpad_sjis.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +6 -21
    Improved script

  mysql-test/suite/jp/t/jp_lpad_ucs2.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +5 -21
    Improved script

  mysql-test/suite/jp/t/jp_lpad_ujis.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +5 -21
    Improved script

  mysql-test/suite/jp/t/jp_lpad_utf8.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +6 -21
    Improved script

  mysql-test/suite/jp/t/jp_ltrim_sjis.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +6 -40
    Improved script

  mysql-test/suite/jp/t/jp_ltrim_ucs2.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +5 -40
    Improved script

  mysql-test/suite/jp/t/jp_ltrim_ujis.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +5 -40
    Improved script

  mysql-test/suite/jp/t/jp_ltrim_utf8.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +6 -40
    Improved script

  mysql-test/suite/jp/t/jp_ps_sjis.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +8 -114
    Improved script

  mysql-test/suite/jp/t/jp_ps_ujis.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +6 -114
    Improved script

  mysql-test/suite/jp/t/jp_replace_sjis.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +6 -33
    Improved script

  mysql-test/suite/jp/t/jp_replace_ucs2.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +5 -33
    Improved script

  mysql-test/suite/jp/t/jp_replace_ujis.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +5 -33
    Improved script

  mysql-test/suite/jp/t/jp_replace_utf8.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +6 -33
    Improved script

  mysql-test/suite/jp/t/jp_reverse_sjis.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +6 -21
    Improved script

  mysql-test/suite/jp/t/jp_reverse_ucs2.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +5 -21
    Improved script

  mysql-test/suite/jp/t/jp_reverse_ujis.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +5 -21
    Improved script

  mysql-test/suite/jp/t/jp_reverse_utf8.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +6 -21
    Improved script

  mysql-test/suite/jp/t/jp_right_sjis.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +6 -36
    Improved script

  mysql-test/suite/jp/t/jp_right_ucs2.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +5 -36
    Improved script

  mysql-test/suite/jp/t/jp_right_ujis.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +5 -36
    Improved script

  mysql-test/suite/jp/t/jp_right_utf8.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +6 -36
    Improved script

  mysql-test/suite/jp/t/jp_rpad_sjis.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +6 -21
    Improved script

  mysql-test/suite/jp/t/jp_rpad_ucs2.test@stripped, 2008-05-09 23:10:06+02:00,
mleich@stripped +5 -21
    Improved script

  mysql-test/suite/jp/t/jp_rpad_ujis.test@stripped, 2008-05-09 23:10:07+02:00,
mleich@stripped +5 -21
    Improved script

  mysql-test/suite/jp/t/jp_rpad_utf8.test@stripped, 2008-05-09 23:10:07+02:00,
mleich@stripped +7 -21
    Improved script

  mysql-test/suite/jp/t/jp_rtrim_sjis.test@stripped, 2008-05-09 23:10:07+02:00,
mleich@stripped +6 -40
    Improved script

  mysql-test/suite/jp/t/jp_rtrim_ucs2.test@stripped, 2008-05-09 23:10:07+02:00,
mleich@stripped +5 -40
    Improved script

  mysql-test/suite/jp/t/jp_rtrim_ujis.test@stripped, 2008-05-09 23:10:07+02:00,
mleich@stripped +5 -40
    Improved script

  mysql-test/suite/jp/t/jp_rtrim_utf8.test@stripped, 2008-05-09 23:10:07+02:00,
mleich@stripped +6 -40
    Improved script

  mysql-test/suite/jp/t/jp_select_sjis.test@stripped, 2008-05-09 23:10:07+02:00,
mleich@stripped +6 -20
    Improved script

  mysql-test/suite/jp/t/jp_select_ucs2.test@stripped, 2008-05-09 23:10:07+02:00,
mleich@stripped +1 -38
    Improved script

  mysql-test/suite/jp/t/jp_select_ujis.test@stripped, 2008-05-09 23:10:07+02:00,
mleich@stripped +5 -20
    Improved script

  mysql-test/suite/jp/t/jp_select_utf8.test@stripped, 2008-05-09 23:10:07+02:00,
mleich@stripped +6 -20
    Improved script

  mysql-test/suite/jp/t/jp_subquery_sjis.test@stripped, 2008-05-09 23:10:07+02:00,
mleich@stripped +8 -36
    Improved script

  mysql-test/suite/jp/t/jp_subquery_ucs2.test@stripped, 2008-05-09 23:10:07+02:00,
mleich@stripped +25 -46
    Improved script

  mysql-test/suite/jp/t/jp_subquery_ujis.test@stripped, 2008-05-09 23:10:07+02:00,
mleich@stripped +25 -46
    Improved script

  mysql-test/suite/jp/t/jp_subquery_utf8.test@stripped, 2008-05-09 23:10:07+02:00,
mleich@stripped +11 -36
    Improved script

  mysql-test/suite/jp/t/jp_substring_sjis.test@stripped, 2008-05-09 23:10:07+02:00,
mleich@stripped +7 -104
    Improved script

  mysql-test/suite/jp/t/jp_substring_ucs2.test@stripped, 2008-05-09 23:10:07+02:00,
mleich@stripped +5 -104
    Improved script

  mysql-test/suite/jp/t/jp_substring_ujis.test@stripped, 2008-05-09 23:10:07+02:00,
mleich@stripped +5 -104
    Improved script

  mysql-test/suite/jp/t/jp_substring_utf8.test@stripped, 2008-05-09 23:10:07+02:00,
mleich@stripped +6 -104
    Improved script

  mysql-test/suite/jp/t/jp_trim_sjis.test@stripped, 2008-05-09 23:10:07+02:00,
mleich@stripped +7 -213
    Improved script

  mysql-test/suite/jp/t/jp_trim_ucs2.test@stripped, 2008-05-09 23:10:07+02:00,
mleich@stripped +5 -53
    Improved script

  mysql-test/suite/jp/t/jp_trim_ujis.test@stripped, 2008-05-09 23:10:07+02:00,
mleich@stripped +5 -53
    Improved script

  mysql-test/suite/jp/t/jp_trim_utf8.test@stripped, 2008-05-09 23:10:07+02:00,
mleich@stripped +6 -53
    Improved script

  mysql-test/suite/jp/t/jp_union_ujis.test@stripped, 2008-05-09 23:10:07+02:00,
mleich@stripped +5 -31
    Improved script

  mysql-test/suite/jp/t/jp_update_sjis.test@stripped, 2008-05-09 23:10:07+02:00,
mleich@stripped +6 -24
    Improved script

  mysql-test/suite/jp/t/jp_update_ucs2.test@stripped, 2008-05-09 23:10:07+02:00,
mleich@stripped +5 -24
    Improved script

  mysql-test/suite/jp/t/jp_update_ujis.test@stripped, 2008-05-09 23:10:07+02:00,
mleich@stripped +5 -24
    Improved script

  mysql-test/suite/jp/t/jp_update_utf8.test@stripped, 2008-05-09 23:10:07+02:00,
mleich@stripped +6 -24
    Improved script

  mysql-test/suite/jp/t/jp_where_sjis.test@stripped, 2008-05-09 23:10:07+02:00,
mleich@stripped +15 -26
    Improved script

  mysql-test/suite/jp/t/jp_where_ucs2.test@stripped, 2008-05-09 23:10:07+02:00,
mleich@stripped +5 -43
    Improved script

  mysql-test/suite/jp/t/jp_where_ujis.test@stripped, 2008-05-09 23:10:07+02:00,
mleich@stripped +5 -21
    Improved script

  mysql-test/suite/jp/t/jp_where_utf8.test@stripped, 2008-05-09 23:10:07+02:00,
mleich@stripped +7 -22
    Improved script

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-09 23:10:58 +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
+DROP TABLE IF EXISTS `‚s‚P`;
+DROP TABLE IF EXISTS `‚s‚Q`;
+DROP TABLE IF EXISTS `‚s‚R`;
+--enable_warnings
+--replace_result $engine <engine_to_be_tested>
+eval CREATE TABLE `‚s‚P` (`‚b‚P` CHAR(12), INDEX(`‚b‚P`)) DEFAULT CHARSET = sjis ENGINE =
$engine;
+--replace_result $engine <engine_to_be_tested>
+eval CREATE TABLE `‚s‚Q` (`‚b‚P` CHAR(12), INDEX(`‚b‚P`)) DEFAULT CHARSET = sjis ENGINE =
$engine;
+--replace_result $engine <engine_to_be_tested>
+eval CREATE TABLE `‚s‚R` (`‚b‚P` CHAR(12), INDEX(`‚b‚P`)) DEFAULT CHARSET = sjis ENGINE =
$engine;
+
+# Nothing to trim
+INSERT INTO `‚s‚P` VALUES ('±²³´µ');
+# Test data for TRIM(TRAILING [remstr] FROM str)
+INSERT INTO `‚s‚P` VALUES ('±²³´µ¶');
+INSERT INTO `‚s‚P` VALUES ('±²³´µ¶¶');
+INSERT INTO `‚s‚P` VALUES ('±²³´µ¶¶¶');
+# Test data for TRIM(LEADING [remstr] FROM str)
+INSERT INTO `‚s‚P` VALUES ('¶±²³´µ');
+INSERT INTO `‚s‚P` VALUES ('¶¶±²³´µ');
+INSERT INTO `‚s‚P` VALUES ('¶¶¶±²³´µ');
+# Test data for TRIM(BOTH [remstr] FROM str)
+INSERT INTO `‚s‚P` VALUES
('¶¶¶±²³´µ¶¶¶');
+# Test data for TRIM without [remstr] (remove spaces) 
+INSERT INTO `‚s‚P` VALUES ('   ±²³´µ   ');
+INSERT INTO `‚s‚Q` VALUES ('‚ ‚¢‚¤‚¦‚¨');
+INSERT INTO `‚s‚Q` VALUES ('‚ ‚¢‚¤‚¦‚¨‚©');
+INSERT INTO `‚s‚Q` VALUES ('‚ ‚¢‚¤‚¦‚¨‚©‚©');
+INSERT INTO `‚s‚Q` VALUES
('‚ ‚¢‚¤‚¦‚¨‚©‚©‚©');
+INSERT INTO `‚s‚Q` VALUES ('‚©‚ ‚¢‚¤‚¦‚¨');
+INSERT INTO `‚s‚Q` VALUES ('‚©‚©‚ ‚¢‚¤‚¦‚¨');
+INSERT INTO `‚s‚Q` VALUES
('‚©‚©‚©‚ ‚¢‚¤‚¦‚¨');
+INSERT INTO `‚s‚Q` VALUES
('‚©‚©‚©‚ ‚¢‚¤‚¦‚¨‚©‚©‚©');
+INSERT INTO `‚s‚Q` VALUES ('   ‚ ‚¢‚¤‚¦‚¨   ');
+INSERT INTO `‚s‚R` VALUES ('ƒ\\•\—\\');
+INSERT INTO `‚s‚R` VALUES ('ƒ\\•\—\\–\');
+INSERT INTO `‚s‚R` VALUES ('ƒ\\•\—\\–\–\');
+INSERT INTO `‚s‚R` VALUES ('ƒ\\•\—\\–\–\–\');
+INSERT INTO `‚s‚R` VALUES ('–\ƒ\\•\—\\');
+INSERT INTO `‚s‚R` VALUES ('–\–\ƒ\\•\—\\');
+INSERT INTO `‚s‚R` VALUES ('–\–\–\ƒ\\•\—\\');
+INSERT INTO `‚s‚R` VALUES ('–\–\–\ƒ\\•\—\\–\–\–\');
+INSERT INTO `‚s‚R` VALUES ('   ƒ\\•\—\\   ');
+
+SELECT `‚b‚P`,TRIM(TRAILING '¶' FROM `‚b‚P`) FROM `‚s‚P`;
+SELECT `‚b‚P`,TRIM(LEADING '¶' FROM `‚b‚P`) FROM `‚s‚P`;
+SELECT `‚b‚P`,TRIM(BOTH '¶' FROM `‚b‚P`) FROM `‚s‚P`;
+SELECT `‚b‚P`,TRIM(`‚b‚P`) FROM `‚s‚P`;
+SELECT `‚b‚P`,TRIM(TRAILING '‚©' FROM `‚b‚P`) FROM `‚s‚Q`;
+SELECT `‚b‚P`,TRIM(LEADING '‚©' FROM `‚b‚P`) FROM `‚s‚Q`;
+SELECT `‚b‚P`,TRIM(BOTH '‚©' FROM `‚b‚P`) FROM `‚s‚Q`;
+SELECT `‚b‚P`,TRIM(`‚b‚P`) FROM `‚s‚Q`;
+SELECT `‚b‚P`,TRIM(TRAILING '–\' FROM `‚b‚P`) FROM `‚s‚R`;
+SELECT `‚b‚P`,TRIM(LEADING '–\' FROM `‚b‚P`) FROM `‚s‚R`;
+SELECT `‚b‚P`,TRIM(BOTH '–\' FROM `‚b‚P`) FROM `‚s‚R`;
+SELECT `‚b‚P`,TRIM(`‚b‚P`) FROM `‚s‚R`;
+
+DROP TABLE `‚s‚P`;
+DROP TABLE `‚s‚Q`;
+DROP TABLE `‚s‚R`;
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-09 23:10:03 +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=sjis
@@ -58,11 +58,11 @@ SELECT * FROM `±±±`;
 ³³³³³
 DESC `±±±`;
 Field	Type	Null	Key	Default	Extra
-···	char(6)				
+···	char(6)	NO			
 SHOW CREATE TABLE `±±±`;
 Table	Create Table
 ±±±	CREATE TABLE `±±±` (
-  `···` char(6) NOT NULL default ''
+  `···` char(6) NOT NULL DEFAULT ''
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 ALTER TABLE `‚ ‚ ‚ ` ADD `‚©‚©‚©` char(1) FIRST;
 ALTER TABLE `‚ ‚ ‚ ` ADD `‚­‚­‚­` char(1) AFTER
`‚«‚«‚«`;
@@ -80,17 +80,17 @@ NULL	‚¤‚¤‚¤‚¤‚¤	NULL	NULL
 DESC `‚ ‚ ‚ `;
 Field	Type	Null	Key	Default	Extra
 ‚©‚©	char(1)	YES	MUL	NULL	
-‚«‚«‚«	char(6)		PRI		
-‚­‚­‚­	char(1)	YES	MUL	NULL	
+‚«‚«‚«	char(6)	NO	PRI		
+‚­‚­‚­	char(1)	YES	UNI	NULL	
 ‚¯‚¯‚¯	char(1)	YES		NULL	
 SHOW CREATE TABLE `‚ ‚ ‚ `;
 Table	Create Table
 ‚ ‚ ‚ 	CREATE TABLE `‚ ‚ ‚ ` (
-  `‚©‚©` char(1) default NULL,
-  `‚«‚«‚«` char(6) NOT NULL default '',
-  `‚­‚­‚­` char(1) default NULL,
-  `‚¯‚¯‚¯` char(1) default NULL,
-  PRIMARY KEY  (`‚«‚«‚«`),
+  `‚©‚©` char(1) DEFAULT NULL,
+  `‚«‚«‚«` char(6) NOT NULL DEFAULT '',
+  `‚­‚­‚­` char(1) DEFAULT NULL,
+  `‚¯‚¯‚¯` char(1) DEFAULT NULL,
+  PRIMARY KEY (`‚«‚«‚«`),
   UNIQUE KEY `‚­‚­‚­` (`‚­‚­‚­`),
   KEY `‚©‚©‚©` (`‚©‚©`)
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
@@ -107,11 +107,11 @@ SELECT * FROM `‚ ‚ ‚ `;
 ‚¤‚¤‚¤‚¤‚¤
 DESC `‚ ‚ ‚ `;
 Field	Type	Null	Key	Default	Extra
-‚«‚«‚«	char(6)				
+‚«‚«‚«	char(6)	NO			
 SHOW CREATE TABLE `‚ ‚ ‚ `;
 Table	Create Table
 ‚ ‚ ‚ 	CREATE TABLE `‚ ‚ ‚ ` (
-  `‚«‚«‚«` char(6) NOT NULL default ''
+  `‚«‚«‚«` char(6) NOT NULL DEFAULT ''
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 ALTER TABLE `ƒ\ƒ\ƒ\` ADD `\\\` char(1) FIRST;
 ALTER TABLE `ƒ\ƒ\ƒ\` ADD `”\”\”\` char(1) AFTER `•\•\•\`;
@@ -129,17 +129,17 @@ NULL	•\•\•\•\•\	NULL	NULL
 DESC `ƒ\ƒ\ƒ\`;
 Field	Type	Null	Key	Default	Extra
 \\	char(1)	YES	MUL	NULL	
-•\•\•\	char(6)		PRI		
-”\”\”\	char(1)	YES	MUL	NULL	
+•\•\•\	char(6)	NO	PRI		
+”\”\”\	char(1)	YES	UNI	NULL	
 —\—\—\	char(1)	YES		NULL	
 SHOW CREATE TABLE `ƒ\ƒ\ƒ\`;
 Table	Create Table
 ƒ\ƒ\ƒ\	CREATE TABLE `ƒ\ƒ\ƒ\` (
-  `\\` char(1) default NULL,
-  `•\•\•\` char(6) NOT NULL default '',
-  `”\”\”\` char(1) default NULL,
-  `—\—\—\` char(1) default NULL,
-  PRIMARY KEY  (`•\•\•\`),
+  `\\` char(1) DEFAULT NULL,
+  `•\•\•\` char(6) NOT NULL DEFAULT '',
+  `”\”\”\` char(1) DEFAULT NULL,
+  `—\—\—\` char(1) DEFAULT NULL,
+  PRIMARY KEY (`•\•\•\`),
   UNIQUE KEY `”\”\”\` (`”\”\”\`),
   KEY `\\\` (`\\`)
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
@@ -156,11 +156,11 @@ SELECT * FROM `ƒ\ƒ\ƒ\`;
 •\•\•\•\•\
 DESC `ƒ\ƒ\ƒ\`;
 Field	Type	Null	Key	Default	Extra
-•\•\•\	char(6)				
+•\•\•\	char(6)	NO			
 SHOW CREATE TABLE `ƒ\ƒ\ƒ\`;
 Table	Create Table
 ƒ\ƒ\ƒ\	CREATE TABLE `ƒ\ƒ\ƒ\` (
-  `•\•\•\` char(6) NOT NULL default ''
+  `•\•\•\` char(6) NOT NULL DEFAULT ''
 ) ENGINE=InnoDB DEFAULT CHARSET=sjis
 DROP TABLE `±±±`;
 DROP TABLE `²²²`;
@@ -193,17 +193,17 @@ NULL	³³³³³	NULL	NULL
 DESC `±±±`;
 Field	Type	Null	Key	Default	Extra
 ¶¶	char(1)	YES	MUL	NULL	
-···	char(6)		PRI		
-¸¸¸	char(1)	YES	MUL	NULL	
+···	char(6)	NO	PRI		
+¸¸¸	char(1)	YES	UNI	NULL	
 ¹¹¹	char(1)	YES		NULL	
 SHOW CREATE TABLE `±±±`;
 Table	Create Table
 ±±±	CREATE TABLE `±±±` (
-  `¶¶` char(1) default NULL,
-  `···` char(6) NOT NULL default '',
-  `¸¸¸` char(1) default NULL,
-  `¹¹¹` char(1) default NULL,
-  PRIMARY KEY  (`···`),
+  `¶¶` char(1) DEFAULT NULL,
+  `···` char(6) NOT NULL DEFAULT '',
+  `¸¸¸` char(1) DEFAULT NULL,
+  `¹¹¹` char(1) DEFAULT NULL,
+  PRIMARY KEY (`···`),
   UNIQUE KEY `¸¸¸` (`¸¸¸`),
   KEY `¶¶¶` (`¶¶`)
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
@@ -220,11 +220,11 @@ SELECT * FROM `±±±`;
 ³³³³³
 DESC `±±±`;
 Field	Type	Null	Key	Default	Extra
-···	char(6)				
+···	char(6)	NO			
 SHOW CREATE TABLE `±±±`;
 Table	Create Table
 ±±±	CREATE TABLE `±±±` (
-  `···` char(6) NOT NULL default ''
+  `···` char(6) NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 ALTER TABLE `‚ ‚ ‚ ` ADD `‚©‚©‚©` char(1) FIRST;
 ALTER TABLE `‚ ‚ ‚ ` ADD `‚­‚­‚­` char(1) AFTER
`‚«‚«‚«`;
@@ -242,17 +242,17 @@ NULL	‚¤‚¤‚¤‚¤‚¤	NULL	NULL
 DESC `‚ ‚ ‚ `;
 Field	Type	Null	Key	Default	Extra
 ‚©‚©	char(1)	YES	MUL	NULL	
-‚«‚«‚«	char(6)		PRI		
-‚­‚­‚­	char(1)	YES	MUL	NULL	
+‚«‚«‚«	char(6)	NO	PRI		
+‚­‚­‚­	char(1)	YES	UNI	NULL	
 ‚¯‚¯‚¯	char(1)	YES		NULL	
 SHOW CREATE TABLE `‚ ‚ ‚ `;
 Table	Create Table
 ‚ ‚ ‚ 	CREATE TABLE `‚ ‚ ‚ ` (
-  `‚©‚©` char(1) default NULL,
-  `‚«‚«‚«` char(6) NOT NULL default '',
-  `‚­‚­‚­` char(1) default NULL,
-  `‚¯‚¯‚¯` char(1) default NULL,
-  PRIMARY KEY  (`‚«‚«‚«`),
+  `‚©‚©` char(1) DEFAULT NULL,
+  `‚«‚«‚«` char(6) NOT NULL DEFAULT '',
+  `‚­‚­‚­` char(1) DEFAULT NULL,
+  `‚¯‚¯‚¯` char(1) DEFAULT NULL,
+  PRIMARY KEY (`‚«‚«‚«`),
   UNIQUE KEY `‚­‚­‚­` (`‚­‚­‚­`),
   KEY `‚©‚©‚©` (`‚©‚©`)
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
@@ -269,11 +269,11 @@ SELECT * FROM `‚ ‚ ‚ `;
 ‚¤‚¤‚¤‚¤‚¤
 DESC `‚ ‚ ‚ `;
 Field	Type	Null	Key	Default	Extra
-‚«‚«‚«	char(6)				
+‚«‚«‚«	char(6)	NO			
 SHOW CREATE TABLE `‚ ‚ ‚ `;
 Table	Create Table
 ‚ ‚ ‚ 	CREATE TABLE `‚ ‚ ‚ ` (
-  `‚«‚«‚«` char(6) NOT NULL default ''
+  `‚«‚«‚«` char(6) NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 ALTER TABLE `ƒ\ƒ\ƒ\` ADD `\\\` char(1) FIRST;
 ALTER TABLE `ƒ\ƒ\ƒ\` ADD `”\”\”\` char(1) AFTER `•\•\•\`;
@@ -291,17 +291,17 @@ NULL	”\”\”\”\”\	NULL	NULL
 DESC `ƒ\ƒ\ƒ\`;
 Field	Type	Null	Key	Default	Extra
 \\	char(1)	YES	MUL	NULL	
-•\•\•\	char(6)		PRI		
-”\”\”\	char(1)	YES	MUL	NULL	
+•\•\•\	char(6)	NO	PRI		
+”\”\”\	char(1)	YES	UNI	NULL	
 —\—\—\	char(1)	YES		NULL	
 SHOW CREATE TABLE `ƒ\ƒ\ƒ\`;
 Table	Create Table
 ƒ\ƒ\ƒ\	CREATE TABLE `ƒ\ƒ\ƒ\` (
-  `\\` char(1) default NULL,
-  `•\•\•\` char(6) NOT NULL default '',
-  `”\”\”\` char(1) default NULL,
-  `—\—\—\` char(1) default NULL,
-  PRIMARY KEY  (`•\•\•\`),
+  `\\` char(1) DEFAULT NULL,
+  `•\•\•\` char(6) NOT NULL DEFAULT '',
+  `”\”\”\` char(1) DEFAULT NULL,
+  `—\—\—\` char(1) DEFAULT NULL,
+  PRIMARY KEY (`•\•\•\`),
   UNIQUE KEY `”\”\”\` (`”\”\”\`),
   KEY `\\\` (`\\`)
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
@@ -318,11 +318,11 @@ SELECT * FROM `ƒ\ƒ\ƒ\`;
 ”\”\”\”\”\
 DESC `ƒ\ƒ\ƒ\`;
 Field	Type	Null	Key	Default	Extra
-•\•\•\	char(6)				
+•\•\•\	char(6)	NO			
 SHOW CREATE TABLE `ƒ\ƒ\ƒ\`;
 Table	Create Table
 ƒ\ƒ\ƒ\	CREATE TABLE `ƒ\ƒ\ƒ\` (
-  `•\•\•\` char(6) NOT NULL default ''
+  `•\•\•\` char(6) NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=sjis
 DROP TABLE `±±±`;
 DROP TABLE `²²²`;
@@ -330,12 +330,12 @@ DROP TABLE `‚ ‚ ‚ `;
 DROP TABLE `‚¢‚¢‚¢`;
 DROP TABLE `ƒ\ƒ\ƒ\`;
 DROP TABLE `\\\`;
-CREATE TABLE `±±±`(`···` char(5)) DEFAULT
CHARSET = sjis engine=HEAP;
-CREATE TABLE `²²²`(`¹¹¹` char(5)) DEFAULT CHARSET = sjis
engine=HEAP;
-CREATE TABLE `‚ ‚ ‚ `(`‚«‚«‚«` char(5)) DEFAULT CHARSET
= sjis engine=HEAP;
-CREATE TABLE `‚¢‚¢‚¢`(`‚¯‚¯‚¯` char(5)) DEFAULT CHARSET =
sjis engine=HEAP;
-CREATE TABLE `ƒ\ƒ\ƒ\`(`•\•\•\` char(5)) DEFAULT CHARSET = sjis engine=HEAP;
-CREATE TABLE `\\\`(`—\—\—\` char(5)) DEFAULT CHARSET = sjis engine=HEAP;
+CREATE TABLE `±±±`(`···` char(5)) DEFAULT
CHARSET = sjis engine=MEMORY;
+CREATE TABLE `²²²`(`¹¹¹` char(5)) DEFAULT CHARSET = sjis
engine=MEMORY;
+CREATE TABLE `‚ ‚ ‚ `(`‚«‚«‚«` char(5)) DEFAULT CHARSET
= sjis engine=MEMORY;
+CREATE TABLE `‚¢‚¢‚¢`(`‚¯‚¯‚¯` char(5)) DEFAULT CHARSET =
sjis engine=MEMORY;
+CREATE TABLE `ƒ\ƒ\ƒ\`(`•\•\•\` char(5)) DEFAULT CHARSET = sjis engine=MEMORY;
+CREATE TABLE `\\\`(`—\—\—\` char(5)) DEFAULT CHARSET = sjis engine=MEMORY;
 INSERT INTO `±±±` VALUES
('±±±±±'),('²²²²²'),('³³³³³');
 INSERT INTO `‚ ‚ ‚ ` VALUES
('‚ ‚ ‚ ‚ ‚ '),('‚¢‚¢‚¢‚¢‚¢'),('‚¤‚¤‚¤‚¤‚¤');
 INSERT INTO `ƒ\ƒ\ƒ\` VALUES ('•\•\•\•\•\'),('\\\\\'),('”\”\”\”\”\');
@@ -355,20 +355,20 @@ NULL	³³³³³	NULL	NULL
 DESC `±±±`;
 Field	Type	Null	Key	Default	Extra
 ¶¶	char(1)	YES	MUL	NULL	
-···	char(6)		PRI		
-¸¸¸	char(1)	YES	MUL	NULL	
+···	char(6)	NO	PRI		
+¸¸¸	char(1)	YES	UNI	NULL	
 ¹¹¹	char(1)	YES		NULL	
 SHOW CREATE TABLE `±±±`;
 Table	Create Table
 ±±±	CREATE TABLE `±±±` (
-  `¶¶` char(1) default NULL,
-  `···` char(6) NOT NULL default '',
-  `¸¸¸` char(1) default NULL,
-  `¹¹¹` char(1) default NULL,
-  PRIMARY KEY  (`···`),
+  `¶¶` char(1) DEFAULT NULL,
+  `···` char(6) NOT NULL DEFAULT '',
+  `¸¸¸` char(1) DEFAULT NULL,
+  `¹¹¹` char(1) DEFAULT NULL,
+  PRIMARY KEY (`···`),
   UNIQUE KEY `¸¸¸` (`¸¸¸`),
   KEY `¶¶¶` (`¶¶`)
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 ALTER TABLE `±±±` DROP INDEX `¶¶¶`;
 ALTER TABLE `±±±` DROP PRIMARY KEY;
 ALTER TABLE `±±±` DROP INDEX `¸¸¸`;
@@ -382,12 +382,12 @@ SELECT * FROM `±±±`;
 ³³³³³
 DESC `±±±`;
 Field	Type	Null	Key	Default	Extra
-···	char(6)				
+···	char(6)	NO			
 SHOW CREATE TABLE `±±±`;
 Table	Create Table
 ±±±	CREATE TABLE `±±±` (
-  `···` char(6) NOT NULL default ''
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+  `···` char(6) NOT NULL DEFAULT ''
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 ALTER TABLE `‚ ‚ ‚ ` ADD `‚©‚©‚©` char(1) FIRST;
 ALTER TABLE `‚ ‚ ‚ ` ADD `‚­‚­‚­` char(1) AFTER
`‚«‚«‚«`;
 ALTER TABLE `‚ ‚ ‚ ` ADD `‚¯‚¯‚¯` char(1);
@@ -404,20 +404,20 @@ NULL	‚¤‚¤‚¤‚¤‚¤	NULL	NULL
 DESC `‚ ‚ ‚ `;
 Field	Type	Null	Key	Default	Extra
 ‚©‚©	char(1)	YES	MUL	NULL	
-‚«‚«‚«	char(6)		PRI		
-‚­‚­‚­	char(1)	YES	MUL	NULL	
+‚«‚«‚«	char(6)	NO	PRI		
+‚­‚­‚­	char(1)	YES	UNI	NULL	
 ‚¯‚¯‚¯	char(1)	YES		NULL	
 SHOW CREATE TABLE `‚ ‚ ‚ `;
 Table	Create Table
 ‚ ‚ ‚ 	CREATE TABLE `‚ ‚ ‚ ` (
-  `‚©‚©` char(1) default NULL,
-  `‚«‚«‚«` char(6) NOT NULL default '',
-  `‚­‚­‚­` char(1) default NULL,
-  `‚¯‚¯‚¯` char(1) default NULL,
-  PRIMARY KEY  (`‚«‚«‚«`),
+  `‚©‚©` char(1) DEFAULT NULL,
+  `‚«‚«‚«` char(6) NOT NULL DEFAULT '',
+  `‚­‚­‚­` char(1) DEFAULT NULL,
+  `‚¯‚¯‚¯` char(1) DEFAULT NULL,
+  PRIMARY KEY (`‚«‚«‚«`),
   UNIQUE KEY `‚­‚­‚­` (`‚­‚­‚­`),
   KEY `‚©‚©‚©` (`‚©‚©`)
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 ALTER TABLE `‚ ‚ ‚ ` DROP INDEX `‚©‚©‚©`;
 ALTER TABLE `‚ ‚ ‚ ` DROP PRIMARY KEY;
 ALTER TABLE `‚ ‚ ‚ ` DROP INDEX `‚­‚­‚­`;
@@ -431,12 +431,12 @@ SELECT * FROM `‚ ‚ ‚ `;
 ‚¤‚¤‚¤‚¤‚¤
 DESC `‚ ‚ ‚ `;
 Field	Type	Null	Key	Default	Extra
-‚«‚«‚«	char(6)				
+‚«‚«‚«	char(6)	NO			
 SHOW CREATE TABLE `‚ ‚ ‚ `;
 Table	Create Table
 ‚ ‚ ‚ 	CREATE TABLE `‚ ‚ ‚ ` (
-  `‚«‚«‚«` char(6) NOT NULL default ''
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+  `‚«‚«‚«` char(6) NOT NULL DEFAULT ''
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 ALTER TABLE `ƒ\ƒ\ƒ\` ADD `\\\` char(1) FIRST;
 ALTER TABLE `ƒ\ƒ\ƒ\` ADD `”\”\”\` char(1) AFTER `•\•\•\`;
 ALTER TABLE `ƒ\ƒ\ƒ\` ADD `—\—\—\` char(1);
@@ -453,20 +453,20 @@ NULL	”\”\”\”\”\	NULL	NULL
 DESC `ƒ\ƒ\ƒ\`;
 Field	Type	Null	Key	Default	Extra
 \\	char(1)	YES	MUL	NULL	
-•\•\•\	char(6)		PRI		
-”\”\”\	char(1)	YES	MUL	NULL	
+•\•\•\	char(6)	NO	PRI		
+”\”\”\	char(1)	YES	UNI	NULL	
 —\—\—\	char(1)	YES		NULL	
 SHOW CREATE TABLE `ƒ\ƒ\ƒ\`;
 Table	Create Table
 ƒ\ƒ\ƒ\	CREATE TABLE `ƒ\ƒ\ƒ\` (
-  `\\` char(1) default NULL,
-  `•\•\•\` char(6) NOT NULL default '',
-  `”\”\”\` char(1) default NULL,
-  `—\—\—\` char(1) default NULL,
-  PRIMARY KEY  (`•\•\•\`),
+  `\\` char(1) DEFAULT NULL,
+  `•\•\•\` char(6) NOT NULL DEFAULT '',
+  `”\”\”\` char(1) DEFAULT NULL,
+  `—\—\—\` char(1) DEFAULT NULL,
+  PRIMARY KEY (`•\•\•\`),
   UNIQUE KEY `”\”\”\` (`”\”\”\`),
   KEY `\\\` (`\\`)
-) ENGINE=HEAP DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 ALTER TABLE `ƒ\ƒ\ƒ\` DROP INDEX `\\\`;
 ALTER TABLE `ƒ\ƒ\ƒ\` DROP PRIMARY KEY;
 ALTER TABLE `ƒ\ƒ\ƒ\` DROP INDEX `”\”\”\`;
@@ -480,165 +480,12 @@ SELECT * FROM `ƒ\ƒ\ƒ\`;
 ”\”\”\”\”\
 DESC `ƒ\ƒ\ƒ\`;
 Field	Type	Null	Key	Default	Extra
-•\•\•\	char(6)				
+•\•\•\	char(6)	NO			
 SHOW CREATE TABLE `ƒ\ƒ\ƒ\`;
 Table	Create Table
 ƒ\ƒ\ƒ\	CREATE TABLE `ƒ\ƒ\ƒ\` (
-  `•\•\•\` char(6) NOT NULL default ''
-) ENGINE=HEAP DEFAULT CHARSET=sjis
-DROP TABLE `±±±`;
-DROP TABLE `²²²`;
-DROP TABLE `‚ ‚ ‚ `;
-DROP TABLE `‚¢‚¢‚¢`;
-DROP TABLE `ƒ\ƒ\ƒ\`;
-DROP TABLE `\\\`;
-CREATE TABLE `±±±`(`···` char(5)) DEFAULT
CHARSET = sjis engine=BDB;
-CREATE TABLE `²²²`(`¹¹¹` char(5)) DEFAULT CHARSET = sjis
engine=BDB;
-CREATE TABLE `‚ ‚ ‚ `(`‚«‚«‚«` char(5)) DEFAULT CHARSET
= sjis engine=BDB;
-CREATE TABLE `‚¢‚¢‚¢`(`‚¯‚¯‚¯` char(5)) DEFAULT CHARSET =
sjis engine=BDB;
-CREATE TABLE `ƒ\ƒ\ƒ\`(`•\•\•\` char(5)) DEFAULT CHARSET = sjis engine=BDB;
-CREATE TABLE `\\\`(`—\—\—\` char(5)) DEFAULT CHARSET = sjis engine=BDB;
-INSERT INTO `±±±` VALUES
('±±±±±'),('²²²²²'),('³³³³³');
-INSERT INTO `‚ ‚ ‚ ` VALUES
('‚ ‚ ‚ ‚ ‚ '),('‚¢‚¢‚¢‚¢‚¢'),('‚¤‚¤‚¤‚¤‚¤');
-INSERT INTO `ƒ\ƒ\ƒ\` VALUES ('•\•\•\•\•\'),('\\\\\'),('”\”\”\”\”\');
-ALTER TABLE `±±±` ADD `¶¶¶` char(1) FIRST;
-ALTER TABLE `±±±` ADD `¸¸¸` char(1) AFTER
`···`;
-ALTER TABLE `±±±` ADD `¹¹¹` char(1);
-ALTER TABLE `±±±` ADD INDEX (`¶¶¶`);
-ALTER TABLE `±±±` ADD PRIMARY KEY (`···`);
-ALTER TABLE `±±±` CHANGE `¶¶¶` `¶¶`
char(1);
-ALTER TABLE `±±±` MODIFY `···` char(6);
-SELECT * FROM `±±±`;
-¶¶	···	¸¸¸	¹¹¹
-NULL	±±±±±	NULL	NULL
-NULL	²²²²²	NULL	NULL
-NULL	³³³³³	NULL	NULL
-DESC `±±±`;
-Field	Type	Null	Key	Default	Extra
-¶¶	char(1)	YES	MUL	NULL	
-···	char(6)		PRI		
-¸¸¸	char(1)	YES		NULL	
-¹¹¹	char(1)	YES		NULL	
-SHOW CREATE TABLE `±±±`;
-Table	Create Table
-±±±	CREATE TABLE `±±±` (
-  `¶¶` char(1) default NULL,
-  `···` char(6) NOT NULL default '',
-  `¸¸¸` char(1) default NULL,
-  `¹¹¹` char(1) default NULL,
-  PRIMARY KEY  (`···`),
-  KEY `¶¶¶` (`¶¶`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-ALTER TABLE `±±±` DROP INDEX `¶¶¶`;
-ALTER TABLE `±±±` DROP PRIMARY KEY;
-ALTER TABLE `±±±` DROP `¶¶`;
-ALTER TABLE `±±±` DROP `¸¸¸`;
-ALTER TABLE `±±±` DROP `¹¹¹`;
-SELECT * FROM `±±±`;
-···
-±±±±±
-²²²²²
-³³³³³
-DESC `±±±`;
-Field	Type	Null	Key	Default	Extra
-···	char(6)				
-SHOW CREATE TABLE `±±±`;
-Table	Create Table
-±±±	CREATE TABLE `±±±` (
-  `···` char(6) NOT NULL default ''
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-ALTER TABLE `‚ ‚ ‚ ` ADD `‚©‚©‚©` char(1) FIRST;
-ALTER TABLE `‚ ‚ ‚ ` ADD `‚­‚­‚­` char(1) AFTER
`‚«‚«‚«`;
-ALTER TABLE `‚ ‚ ‚ ` ADD `‚¯‚¯‚¯` char(1);
-ALTER TABLE `‚ ‚ ‚ ` ADD INDEX (`‚©‚©‚©`);
-ALTER TABLE `‚ ‚ ‚ ` ADD PRIMARY KEY (`‚«‚«‚«`);
-ALTER TABLE `‚ ‚ ‚ ` CHANGE `‚©‚©‚©` `‚©‚©`
char(1);
-ALTER TABLE `‚ ‚ ‚ ` MODIFY `‚«‚«‚«` char(6);
-SELECT * FROM `‚ ‚ ‚ `;
-‚©‚©	‚«‚«‚«	‚­‚­‚­	‚¯‚¯‚¯
-NULL	‚ ‚ ‚ ‚ ‚ 	NULL	NULL
-NULL	‚¢‚¢‚¢‚¢‚¢	NULL	NULL
-NULL	‚¤‚¤‚¤‚¤‚¤	NULL	NULL
-DESC `‚ ‚ ‚ `;
-Field	Type	Null	Key	Default	Extra
-‚©‚©	char(1)	YES	MUL	NULL	
-‚«‚«‚«	char(6)		PRI		
-‚­‚­‚­	char(1)	YES		NULL	
-‚¯‚¯‚¯	char(1)	YES		NULL	
-SHOW CREATE TABLE `‚ ‚ ‚ `;
-Table	Create Table
-‚ ‚ ‚ 	CREATE TABLE `‚ ‚ ‚ ` (
-  `‚©‚©` char(1) default NULL,
-  `‚«‚«‚«` char(6) NOT NULL default '',
-  `‚­‚­‚­` char(1) default NULL,
-  `‚¯‚¯‚¯` char(1) default NULL,
-  PRIMARY KEY  (`‚«‚«‚«`),
-  KEY `‚©‚©‚©` (`‚©‚©`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-ALTER TABLE `‚ ‚ ‚ ` DROP INDEX `‚©‚©‚©`;
-ALTER TABLE `‚ ‚ ‚ ` DROP PRIMARY KEY;
-ALTER TABLE `‚ ‚ ‚ ` DROP `‚©‚©`;
-ALTER TABLE `‚ ‚ ‚ ` DROP `‚­‚­‚­`;
-ALTER TABLE `‚ ‚ ‚ ` DROP `‚¯‚¯‚¯`;
-SELECT * FROM `‚ ‚ ‚ `;
-‚«‚«‚«
-‚ ‚ ‚ ‚ ‚ 
-‚¢‚¢‚¢‚¢‚¢
-‚¤‚¤‚¤‚¤‚¤
-DESC `‚ ‚ ‚ `;
-Field	Type	Null	Key	Default	Extra
-‚«‚«‚«	char(6)				
-SHOW CREATE TABLE `‚ ‚ ‚ `;
-Table	Create Table
-‚ ‚ ‚ 	CREATE TABLE `‚ ‚ ‚ ` (
-  `‚«‚«‚«` char(6) NOT NULL default ''
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-ALTER TABLE `ƒ\ƒ\ƒ\` ADD `\\\` char(1) FIRST;
-ALTER TABLE `ƒ\ƒ\ƒ\` ADD `”\”\”\` char(1) AFTER `•\•\•\`;
-ALTER TABLE `ƒ\ƒ\ƒ\` ADD `—\—\—\` char(1);
-ALTER TABLE `ƒ\ƒ\ƒ\` ADD INDEX (`\\\`);
-ALTER TABLE `ƒ\ƒ\ƒ\` ADD PRIMARY KEY (`•\•\•\`);
-ALTER TABLE `ƒ\ƒ\ƒ\` CHANGE `\\\` `\\` char(1);
-ALTER TABLE `ƒ\ƒ\ƒ\` MODIFY `•\•\•\` char(6);
-SELECT * FROM `ƒ\ƒ\ƒ\`;
-\\	•\•\•\	”\”\”\	—\—\—\
-NULL	\\\\\	NULL	NULL
-NULL	”\”\”\”\”\	NULL	NULL
-NULL	•\•\•\•\•\	NULL	NULL
-DESC `ƒ\ƒ\ƒ\`;
-Field	Type	Null	Key	Default	Extra
-\\	char(1)	YES	MUL	NULL	
-•\•\•\	char(6)		PRI		
-”\”\”\	char(1)	YES		NULL	
-—\—\—\	char(1)	YES		NULL	
-SHOW CREATE TABLE `ƒ\ƒ\ƒ\`;
-Table	Create Table
-ƒ\ƒ\ƒ\	CREATE TABLE `ƒ\ƒ\ƒ\` (
-  `\\` char(1) default NULL,
-  `•\•\•\` char(6) NOT NULL default '',
-  `”\”\”\` char(1) default NULL,
-  `—\—\—\` char(1) default NULL,
-  PRIMARY KEY  (`•\•\•\`),
-  KEY `\\\` (`\\`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
-ALTER TABLE `ƒ\ƒ\ƒ\` DROP INDEX `\\\`;
-ALTER TABLE `ƒ\ƒ\ƒ\` DROP PRIMARY KEY;
-ALTER TABLE `ƒ\ƒ\ƒ\` DROP `\\`;
-ALTER TABLE `ƒ\ƒ\ƒ\` DROP `”\”\”\`;
-ALTER TABLE `ƒ\ƒ\ƒ\` DROP `—\—\—\`;
-SELECT * FROM `ƒ\ƒ\ƒ\`;
-•\•\•\
-\\\\\
-”\”\”\”\”\
-•\•\•\•\•\
-DESC `ƒ\ƒ\ƒ\`;
-Field	Type	Null	Key	Default	Extra
-•\•\•\	char(6)				
-SHOW CREATE TABLE `ƒ\ƒ\ƒ\`;
-Table	Create Table
-ƒ\ƒ\ƒ\	CREATE TABLE `ƒ\ƒ\ƒ\` (
-  `•\•\•\` char(6) NOT NULL default ''
-) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis
+  `•\•\•\` char(6) NOT NULL DEFAULT ''
+) ENGINE=MEMORY DEFAULT CHARSET=sjis
 DROP TABLE `±±±`;
 DROP TABLE `²²²`;
 DROP TABLE `‚ ‚ ‚ `;
diff -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-09 23:10:03 +02:00
@@ -32,17 +32,17 @@ NULL	Ž³Ž³Ž³Ž³Ž³	NULL	NULL
 DESC `Ž±Ž±Ž±`;
 Field	Type	Null	Key	Default	Extra
 Ž¶Ž¶	char(1)	YES	MUL	NULL	
-Ž·Ž·Ž·	char(6)		PRI		
-Ž¸Ž¸Ž¸	char(1)	YES	MUL	NULL	
+Ž·Ž·Ž·	char(6)	NO	PRI		
+Ž¸Ž¸Ž¸	char(1)	YES	UNI	NULL	
 Ž¹Ž¹Ž¹	char(1)	YES		NULL	
 SHOW CREATE TABLE `Ž±Ž±Ž±`;
 Table	Create Table
 Ž±Ž±Ž±	CREATE TABLE `Ž±Ž±Ž±` (
-  `Ž¶Ž¶` char(1) default NULL,
-  `Ž·Ž·Ž·` char(6) NOT NULL default '',
-  `Ž¸Ž¸Ž¸` char(1) default NULL,
-  `Ž¹Ž¹Ž¹` char(1) default NULL,
-  PRIMARY KEY  (`Ž·Ž·Ž·`),
+  `Ž¶Ž¶` char(1) DEFAULT NULL,
+  `Ž·Ž·Ž·` char(6) NOT NULL DEFAULT '',
+  `Ž¸Ž¸Ž¸` char(1) DEFAULT NULL,
+  `Ž¹Ž¹Ž¹` char(1) DEFAULT NULL,
+  PRIMARY KEY (`Ž·Ž·Ž·`),
   UNIQUE KEY `Ž¸Ž¸Ž¸` (`Ž¸Ž¸Ž¸`),
   KEY `Ž¶Ž¶Ž¶` (`Ž¶Ž¶`)
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
@@ -59,11 +59,11 @@ SELECT * FROM `Ž±Ž±Ž±`;
 Ž³Ž³Ž³Ž³Ž³
 DESC `Ž±Ž±Ž±`;
 Field	Type	Null	Key	Default	Extra
-Ž·Ž·Ž·	char(6)				
+Ž·Ž·Ž·	char(6)	NO			
 SHOW CREATE TABLE `Ž±Ž±Ž±`;
 Table	Create Table
 Ž±Ž±Ž±	CREATE TABLE `Ž±Ž±Ž±` (
-  `Ž·Ž·Ž·` char(6) NOT NULL default ''
+  `Ž·Ž·Ž·` char(6) NOT NULL DEFAULT ''
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
 ALTER TABLE `¤¢¤¢¤¢` ADD
`¤«¤«¤«` char(1) FIRST;
 ALTER TABLE `¤¢¤¢¤¢` ADD
`¤¯¤¯¤¯` char(1) AFTER
`¤­¤­¤­`;
@@ -81,17 +81,17 @@
NULL	¤¦¤¦¤¦¤¦¤¦	NULL	NULL
 DESC `¤¢¤¢¤¢`;
 Field	Type	Null	Key	Default	Extra
 ¤«¤«	char(1)	YES	MUL	NULL	
-¤­¤­¤­	char(6)		PRI		
-¤¯¤¯¤¯	char(1)	YES	MUL	NULL	
+¤­¤­¤­	char(6)	NO	PRI		
+¤¯¤¯¤¯	char(1)	YES	UNI	NULL	
 ¤±¤±¤±	char(1)	YES		NULL	
 SHOW CREATE TABLE `¤¢¤¢¤¢`;
 Table	Create Table
 ¤¢¤¢¤¢	CREATE TABLE
`¤¢¤¢¤¢` (
-  `¤«¤«` char(1) default NULL,
-  `¤­¤­¤­` char(6) NOT NULL default '',
-  `¤¯¤¯¤¯` char(1) default NULL,
-  `¤±¤±¤±` char(1) default NULL,
-  PRIMARY KEY  (`¤­¤­¤­`),
+  `¤«¤«` char(1) DEFAULT NULL,
+  `¤­¤­¤­` char(6) NOT NULL DEFAULT '',
+  `¤¯¤¯¤¯` char(1) DEFAULT NULL,
+  `¤±¤±¤±` char(1) DEFAULT NULL,
+  PRIMARY KEY (`¤­¤­¤­`),
   UNIQUE KEY `¤¯¤¯¤¯`
(`¤¯¤¯¤¯`),
   KEY `¤«¤«¤«` (`¤«¤«`)
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
@@ -108,11 +108,11 @@ SELECT * FROM `¤¢¤¢¤¢`;
 ¤¦¤¦¤¦¤¦¤¦
 DESC `¤¢¤¢¤¢`;
 Field	Type	Null	Key	Default	Extra
-¤­¤­¤­	char(6)				
+¤­¤­¤­	char(6)	NO			
 SHOW CREATE TABLE `¤¢¤¢¤¢`;
 Table	Create Table
 ¤¢¤¢¤¢	CREATE TABLE
`¤¢¤¢¤¢` (
-  `¤­¤­¤­` char(6) NOT NULL default ''
+  `¤­¤­¤­` char(6) NOT NULL DEFAULT ''
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
 ALTER TABLE `νݏνݏνέ` ADD `°¢°¢°¢` char(1) FIRST;
 ALTER TABLE `νݏνݏνέ` ADD `°£°£°£` char(1) AFTER
`°¡°¡°¡`;
@@ -130,17 +130,17 @@
NULL	°£°£°£°£°£	NULL	NULL
 DESC `νݏνݏνέ`;
 Field	Type	Null	Key	Default	Extra
 °¢°¢	char(1)	YES	MUL	NULL	
-°¡°¡°¡	char(6)		PRI		
-°£°£°£	char(1)	YES	MUL	NULL	
+°¡°¡°¡	char(6)	NO	PRI		
+°£°£°£	char(1)	YES	UNI	NULL	
 °´°´°´	char(1)	YES		NULL	
 SHOW CREATE TABLE `νݏνݏνέ`;
 Table	Create Table
 νݏνݏνέ	CREATE TABLE `νݏνݏνέ` (
-  `°¢°¢` char(1) default NULL,
-  `°¡°¡°¡` char(6) NOT NULL default '',
-  `°£°£°£` char(1) default NULL,
-  `°´°´°´` char(1) default NULL,
-  PRIMARY KEY  (`°¡°¡°¡`),
+  `°¢°¢` char(1) DEFAULT NULL,
+  `°¡°¡°¡` char(6) NOT NULL DEFAULT '',
+  `°£°£°£` char(1) DEFAULT NULL,
+  `°´°´°´` char(1) DEFAULT NULL,
+  PRIMARY KEY (`°¡°¡°¡`),
   UNIQUE KEY `°£°£°£`
(`°£°£°£`),
   KEY `°¢°¢°¢` (`°¢°¢`)
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
@@ -157,11 +157,11 @@ SELECT * FROM `νݏνݏνέ`;
 °£°£°£°£°£
 DESC `νݏνݏνέ`;
 Field	Type	Null	Key	Default	Extra
-°¡°¡°¡	char(6)				
+°¡°¡°¡	char(6)	NO			
 SHOW CREATE TABLE `νݏνݏνέ`;
 Table	Create Table
 νݏνݏνέ	CREATE TABLE `νݏνݏνέ` (
-  `°¡°¡°¡` char(6) NOT NULL default ''
+  `°¡°¡°¡` char(6) NOT NULL DEFAULT ''
 ) ENGINE=InnoDB DEFAULT CHARSET=ucs2
 DROP TABLE `Ž±Ž±Ž±`;
 DROP TABLE `Ž²Ž²Ž²`;
@@ -194,17 +194,17 @@ NULL	Ž³Ž³Ž³Ž³Ž³	NULL	NULL
 DESC `Ž±Ž±Ž±`;
 Field	Type	Null	Key	Default	Extra
 Ž¶Ž¶	char(1)	YES	MUL	NULL	
-Ž·Ž·Ž·	char(6)		PRI		
-Ž¸Ž¸Ž¸	char(1)	YES	MUL	NULL	
+Ž·Ž·Ž·	char(6)	NO	PRI		
+Ž¸Ž¸Ž¸	char(1)	YES	UNI	NULL	
 Ž¹Ž¹Ž¹	char(1)	YES		NULL	
 SHOW CREATE TABLE `Ž±Ž±Ž±`;
 Table	Create Table
 Ž±Ž±Ž±	CREATE TABLE `Ž±Ž±Ž±` (
-  `Ž¶Ž¶` char(1) default NULL,
-  `Ž·Ž·Ž·` char(6) NOT NULL default '',
-  `Ž¸Ž¸Ž¸` char(1) default NULL,
-  `Ž¹Ž¹Ž¹` char(1) default NULL,
-  PRIMARY KEY  (`Ž·Ž·Ž·`),
+  `Ž¶Ž¶` char(1) DEFAULT NULL,
+  `Ž·Ž·Ž·` char(6) NOT NULL DEFAULT '',
+  `Ž¸Ž¸Ž¸` char(1) DEFAULT NULL,
+  `Ž¹Ž¹Ž¹` char(1) DEFAULT NULL,
+  PRIMARY KEY (`Ž·Ž·Ž·`),
   UNIQUE KEY `Ž¸Ž¸Ž¸` (`Ž¸Ž¸Ž¸`),
   KEY `Ž¶Ž¶Ž¶` (`Ž¶Ž¶`)
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
@@ -221,11 +221,11 @@ SELECT * FROM `Ž±Ž±Ž±`;
 Ž³Ž³Ž³Ž³Ž³
 DESC `Ž±Ž±Ž±`;
 Field	Type	Null	Key	Default	Extra
-Ž·Ž·Ž·	char(6)				
+Ž·Ž·Ž·	char(6)	NO			
 SHOW CREATE TABLE `Ž±Ž±Ž±`;
 Table	Create Table
 Ž±Ž±Ž±	CREATE TABLE `Ž±Ž±Ž±` (
-  `Ž·Ž·Ž·` char(6) NOT NULL default ''
+  `Ž·Ž·Ž·` char(6) NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
 ALTER TABLE `¤¢¤¢¤¢` ADD
`¤«¤«¤«` char(1) FIRST;
 ALTER TABLE `¤¢¤¢¤¢` ADD
`¤¯¤¯¤¯` char(1) AFTER
`¤­¤­¤­`;
@@ -243,17 +243,17 @@
NULL	¤¦¤¦¤¦¤¦¤¦	NULL	NULL
 DESC `¤¢¤¢¤¢`;
 Field	Type	Null	Key	Default	Extra
 ¤«¤«	char(1)	YES	MUL	NULL	
-¤­¤­¤­	char(6)		PRI		
-¤¯¤¯¤¯	char(1)	YES	MUL	NULL	
+¤­¤­¤­	char(6)	NO	PRI		
+¤¯¤¯¤¯	char(1)	YES	UNI	NULL	
 ¤±¤±¤±	char(1)	YES		NULL	
 SHOW CREATE TABLE `¤¢¤¢¤¢`;
 Table	Create Table
 ¤¢¤¢¤¢	CREATE TABLE
`¤¢¤¢¤¢` (
-  `¤«¤«` char(1) default NULL,
-  `¤­¤­¤­` char(6) NOT NULL default '',
-  `¤¯¤¯¤¯` char(1) default NULL,
-  `¤±¤±¤±` char(1) default NULL,
-  PRIMARY KEY  (`¤­¤­¤­`),
+  `¤«¤«` char(1) DEFAULT NULL,
+  `¤­¤­¤­` char(6) NOT NULL DEFAULT '',
+  `¤¯¤¯¤¯` char(1) DEFAULT NULL,
+  `¤±¤±¤±` char(1) DEFAULT NULL,
+  PRIMARY KEY (`¤­¤­¤­`),
   UNIQUE KEY `¤¯¤¯¤¯`
(`¤¯¤¯¤¯`),
   KEY `¤«¤«¤«` (`¤«¤«`)
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
@@ -270,11 +270,11 @@ SELECT * FROM `¤¢¤¢¤¢`;
 ¤¦¤¦¤¦¤¦¤¦
 DESC `¤¢¤¢¤¢`;
 Field	Type	Null	Key	Default	Extra
-¤­¤­¤­	char(6)				
+¤­¤­¤­	char(6)	NO			
 SHOW CREATE TABLE `¤¢¤¢¤¢`;
 Table	Create Table
 ¤¢¤¢¤¢	CREATE TABLE
`¤¢¤¢¤¢` (
-  `¤­¤­¤­` char(6) NOT NULL default ''
+  `¤­¤­¤­` char(6) NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
 ALTER TABLE `νݏνݏνέ` ADD `°¢°¢°¢` char(1) FIRST;
 ALTER TABLE `νݏνݏνέ` ADD `°£°£°£` char(1) AFTER
`°¡°¡°¡`;
@@ -292,17 +292,17 @@
NULL	°£°£°£°£°£	NULL	NULL
 DESC `νݏνݏνέ`;
 Field	Type	Null	Key	Default	Extra
 °¢°¢	char(1)	YES	MUL	NULL	
-°¡°¡°¡	char(6)		PRI		
-°£°£°£	char(1)	YES	MUL	NULL	
+°¡°¡°¡	char(6)	NO	PRI		
+°£°£°£	char(1)	YES	UNI	NULL	
 °´°´°´	char(1)	YES		NULL	
 SHOW CREATE TABLE `νݏνݏνέ`;
 Table	Create Table
 νݏνݏνέ	CREATE TABLE `νݏνݏνέ` (
-  `°¢°¢` char(1) default NULL,
-  `°¡°¡°¡` char(6) NOT NULL default '',
-  `°£°£°£` char(1) default NULL,
-  `°´°´°´` char(1) default NULL,
-  PRIMARY KEY  (`°¡°¡°¡`),
+  `°¢°¢` char(1) DEFAULT NULL,
+  `°¡°¡°¡` char(6) NOT NULL DEFAULT '',
+  `°£°£°£` char(1) DEFAULT NULL,
+  `°´°´°´` char(1) DEFAULT NULL,
+  PRIMARY KEY (`°¡°¡°¡`),
   UNIQUE KEY `°£°£°£`
(`°£°£°£`),
   KEY `°¢°¢°¢` (`°¢°¢`)
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
@@ -319,11 +319,11 @@ SELECT * FROM `νݏνݏνέ`;
 °£°£°£°£°£
 DESC `νݏνݏνέ`;
 Field	Type	Null	Key	Default	Extra
-°¡°¡°¡	char(6)				
+°¡°¡°¡	char(6)	NO			
 SHOW CREATE TABLE `νݏνݏνέ`;
 Table	Create Table
 νݏνݏνέ	CREATE TABLE `νݏνݏνέ` (
-  `°¡°¡°¡` char(6) NOT NULL default ''
+  `°¡°¡°¡` char(6) NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
 DROP TABLE `Ž±Ž±Ž±`;
 DROP TABLE `Ž²Ž²Ž²`;
@@ -331,12 +331,12 @@ DROP TABLE `¤¢¤¢¤¢`;
 DROP TABLE `¤¤¤¤¤¤`;
 DROP TABLE `νݏνݏνέ`;
 DROP TABLE `νޏνޏνή`;
-CREATE TABLE `Ž±Ž±Ž±`(`Ž·Ž·Ž·` char(5)) DEFAULT
CHARSET = ucs2 engine=HEAP;
-CREATE TABLE `Ž²Ž²Ž²`(`Ž¹Ž¹Ž¹` char(5)) DEFAULT CHARSET =
ucs2 engine=HEAP;
-CREATE TABLE
`¤¢¤¢¤¢`(`¤­¤­¤­`
char(5)) DEFAULT CHARSET = ucs2 engine=HEAP;
-CREATE TABLE
`¤¤¤¤¤¤`(`¤±¤±¤±`
char(5)) DEFAULT CHARSET = ucs2 engine=HEAP;
-CREATE TABLE `νݏνݏνέ`(`°¡°¡°¡` char(5)) DEFAULT
CHARSET = ucs2 engine=HEAP;
-CREATE TABLE `νޏνޏνή`(`°´°´°´` char(5)) DEFAULT
CHARSET = ucs2 engine=HEAP;
+CREATE TABLE `Ž±Ž±Ž±`(`Ž·Ž·Ž·` char(5)) DEFAULT
CHARSET = ucs2 engine=MEMORY;
+CREATE TABLE `Ž²Ž²Ž²`(`Ž¹Ž¹Ž¹` char(5)) DEFAULT CHARSET =
ucs2 engine=MEMORY;
+CREATE TABLE
`¤¢¤¢¤¢`(`¤­¤­¤­`
char(5)) DEFAULT CHARSET = ucs2 engine=MEMORY;
+CREATE TABLE
`¤¤¤¤¤¤`(`¤±¤±¤±`
char(5)) DEFAULT CHARSET = ucs2 engine=MEMORY;
+CREATE TABLE `νݏνݏνέ`(`°¡°¡°¡` char(5)) DEFAULT
CHARSET = ucs2 engine=MEMORY;
+CREATE TABLE `νޏνޏνή`(`°´°´°´` char(5)) DEFAULT
CHARSET = ucs2 engine=MEMORY;
 INSERT INTO `Ž±Ž±Ž±` VALUES
('Ž±Ž±Ž±Ž±Ž±'),('Ž²Ž²Ž²Ž²Ž²'),('Ž³Ž³Ž³Ž³Ž³');
 INSERT INTO `¤¢¤¢¤¢` VALUES
('¤¢¤¢¤¢¤¢¤¢'),('¤¤¤¤¤¤¤¤¤¤'),('¤¦¤¦¤¦¤¦¤¦');
 INSERT INTO `νݏνݏνέ` VALUES
('°¡°¡°¡°¡°¡'),('°¢°¢°¢°¢°¢'),('°£°£°£°£°£');
@@ -356,20 +356,20 @@ NULL	Ž³Ž³Ž³Ž³Ž³	NULL	NULL
 DESC `Ž±Ž±Ž±`;
 Field	Type	Null	Key	Default	Extra
 Ž¶Ž¶	char(1)	YES	MUL	NULL	
-Ž·Ž·Ž·	char(6)		PRI		
-Ž¸Ž¸Ž¸	char(1)	YES	MUL	NULL	
+Ž·Ž·Ž·	char(6)	NO	PRI		
+Ž¸Ž¸Ž¸	char(1)	YES	UNI	NULL	
 Ž¹Ž¹Ž¹	char(1)	YES		NULL	
 SHOW CREATE TABLE `Ž±Ž±Ž±`;
 Table	Create Table
 Ž±Ž±Ž±	CREATE TABLE `Ž±Ž±Ž±` (
-  `Ž¶Ž¶` char(1) default NULL,
-  `Ž·Ž·Ž·` char(6) NOT NULL default '',
-  `Ž¸Ž¸Ž¸` char(1) default NULL,
-  `Ž¹Ž¹Ž¹` char(1) default NULL,
-  PRIMARY KEY  (`Ž·Ž·Ž·`),
+  `Ž¶Ž¶` char(1) DEFAULT NULL,
+  `Ž·Ž·Ž·` char(6) NOT NULL DEFAULT '',
+  `Ž¸Ž¸Ž¸` char(1) DEFAULT NULL,
+  `Ž¹Ž¹Ž¹` char(1) DEFAULT NULL,
+  PRIMARY KEY (`Ž·Ž·Ž·`),
   UNIQUE KEY `Ž¸Ž¸Ž¸` (`Ž¸Ž¸Ž¸`),
   KEY `Ž¶Ž¶Ž¶` (`Ž¶Ž¶`)
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 ALTER TABLE `Ž±Ž±Ž±` DROP INDEX `Ž¶Ž¶Ž¶`;
 ALTER TABLE `Ž±Ž±Ž±` DROP PRIMARY KEY;
 ALTER TABLE `Ž±Ž±Ž±` DROP INDEX `Ž¸Ž¸Ž¸`;
@@ -383,12 +383,12 @@ SELECT * FROM `Ž±Ž±Ž±`;
 Ž³Ž³Ž³Ž³Ž³
 DESC `Ž±Ž±Ž±`;
 Field	Type	Null	Key	Default	Extra
-Ž·Ž·Ž·	char(6)				
+Ž·Ž·Ž·	char(6)	NO			
 SHOW CREATE TABLE `Ž±Ž±Ž±`;
 Table	Create Table
 Ž±Ž±Ž±	CREATE TABLE `Ž±Ž±Ž±` (
-  `Ž·Ž·Ž·` char(6) NOT NULL default ''
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+  `Ž·Ž·Ž·` char(6) NOT NULL DEFAULT ''
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 ALTER TABLE `¤¢¤¢¤¢` ADD
`¤«¤«¤«` char(1) FIRST;
 ALTER TABLE `¤¢¤¢¤¢` ADD
`¤¯¤¯¤¯` char(1) AFTER
`¤­¤­¤­`;
 ALTER TABLE `¤¢¤¢¤¢` ADD
`¤±¤±¤±` char(1);
@@ -405,20 +405,20 @@
NULL	¤¦¤¦¤¦¤¦¤¦	NULL	NULL
 DESC `¤¢¤¢¤¢`;
 Field	Type	Null	Key	Default	Extra
 ¤«¤«	char(1)	YES	MUL	NULL	
-¤­¤­¤­	char(6)		PRI		
-¤¯¤¯¤¯	char(1)	YES	MUL	NULL	
+¤­¤­¤­	char(6)	NO	PRI		
+¤¯¤¯¤¯	char(1)	YES	UNI	NULL	
 ¤±¤±¤±	char(1)	YES		NULL	
 SHOW CREATE TABLE `¤¢¤¢¤¢`;
 Table	Create Table
 ¤¢¤¢¤¢	CREATE TABLE
`¤¢¤¢¤¢` (
-  `¤«¤«` char(1) default NULL,
-  `¤­¤­¤­` char(6) NOT NULL default '',
-  `¤¯¤¯¤¯` char(1) default NULL,
-  `¤±¤±¤±` char(1) default NULL,
-  PRIMARY KEY  (`¤­¤­¤­`),
+  `¤«¤«` char(1) DEFAULT NULL,
+  `¤­¤­¤­` char(6) NOT NULL DEFAULT '',
+  `¤¯¤¯¤¯` char(1) DEFAULT NULL,
+  `¤±¤±¤±` char(1) DEFAULT NULL,
+  PRIMARY KEY (`¤­¤­¤­`),
   UNIQUE KEY `¤¯¤¯¤¯`
(`¤¯¤¯¤¯`),
   KEY `¤«¤«¤«` (`¤«¤«`)
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 ALTER TABLE `¤¢¤¢¤¢` DROP INDEX
`¤«¤«¤«`;
 ALTER TABLE `¤¢¤¢¤¢` DROP PRIMARY KEY;
 ALTER TABLE `¤¢¤¢¤¢` DROP INDEX
`¤¯¤¯¤¯`;
@@ -432,12 +432,12 @@ SELECT * FROM `¤¢¤¢¤¢`;
 ¤¦¤¦¤¦¤¦¤¦
 DESC `¤¢¤¢¤¢`;
 Field	Type	Null	Key	Default	Extra
-¤­¤­¤­	char(6)				
+¤­¤­¤­	char(6)	NO			
 SHOW CREATE TABLE `¤¢¤¢¤¢`;
 Table	Create Table
 ¤¢¤¢¤¢	CREATE TABLE
`¤¢¤¢¤¢` (
-  `¤­¤­¤­` char(6) NOT NULL default ''
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+  `¤­¤­¤­` char(6) NOT NULL DEFAULT ''
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 ALTER TABLE `νݏνݏνέ` ADD `°¢°¢°¢` char(1) FIRST;
 ALTER TABLE `νݏνݏνέ` ADD `°£°£°£` char(1) AFTER
`°¡°¡°¡`;
 ALTER TABLE `νݏνݏνέ` ADD `°´°´°´` char(1);
@@ -454,20 +454,20 @@
NULL	°£°£°£°£°£	NULL	NULL
 DESC `νݏνݏνέ`;
 Field	Type	Null	Key	Default	Extra
 °¢°¢	char(1)	YES	MUL	NULL	
-°¡°¡°¡	char(6)		PRI		
-°£°£°£	char(1)	YES	MUL	NULL	
+°¡°¡°¡	char(6)	NO	PRI		
+°£°£°£	char(1)	YES	UNI	NULL	
 °´°´°´	char(1)	YES		NULL	
 SHOW CREATE TABLE `νݏνݏνέ`;
 Table	Create Table
 νݏνݏνέ	CREATE TABLE `νݏνݏνέ` (
-  `°¢°¢` char(1) default NULL,
-  `°¡°¡°¡` char(6) NOT NULL default '',
-  `°£°£°£` char(1) default NULL,
-  `°´°´°´` char(1) default NULL,
-  PRIMARY KEY  (`°¡°¡°¡`),
+  `°¢°¢` char(1) DEFAULT NULL,
+  `°¡°¡°¡` char(6) NOT NULL DEFAULT '',
+  `°£°£°£` char(1) DEFAULT NULL,
+  `°´°´°´` char(1) DEFAULT NULL,
+  PRIMARY KEY (`°¡°¡°¡`),
   UNIQUE KEY `°£°£°£`
(`°£°£°£`),
   KEY `°¢°¢°¢` (`°¢°¢`)
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 ALTER TABLE `νݏνݏνέ` DROP INDEX `°¢°¢°¢`;
 ALTER TABLE `νݏνݏνέ` DROP PRIMARY KEY;
 ALTER TABLE `νݏνݏνέ` DROP INDEX `°£°£°£`;
@@ -481,165 +481,12 @@ SELECT * FROM `νݏνݏνέ`;
 °£°£°£°£°£
 DESC `νݏνݏνέ`;
 Field	Type	Null	Key	Default	Extra
-°¡°¡°¡	char(6)				
+°¡°¡°¡	char(6)	NO			
 SHOW CREATE TABLE `νݏνݏνέ`;
 Table	Create Table
 νݏνݏνέ	CREATE TABLE `νݏνݏνέ` (
-  `°¡°¡°¡` char(6) NOT NULL default ''
-) ENGINE=HEAP DEFAULT CHARSET=ucs2
-DROP TABLE `Ž±Ž±Ž±`;
-DROP TABLE `Ž²Ž²Ž²`;
-DROP TABLE `¤¢¤¢¤¢`;
-DROP TABLE `¤¤¤¤¤¤`;
-DROP TABLE `νݏνݏνέ`;
-DROP TABLE `νޏνޏνή`;
-CREATE TABLE `Ž±Ž±Ž±`(`Ž·Ž·Ž·` char(5)) DEFAULT
CHARSET = ucs2 engine=BDB;
-CREATE TABLE `Ž²Ž²Ž²`(`Ž¹Ž¹Ž¹` char(5)) DEFAULT CHARSET =
ucs2 engine=BDB;
-CREATE TABLE
`¤¢¤¢¤¢`(`¤­¤­¤­`
char(5)) DEFAULT CHARSET = ucs2 engine=BDB;
-CREATE TABLE
`¤¤¤¤¤¤`(`¤±¤±¤±`
char(5)) DEFAULT CHARSET = ucs2 engine=BDB;
-CREATE TABLE `νݏνݏνέ`(`°¡°¡°¡` char(5)) DEFAULT
CHARSET = ucs2 engine=BDB;
-CREATE TABLE `νޏνޏνή`(`°´°´°´` char(5)) DEFAULT
CHARSET = ucs2 engine=BDB;
-INSERT INTO `Ž±Ž±Ž±` VALUES
('Ž±Ž±Ž±Ž±Ž±'),('Ž²Ž²Ž²Ž²Ž²'),('Ž³Ž³Ž³Ž³Ž³');
-INSERT INTO `¤¢¤¢¤¢` VALUES
('¤¢¤¢¤¢¤¢¤¢'),('¤¤¤¤¤¤¤¤¤¤'),('¤¦¤¦¤¦¤¦¤¦');
-INSERT INTO `νݏνݏνέ` VALUES
('°¡°¡°¡°¡°¡'),('°¢°¢°¢°¢°¢'),('°£°£°£°£°£');
-ALTER TABLE `Ž±Ž±Ž±` ADD `Ž¶Ž¶Ž¶` char(1) FIRST;
-ALTER TABLE `Ž±Ž±Ž±` ADD `Ž¸Ž¸Ž¸` char(1) AFTER
`Ž·Ž·Ž·`;
-ALTER TABLE `Ž±Ž±Ž±` ADD `Ž¹Ž¹Ž¹` char(1);
-ALTER TABLE `Ž±Ž±Ž±` ADD INDEX (`Ž¶Ž¶Ž¶`);
-ALTER TABLE `Ž±Ž±Ž±` ADD PRIMARY KEY
(`Ž·Ž·Ž·`);
-ALTER TABLE `Ž±Ž±Ž±` CHANGE `Ž¶Ž¶Ž¶` `Ž¶Ž¶`
char(1);
-ALTER TABLE `Ž±Ž±Ž±` MODIFY `Ž·Ž·Ž·` char(6);
-SELECT * FROM `Ž±Ž±Ž±`;
-Ž¶Ž¶	Ž·Ž·Ž·	Ž¸Ž¸Ž¸	Ž¹Ž¹Ž¹
-NULL	Ž±Ž±Ž±Ž±Ž±	NULL	NULL
-NULL	Ž²Ž²Ž²Ž²Ž²	NULL	NULL
-NULL	Ž³Ž³Ž³Ž³Ž³	NULL	NULL
-DESC `Ž±Ž±Ž±`;
-Field	Type	Null	Key	Default	Extra
-Ž¶Ž¶	char(1)	YES	MUL	NULL	
-Ž·Ž·Ž·	char(6)		PRI		
-Ž¸Ž¸Ž¸	char(1)	YES		NULL	
-Ž¹Ž¹Ž¹	char(1)	YES		NULL	
-SHOW CREATE TABLE `Ž±Ž±Ž±`;
-Table	Create Table
-Ž±Ž±Ž±	CREATE TABLE `Ž±Ž±Ž±` (
-  `Ž¶Ž¶` char(1) default NULL,
-  `Ž·Ž·Ž·` char(6) NOT NULL default '',
-  `Ž¸Ž¸Ž¸` char(1) default NULL,
-  `Ž¹Ž¹Ž¹` char(1) default NULL,
-  PRIMARY KEY  (`Ž·Ž·Ž·`),
-  KEY `Ž¶Ž¶Ž¶` (`Ž¶Ž¶`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
-ALTER TABLE `Ž±Ž±Ž±` DROP INDEX `Ž¶Ž¶Ž¶`;
-ALTER TABLE `Ž±Ž±Ž±` DROP PRIMARY KEY;
-ALTER TABLE `Ž±Ž±Ž±` DROP `Ž¶Ž¶`;
-ALTER TABLE `Ž±Ž±Ž±` DROP `Ž¸Ž¸Ž¸`;
-ALTER TABLE `Ž±Ž±Ž±` DROP `Ž¹Ž¹Ž¹`;
-SELECT * FROM `Ž±Ž±Ž±`;
-Ž·Ž·Ž·
-Ž±Ž±Ž±Ž±Ž±
-Ž²Ž²Ž²Ž²Ž²
-Ž³Ž³Ž³Ž³Ž³
-DESC `Ž±Ž±Ž±`;
-Field	Type	Null	Key	Default	Extra
-Ž·Ž·Ž·	char(6)				
-SHOW CREATE TABLE `Ž±Ž±Ž±`;
-Table	Create Table
-Ž±Ž±Ž±	CREATE TABLE `Ž±Ž±Ž±` (
-  `Ž·Ž·Ž·` char(6) NOT NULL default ''
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
-ALTER TABLE `¤¢¤¢¤¢` ADD
`¤«¤«¤«` char(1) FIRST;
-ALTER TABLE `¤¢¤¢¤¢` ADD
`¤¯¤¯¤¯` char(1) AFTER
`¤­¤­¤­`;
-ALTER TABLE `¤¢¤¢¤¢` ADD
`¤±¤±¤±` char(1);
-ALTER TABLE `¤¢¤¢¤¢` ADD INDEX
(`¤«¤«¤«`);
-ALTER TABLE `¤¢¤¢¤¢` ADD PRIMARY KEY
(`¤­¤­¤­`);
-ALTER TABLE `¤¢¤¢¤¢` CHANGE
`¤«¤«¤«` `¤«¤«` char(1);
-ALTER TABLE `¤¢¤¢¤¢` MODIFY
`¤­¤­¤­` char(6);
-SELECT * FROM `¤¢¤¢¤¢`;
-¤«¤«	¤­¤­¤­	¤¯¤¯¤¯	¤±¤±¤±
-NULL	¤¢¤¢¤¢¤¢¤¢	NULL	NULL
-NULL	¤¤¤¤¤¤¤¤¤¤	NULL	NULL
-NULL	¤¦¤¦¤¦¤¦¤¦	NULL	NULL
-DESC `¤¢¤¢¤¢`;
-Field	Type	Null	Key	Default	Extra
-¤«¤«	char(1)	YES	MUL	NULL	
-¤­¤­¤­	char(6)		PRI		
-¤¯¤¯¤¯	char(1)	YES		NULL	
-¤±¤±¤±	char(1)	YES		NULL	
-SHOW CREATE TABLE `¤¢¤¢¤¢`;
-Table	Create Table
-¤¢¤¢¤¢	CREATE TABLE
`¤¢¤¢¤¢` (
-  `¤«¤«` char(1) default NULL,
-  `¤­¤­¤­` char(6) NOT NULL default '',
-  `¤¯¤¯¤¯` char(1) default NULL,
-  `¤±¤±¤±` char(1) default NULL,
-  PRIMARY KEY  (`¤­¤­¤­`),
-  KEY `¤«¤«¤«` (`¤«¤«`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
-ALTER TABLE `¤¢¤¢¤¢` DROP INDEX
`¤«¤«¤«`;
-ALTER TABLE `¤¢¤¢¤¢` DROP PRIMARY KEY;
-ALTER TABLE `¤¢¤¢¤¢` DROP
`¤«¤«`;
-ALTER TABLE `¤¢¤¢¤¢` DROP
`¤¯¤¯¤¯`;
-ALTER TABLE `¤¢¤¢¤¢` DROP
`¤±¤±¤±`;
-SELECT * FROM `¤¢¤¢¤¢`;
-¤­¤­¤­
-¤¢¤¢¤¢¤¢¤¢
-¤¤¤¤¤¤¤¤¤¤
-¤¦¤¦¤¦¤¦¤¦
-DESC `¤¢¤¢¤¢`;
-Field	Type	Null	Key	Default	Extra
-¤­¤­¤­	char(6)				
-SHOW CREATE TABLE `¤¢¤¢¤¢`;
-Table	Create Table
-¤¢¤¢¤¢	CREATE TABLE
`¤¢¤¢¤¢` (
-  `¤­¤­¤­` char(6) NOT NULL default ''
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
-ALTER TABLE `νݏνݏνέ` ADD `°¢°¢°¢` char(1) FIRST;
-ALTER TABLE `νݏνݏνέ` ADD `°£°£°£` char(1) AFTER
`°¡°¡°¡`;
-ALTER TABLE `νݏνݏνέ` ADD `°´°´°´` char(1);
-ALTER TABLE `νݏνݏνέ` ADD INDEX (`°¢°¢°¢`);
-ALTER TABLE `νݏνݏνέ` ADD PRIMARY KEY (`°¡°¡°¡`);
-ALTER TABLE `νݏνݏνέ` CHANGE `°¢°¢°¢`
`°¢°¢` char(1);
-ALTER TABLE `νݏνݏνέ` MODIFY `°¡°¡°¡` char(6);
-SELECT * FROM `νݏνݏνέ`;
-°¢°¢	°¡°¡°¡	°£°£°£	°´°´°´
-NULL	°¡°¡°¡°¡°¡	NULL	NULL
-NULL	°¢°¢°¢°¢°¢	NULL	NULL
-NULL	°£°£°£°£°£	NULL	NULL
-DESC `νݏνݏνέ`;
-Field	Type	Null	Key	Default	Extra
-°¢°¢	char(1)	YES	MUL	NULL	
-°¡°¡°¡	char(6)		PRI		
-°£°£°£	char(1)	YES		NULL	
-°´°´°´	char(1)	YES		NULL	
-SHOW CREATE TABLE `νݏνݏνέ`;
-Table	Create Table
-νݏνݏνέ	CREATE TABLE `νݏνݏνέ` (
-  `°¢°¢` char(1) default NULL,
-  `°¡°¡°¡` char(6) NOT NULL default '',
-  `°£°£°£` char(1) default NULL,
-  `°´°´°´` char(1) default NULL,
-  PRIMARY KEY  (`°¡°¡°¡`),
-  KEY `°¢°¢°¢` (`°¢°¢`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
-ALTER TABLE `νݏνݏνέ` DROP INDEX `°¢°¢°¢`;
-ALTER TABLE `νݏνݏνέ` DROP PRIMARY KEY;
-ALTER TABLE `νݏνݏνέ` DROP `°¢°¢`;
-ALTER TABLE `νݏνݏνέ` DROP `°£°£°£`;
-ALTER TABLE `νݏνݏνέ` DROP `°´°´°´`;
-SELECT * FROM `νݏνݏνέ`;
-°¡°¡°¡
-°¡°¡°¡°¡°¡
-°¢°¢°¢°¢°¢
-°£°£°£°£°£
-DESC `νݏνݏνέ`;
-Field	Type	Null	Key	Default	Extra
-°¡°¡°¡	char(6)				
-SHOW CREATE TABLE `νݏνݏνέ`;
-Table	Create Table
-νݏνݏνέ	CREATE TABLE `νݏνݏνέ` (
-  `°¡°¡°¡` char(6) NOT NULL default ''
-) ENGINE=BerkeleyDB DEFAULT CHARSET=ucs2
+  `°¡°¡°¡` char(6) NOT NULL DEFAULT ''
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2
 DROP TABLE `Ž±Ž±Ž±`;
 DROP TABLE `Ž²Ž²Ž²`;
 DROP TABLE `¤¢¤¢¤¢`;
diff -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-09 23:10:03 +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 `Ž¸Ž¸Ž¸` (`Ž¸Ž¸Ž¸`),