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 `Ｔ６`;
drop table if exists `Ｔ７`;
drop table if exists `Ｔ８`;
drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
SET NAMES utf8;
SET character_set_database = utf8;
CREATE TABLE `Ｔ１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5),
CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam;
CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam;
CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY;
INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
INSERT INTO `Ｔ２` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
INSERT INTO `Ｔ３` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
INSERT INTO `Ｔ８` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ'),('ｱｲｳｴ'),('ｱｲｳ'),('ｱｲ'),('ｱ'),('');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお'),('あいうえ'),('あいう'),('あい'),('あ'),('');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡'),('龔龖龗龞'),('龔龖龗'),('龔龖'),('龔'),('');
SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１`;
Ｃ１ CHAR_LENGTH(`Ｃ１`)
0
@@ -108,30 +99,6 @@ SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) F
龔龖 2
龔 1
0
-SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１０`;
-Ｃ１ CHAR_LENGTH(`Ｃ１`)
-ｱｲｳｴｵ 5
-ｱｲｳｴ 4
-ｱｲｳ 3
-ｱｲ 2
-ｱ 1
- 0
-SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１１`;
-Ｃ１ CHAR_LENGTH(`Ｃ１`)
-あいうえお 5
-あいうえ 4
-あいう 3
-あい 2
-あ 1
- 0
-SELECT `Ｃ１`, CHAR_LENGTH(`Ｃ１`) FROM `Ｔ１２`;
-Ｃ１ CHAR_LENGTH(`Ｃ１`)
-龔龖龗龞龡 5
-龔龖龗龞 4
-龔龖龗 3
-龔龖 2
-龔 1
- 0
DROP TABLE `Ｔ１`;
DROP TABLE `Ｔ２`;
DROP TABLE `Ｔ３`;
@@ -141,6 +108,3 @@ DROP TABLE `Ｔ６`;
DROP TABLE `Ｔ７`;
DROP TABLE `Ｔ８`;
DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff -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 `Ｔ６`;
drop table if exists `Ｔ７`;
drop table if exists `Ｔ８`;
drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
SET NAMES utf8;
SET character_set_database = utf8;
CREATE TABLE `Ｔ１` (`Ｃ１` char(20)) DEFAULT CHARSET = utf8 engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(20)
CREATE TABLE `Ｔ４` (`Ｃ１` char(20)) DEFAULT CHARSET = utf8 engine = myisam;
CREATE TABLE `Ｔ５` (`Ｃ１` char(20)) DEFAULT CHARSET = utf8 engine = myisam;
CREATE TABLE `Ｔ６` (`Ｃ１` char(20)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(20)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(20)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(20)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(20)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(20)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(20)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(20)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(20)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(20)) DEFAULT CHARSET = utf8 engine = MEMORY;
LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `Ｔ１`;
LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `Ｔ２`;
LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `Ｔ３`;
@@ -33,9 +27,6 @@ LOAD DATA LOCAL INFILE 'suite/jp/std_dat
LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `Ｔ７`;
LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `Ｔ８`;
LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `Ｔ９`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `Ｔ１０`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `Ｔ１１`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `Ｔ１２`;
SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ１`;
CHARSET(`Ｃ１`)
utf8
@@ -171,51 +162,6 @@ sjis
SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ９`;
CHARSET(CONVERT(`Ｃ１` USING ujis))
ujis
-SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ１０`;
-CHARSET(`Ｃ１`)
-utf8
-SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ１１`;
-CHARSET(`Ｃ１`)
-utf8
-SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ１２`;
-CHARSET(`Ｃ１`)
-utf8
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ１０`;
-CHARSET(CONVERT(`Ｃ１` USING utf8))
-utf8
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ１０`;
-CHARSET(CONVERT(`Ｃ１` USING ucs2))
-ucs2
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ１０`;
-CHARSET(CONVERT(`Ｃ１` USING sjis))
-sjis
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ１０`;
-CHARSET(CONVERT(`Ｃ１` USING ujis))
-ujis
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ１１`;
-CHARSET(CONVERT(`Ｃ１` USING utf8))
-utf8
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ１１`;
-CHARSET(CONVERT(`Ｃ１` USING ucs2))
-ucs2
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ１１`;
-CHARSET(CONVERT(`Ｃ１` USING sjis))
-sjis
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ１１`;
-CHARSET(CONVERT(`Ｃ１` USING ujis))
-ujis
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ１２`;
-CHARSET(CONVERT(`Ｃ１` USING utf8))
-utf8
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ１２`;
-CHARSET(CONVERT(`Ｃ１` USING ucs2))
-ucs2
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ１２`;
-CHARSET(CONVERT(`Ｃ１` USING sjis))
-sjis
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ１２`;
-CHARSET(CONVERT(`Ｃ１` USING ujis))
-ujis
drop table `Ｔ１`;
drop table `Ｔ２`;
drop table `Ｔ３`;
@@ -225,6 +171,3 @@ drop table `Ｔ６`;
drop table `Ｔ７`;
drop table `Ｔ８`;
drop table `Ｔ９`;
-drop table `Ｔ１０`;
-drop table `Ｔ１１`;
-drop table `Ｔ１２`;
diff -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 `Ｔ６`;
drop table if exists `Ｔ７`;
drop table if exists `Ｔ８`;
drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
SET NAMES utf8;
SET character_set_database = utf8;
CREATE TABLE `Ｔ１` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(20)
CREATE TABLE `Ｔ４` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam;
CREATE TABLE `Ｔ５` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam;
CREATE TABLE `Ｔ６` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY;
LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `Ｔ１`;
LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `Ｔ２`;
LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `Ｔ３`;
@@ -33,9 +27,6 @@ LOAD DATA LOCAL INFILE 'suite/jp/std_dat
LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `Ｔ７`;
LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `Ｔ８`;
LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `Ｔ９`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `Ｔ１０`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `Ｔ１１`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `Ｔ１２`;
SELECT `Ｃ１`, CONVERT(`Ｃ１` using ujis) FROM `Ｔ１`;
Ｃ１ CONVERT(`Ｃ１` using ujis)
!"#$%&'()*+,-./ !"#$%&'()*+,-./
@@ -1134,372 +1125,6 @@ SELECT `Ｃ１`, CONVERT(`Ｃ１` using
齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒 ????????????????????
龔龖龗龞龡龢龣龥・・・・・・・・・・・・ ????????・・・・・・・・・・・・
・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-SELECT `Ｃ１`, CONVERT(`Ｃ１` using ujis) FROM `Ｔ１０`;
-Ｃ１ CONVERT(`Ｃ１` using ujis)
- !"#$%&'()*+,-./ !"#$%&'()*+,-./
-0123456789:;<=>? 0123456789:;<=>?
-@ABCDEFGHIJKLMNO @ABCDEFGHIJKLMNO
-PQRSTUVWXYZ[\]^_ PQRSTUVWXYZ[\]^_
-abcdefghijklmno abcdefghijklmno
-pqrstuvwxyz{|}~ pqrstuvwxyz{|}~
- ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ
-ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ
-ﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏ ﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏ
-ﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ ﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ
-SELECT `Ｃ１`, CONVERT(`Ｃ１` using ucs2) FROM `Ｔ１０`;
-Ｃ１ CONVERT(`Ｃ１` using ucs2)
- !"#$%&'()*+,-./ !"#$%&'()*+,-./
-0123456789:;<=>? 0123456789:;<=>?
-@ABCDEFGHIJKLMNO @ABCDEFGHIJKLMNO
-PQRSTUVWXYZ[\]^_ PQRSTUVWXYZ[\]^_
-abcdefghijklmno abcdefghijklmno
-pqrstuvwxyz{|}~ pqrstuvwxyz{|}~
- ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ
-ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ
-ﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏ ﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏ
-ﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ ﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ
-SELECT `Ｃ１`, CONVERT(`Ｃ１` using sjis) FROM `Ｔ１０`;
-Ｃ１ CONVERT(`Ｃ１` using sjis)
- !"#$%&'()*+,-./ !"#$%&'()*+,-./
-0123456789:;<=>? 0123456789:;<=>?
-@ABCDEFGHIJKLMNO @ABCDEFGHIJKLMNO
-PQRSTUVWXYZ[\]^_ PQRSTUVWXYZ[\]^_
-abcdefghijklmno abcdefghijklmno
-pqrstuvwxyz{|}~ pqrstuvwxyz{|}~
- ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ
-ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ
-ﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏ ﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏ
-ﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ ﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ
-SELECT `Ｃ１`, CONVERT(`Ｃ１` using ujis) FROM `Ｔ１１`;
-Ｃ１ CONVERT(`Ｃ１` using ujis)
- 、。，．・：；？！゛゜´｀¨＾￣＿ヽ 、。，．・：；？！゛゜´｀¨＾￣＿ヽ
-ヾゝゞ〃仝々〆〇ー―‐／＼〜‖｜…‥‘’ ヾゝゞ〃仝々〆〇ー―‐／?〜‖｜…‥‘’
-“”（）〔〕［］｛｝〈〉《》「」『』【】 “”（）〔〕［］｛｝〈〉《》「」『』【】
-＋‐±×÷＝≠＜＞≦≧∞∴♂♀°′″℃￥ ＋‐±×÷＝≠＜＞≦≧∞∴♂♀°′″℃￥
-＄¢£％＃＆＊＠§☆★○●◎◇・・・・・ ＄¢£％＃＆＊＠§☆★○●◎◇・・・・・
-・◆□■△▲▽▼※〒→←↑↓〓・・・・・ ・◆□■△▲▽▼※〒→←↑↓〓・・・・・
-・・・・・・∈∋⊆⊇⊂⊃∪∩・・・・・・ ・・・・・・∈∋⊆⊇⊂⊃∪∩・・・・・・
-・・∧∨¬⇒⇔∀∃・・・・・・・・・・・ ・・∧∨¬⇒⇔∀∃・・・・・・・・・・・
-∠⊥⌒∂∇≡≒≪≫√∽∝∵∫∬・・・・・ ∠⊥⌒∂∇≡≒≪≫√∽∝∵∫∬・・・・・
-・・ʼn♯♭♪†‡¶・・・・◯・・・・ ・・ʼn♯♭♪†‡¶・・・・◯・・・・
-・・・・・・・・・・・・・・・・０１２３ ・・・・・・・・・・・・・・・・０１２３
-４５６７８９・・・・・・・ＡＢＣＤＥＦＧ ４５６７８９・・・・・・・ＡＢＣＤＥＦＧ
-ＨＩＪＫＬＭＮＯＰＱＲＳＴＵＶＷＸＹＺ・ ＨＩＪＫＬＭＮＯＰＱＲＳＴＵＶＷＸＹＺ・
-・・・・・ａｂｃｄｅｆｇｈｉｊｋｌｍｎｏ ・・・・・ａｂｃｄｅｆｇｈｉｊｋｌｍｎｏ
-ｐｑｒｓｔｕｖｗｘｙｚ・・・・・・・・・ ｐｑｒｓｔｕｖｗｘｙｚ・・・・・・・・・
-・ぁあぃいぅうぇえぉおかがきぎくぐけげこ ・ぁあぃいぅうぇえぉおかがきぎくぐけげこ
-ごさざしじすずせぜそぞただちぢっつづてで ごさざしじすずせぜそぞただちぢっつづてで
-とどなにぬねのはばぱひびぴふぶぷへべぺほ とどなにぬねのはばぱひびぴふぶぷへべぺほ
-ぼぽまみむめもゃやゅゆょよらりるれろゎわ ぼぽまみむめもゃやゅゆょよらりるれろゎわ
-ゐゑをん・・・・・・・・・・・・・・・・ ゐゑをん・・・・・・・・・・・・・・・・
-・ァアィイゥウェエォオカガキギクグケゲコ ・ァアィイゥウェエォオカガキギクグケゲコ
-ゴサザシジスズセゼソゾタダチヂッツヅテデ ゴサザシジスズセゼソゾタダチヂッツヅテデ
-トドナニヌネノハバパヒビピフブプヘベペホ トドナニヌネノハバパヒビピフブプヘベペホ
-ボポマミムメモャヤュユョヨラリルレロヮワ ボポマミムメモャヤュユョヨラリルレロヮワ
-ヰヱヲンヴヵヶ・・・・・・・・・・・・・ ヰヱヲンヴヵヶ・・・・・・・・・・・・・
-・ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤ ・ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤ
-ΥΦΧΨΩ・・・・・・・・αβγδεζη ΥΦΧΨΩ・・・・・・・・αβγδεζη
-θικλμνξοπρστυφχψω・・・ θικλμνξοπρστυφχψω・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・АБВГДЕЁЖЗИЙКЛМНОПРС ・АБВГДЕЁЖЗИЙКЛМНОПРС
-ТУФХЦЧШЩЪЫЬЭЮЯ・・・・・・ ТУФХЦЧШЩЪЫЬЭЮЯ・・・・・・
-・・・・・・・・・абвгдеёжзий ・・・・・・・・・абвгдеёжзий
-клмнопрстуфхцчшщъыьэ клмнопрстуфхцчшщъыьэ
-юя・・・・・・・・・・・・・・・・・・ юя・・・・・・・・・・・・・・・・・・
-・─│┌┐┘└├┬┤┴┼━┃┏┓┛┗┣┳ ・─│┌┐┘└├┬┤┴┼━┃┏┓┛┗┣┳
-┫┻╋┠┯┨┷┿┝┰┥┸╂・・・・・・・ ┫┻╋┠┯┨┷┿┝┰┥┸╂・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵 ・亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵
-梓圧斡扱宛姐虻飴絢綾鮎或粟袷安庵按暗案闇 梓圧斡扱宛姐虻飴絢綾鮎或粟袷安庵按暗案闇
-鞍杏以伊位依偉囲夷委威尉惟意慰易椅為畏異 鞍杏以伊位依偉囲夷委威尉惟意慰易椅為畏異
-移維緯胃萎衣謂違遺医井亥域育郁磯一壱溢逸 移維緯胃萎衣謂違遺医井亥域育郁磯一壱溢逸
-稲茨芋鰯允印咽員因姻引飲淫胤蔭・・・・・ 稲茨芋鰯允印咽員因姻引飲淫胤蔭・・・・・
-・蓮連錬呂魯櫓炉賂路露労婁廊弄朗楼榔浪漏 ・蓮連錬呂魯櫓炉賂路露労婁廊弄朗楼榔浪漏
-牢狼篭老聾蝋郎六麓禄肋録論倭和話歪賄脇惑 牢狼篭老聾蝋郎六麓禄肋録論倭和話歪賄脇惑
-枠鷲亙亘鰐詫藁蕨椀湾碗腕・・・・・・・・ 枠鷲亙亘鰐詫藁蕨椀湾碗腕・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞 ・弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞
-亟亠亢亰亳亶从仍仄仆仂仗仞仭仟价伉佚估佛 亟亠亢亰亳亶从仍仄仆仂仗仞仭仟价伉佚估佛
-佝佗佇佶侈侏侘佻佩佰侑佯來侖儘俔俟俎俘俛 佝佗佇佶侈侏侘佻佩佰侑佯來侖儘俔俟俎俘俛
-俑俚俐俤俥倚倨倔倪倥倅伜俶倡倩倬俾俯們倆 俑俚俐俤俥倚倨倔倪倥倅伜俶倡倩倬俾俯們倆
-偃假會偕偐偈做偖偬偸傀傚傅傴傲・・・・・ 偃假會偕偐偈做偖偬偸傀傚傅傴傲・・・・・
-・鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻 ・鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻
-鶸鶺鷆鷏鷂鷙鷓鷸鷦鷭鷯鷽鸚鸛鸞鹵鹹鹽麁麈 鶸鶺鷆鷏鷂鷙鷓鷸鷦鷭鷯鷽鸚鸛鸞鹵鹹鹽麁麈
-麋麌麒麕麑麝麥麩麸麪麭靡黌黎黏黐黔黜點黝 麋麌麒麕麑麝麥麩麸麪麭靡黌黎黏黐黔黜點黝
-黠黥黨黯黴黶黷黹黻黼黽鼇鼈皷鼕鼡鼬鼾齊齒 黠黥黨黯黴黶黷黹黻黼黽鼇鼈皷鼕鼡鼬鼾齊齒
-齔齣齟齠齡齦齧齬齪齷齲齶龕龜龠・・・・・ 齔齣齟齠齡齦齧齬齪齷齲齶龕龜龠・・・・・
-・堯槇遙瑤凜熙・・・・・・・・・・・・・ ・堯槇遙瑤凜熙・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-SELECT `Ｃ１`, CONVERT(`Ｃ１` using ucs2) FROM `Ｔ１１`;
-Ｃ１ CONVERT(`Ｃ１` using ucs2)
- 、。，．・：；？！゛゜´｀¨＾￣＿ヽ 、。，．・：；？！゛゜´｀¨＾￣＿ヽ
-ヾゝゞ〃仝々〆〇ー―‐／＼〜‖｜…‥‘’ ヾゝゞ〃仝々〆〇ー―‐／＼〜‖｜…‥‘’
-“”（）〔〕［］｛｝〈〉《》「」『』【】 “”（）〔〕［］｛｝〈〉《》「」『』【】
-＋‐±×÷＝≠＜＞≦≧∞∴♂♀°′″℃￥ ＋‐±×÷＝≠＜＞≦≧∞∴♂♀°′″℃￥
-＄¢£％＃＆＊＠§☆★○●◎◇・・・・・ ＄¢£％＃＆＊＠§☆★○●◎◇・・・・・
-・◆□■△▲▽▼※〒→←↑↓〓・・・・・ ・◆□■△▲▽▼※〒→←↑↓〓・・・・・
-・・・・・・∈∋⊆⊇⊂⊃∪∩・・・・・・ ・・・・・・∈∋⊆⊇⊂⊃∪∩・・・・・・
-・・∧∨¬⇒⇔∀∃・・・・・・・・・・・ ・・∧∨¬⇒⇔∀∃・・・・・・・・・・・
-∠⊥⌒∂∇≡≒≪≫√∽∝∵∫∬・・・・・ ∠⊥⌒∂∇≡≒≪≫√∽∝∵∫∬・・・・・
-・・ʼn♯♭♪†‡¶・・・・◯・・・・ ・・ʼn♯♭♪†‡¶・・・・◯・・・・
-・・・・・・・・・・・・・・・・０１２３ ・・・・・・・・・・・・・・・・０１２３
-４５６７８９・・・・・・・ＡＢＣＤＥＦＧ ４５６７８９・・・・・・・ＡＢＣＤＥＦＧ
-ＨＩＪＫＬＭＮＯＰＱＲＳＴＵＶＷＸＹＺ・ ＨＩＪＫＬＭＮＯＰＱＲＳＴＵＶＷＸＹＺ・
-・・・・・ａｂｃｄｅｆｇｈｉｊｋｌｍｎｏ ・・・・・ａｂｃｄｅｆｇｈｉｊｋｌｍｎｏ
-ｐｑｒｓｔｕｖｗｘｙｚ・・・・・・・・・ ｐｑｒｓｔｕｖｗｘｙｚ・・・・・・・・・
-・ぁあぃいぅうぇえぉおかがきぎくぐけげこ ・ぁあぃいぅうぇえぉおかがきぎくぐけげこ
-ごさざしじすずせぜそぞただちぢっつづてで ごさざしじすずせぜそぞただちぢっつづてで
-とどなにぬねのはばぱひびぴふぶぷへべぺほ とどなにぬねのはばぱひびぴふぶぷへべぺほ
-ぼぽまみむめもゃやゅゆょよらりるれろゎわ ぼぽまみむめもゃやゅゆょよらりるれろゎわ
-ゐゑをん・・・・・・・・・・・・・・・・ ゐゑをん・・・・・・・・・・・・・・・・
-・ァアィイゥウェエォオカガキギクグケゲコ ・ァアィイゥウェエォオカガキギクグケゲコ
-ゴサザシジスズセゼソゾタダチヂッツヅテデ ゴサザシジスズセゼソゾタダチヂッツヅテデ
-トドナニヌネノハバパヒビピフブプヘベペホ トドナニヌネノハバパヒビピフブプヘベペホ
-ボポマミムメモャヤュユョヨラリルレロヮワ ボポマミムメモャヤュユョヨラリルレロヮワ
-ヰヱヲンヴヵヶ・・・・・・・・・・・・・ ヰヱヲンヴヵヶ・・・・・・・・・・・・・
-・ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤ ・ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤ
-ΥΦΧΨΩ・・・・・・・・αβγδεζη ΥΦΧΨΩ・・・・・・・・αβγδεζη
-θικλμνξοπρστυφχψω・・・ θικλμνξοπρστυφχψω・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・АБВГДЕЁЖЗИЙКЛМНОПРС ・АБВГДЕЁЖЗИЙКЛМНОПРС
-ТУФХЦЧШЩЪЫЬЭЮЯ・・・・・・ ТУФХЦЧШЩЪЫЬЭЮЯ・・・・・・
-・・・・・・・・・абвгдеёжзий ・・・・・・・・・абвгдеёжзий
-клмнопрстуфхцчшщъыьэ клмнопрстуфхцчшщъыьэ
-юя・・・・・・・・・・・・・・・・・・ юя・・・・・・・・・・・・・・・・・・
-・─│┌┐┘└├┬┤┴┼━┃┏┓┛┗┣┳ ・─│┌┐┘└├┬┤┴┼━┃┏┓┛┗┣┳
-┫┻╋┠┯┨┷┿┝┰┥┸╂・・・・・・・ ┫┻╋┠┯┨┷┿┝┰┥┸╂・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵 ・亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵
-梓圧斡扱宛姐虻飴絢綾鮎或粟袷安庵按暗案闇 梓圧斡扱宛姐虻飴絢綾鮎或粟袷安庵按暗案闇
-鞍杏以伊位依偉囲夷委威尉惟意慰易椅為畏異 鞍杏以伊位依偉囲夷委威尉惟意慰易椅為畏異
-移維緯胃萎衣謂違遺医井亥域育郁磯一壱溢逸 移維緯胃萎衣謂違遺医井亥域育郁磯一壱溢逸
-稲茨芋鰯允印咽員因姻引飲淫胤蔭・・・・・ 稲茨芋鰯允印咽員因姻引飲淫胤蔭・・・・・
-・蓮連錬呂魯櫓炉賂路露労婁廊弄朗楼榔浪漏 ・蓮連錬呂魯櫓炉賂路露労婁廊弄朗楼榔浪漏
-牢狼篭老聾蝋郎六麓禄肋録論倭和話歪賄脇惑 牢狼篭老聾蝋郎六麓禄肋録論倭和話歪賄脇惑
-枠鷲亙亘鰐詫藁蕨椀湾碗腕・・・・・・・・ 枠鷲亙亘鰐詫藁蕨椀湾碗腕・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞 ・弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞
-亟亠亢亰亳亶从仍仄仆仂仗仞仭仟价伉佚估佛 亟亠亢亰亳亶从仍仄仆仂仗仞仭仟价伉佚估佛
-佝佗佇佶侈侏侘佻佩佰侑佯來侖儘俔俟俎俘俛 佝佗佇佶侈侏侘佻佩佰侑佯來侖儘俔俟俎俘俛
-俑俚俐俤俥倚倨倔倪倥倅伜俶倡倩倬俾俯們倆 俑俚俐俤俥倚倨倔倪倥倅伜俶倡倩倬俾俯們倆
-偃假會偕偐偈做偖偬偸傀傚傅傴傲・・・・・ 偃假會偕偐偈做偖偬偸傀傚傅傴傲・・・・・
-・鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻 ・鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻
-鶸鶺鷆鷏鷂鷙鷓鷸鷦鷭鷯鷽鸚鸛鸞鹵鹹鹽麁麈 鶸鶺鷆鷏鷂鷙鷓鷸鷦鷭鷯鷽鸚鸛鸞鹵鹹鹽麁麈
-麋麌麒麕麑麝麥麩麸麪麭靡黌黎黏黐黔黜點黝 麋麌麒麕麑麝麥麩麸麪麭靡黌黎黏黐黔黜點黝
-黠黥黨黯黴黶黷黹黻黼黽鼇鼈皷鼕鼡鼬鼾齊齒 黠黥黨黯黴黶黷黹黻黼黽鼇鼈皷鼕鼡鼬鼾齊齒
-齔齣齟齠齡齦齧齬齪齷齲齶龕龜龠・・・・・ 齔齣齟齠齡齦齧齬齪齷齲齶龕龜龠・・・・・
-・堯槇遙瑤凜熙・・・・・・・・・・・・・ ・堯槇遙瑤凜熙・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-SELECT `Ｃ１`, CONVERT(`Ｃ１` using sjis) FROM `Ｔ１１`;
-Ｃ１ CONVERT(`Ｃ１` using sjis)
- 、。，．・：；？！゛゜´｀¨＾￣＿ヽ 、。，．・：；？！゛゜´｀¨＾￣＿ヽ
-ヾゝゞ〃仝々〆〇ー―‐／＼〜‖｜…‥‘’ ヾゝゞ〃仝々〆〇ー―‐／?〜‖｜…‥‘’
-“”（）〔〕［］｛｝〈〉《》「」『』【】 “”（）〔〕［］｛｝〈〉《》「」『』【】
-＋‐±×÷＝≠＜＞≦≧∞∴♂♀°′″℃￥ ＋‐±×÷＝≠＜＞≦≧∞∴♂♀°′″℃￥
-＄¢£％＃＆＊＠§☆★○●◎◇・・・・・ ＄¢£％＃＆＊＠§☆★○●◎◇・・・・・
-・◆□■△▲▽▼※〒→←↑↓〓・・・・・ ・◆□■△▲▽▼※〒→←↑↓〓・・・・・
-・・・・・・∈∋⊆⊇⊂⊃∪∩・・・・・・ ・・・・・・∈∋⊆⊇⊂⊃∪∩・・・・・・
-・・∧∨¬⇒⇔∀∃・・・・・・・・・・・ ・・∧∨¬⇒⇔∀∃・・・・・・・・・・・
-∠⊥⌒∂∇≡≒≪≫√∽∝∵∫∬・・・・・ ∠⊥⌒∂∇≡≒≪≫√∽∝∵∫∬・・・・・
-・・ʼn♯♭♪†‡¶・・・・◯・・・・ ・・ʼn♯♭♪†‡¶・・・・◯・・・・
-・・・・・・・・・・・・・・・・０１２３ ・・・・・・・・・・・・・・・・０１２３
-４５６７８９・・・・・・・ＡＢＣＤＥＦＧ ４５６７８９・・・・・・・ＡＢＣＤＥＦＧ
-ＨＩＪＫＬＭＮＯＰＱＲＳＴＵＶＷＸＹＺ・ ＨＩＪＫＬＭＮＯＰＱＲＳＴＵＶＷＸＹＺ・
-・・・・・ａｂｃｄｅｆｇｈｉｊｋｌｍｎｏ ・・・・・ａｂｃｄｅｆｇｈｉｊｋｌｍｎｏ
-ｐｑｒｓｔｕｖｗｘｙｚ・・・・・・・・・ ｐｑｒｓｔｕｖｗｘｙｚ・・・・・・・・・
-・ぁあぃいぅうぇえぉおかがきぎくぐけげこ ・ぁあぃいぅうぇえぉおかがきぎくぐけげこ
-ごさざしじすずせぜそぞただちぢっつづてで ごさざしじすずせぜそぞただちぢっつづてで
-とどなにぬねのはばぱひびぴふぶぷへべぺほ とどなにぬねのはばぱひびぴふぶぷへべぺほ
-ぼぽまみむめもゃやゅゆょよらりるれろゎわ ぼぽまみむめもゃやゅゆょよらりるれろゎわ
-ゐゑをん・・・・・・・・・・・・・・・・ ゐゑをん・・・・・・・・・・・・・・・・
-・ァアィイゥウェエォオカガキギクグケゲコ ・ァアィイゥウェエォオカガキギクグケゲコ
-ゴサザシジスズセゼソゾタダチヂッツヅテデ ゴサザシジスズセゼソゾタダチヂッツヅテデ
-トドナニヌネノハバパヒビピフブプヘベペホ トドナニヌネノハバパヒビピフブプヘベペホ
-ボポマミムメモャヤュユョヨラリルレロヮワ ボポマミムメモャヤュユョヨラリルレロヮワ
-ヰヱヲンヴヵヶ・・・・・・・・・・・・・ ヰヱヲンヴヵヶ・・・・・・・・・・・・・
-・ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤ ・ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤ
-ΥΦΧΨΩ・・・・・・・・αβγδεζη ΥΦΧΨΩ・・・・・・・・αβγδεζη
-θικλμνξοπρστυφχψω・・・ θικλμνξοπρστυφχψω・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・АБВГДЕЁЖЗИЙКЛМНОПРС ・АБВГДЕЁЖЗИЙКЛМНОПРС
-ТУФХЦЧШЩЪЫЬЭЮЯ・・・・・・ ТУФХЦЧШЩЪЫЬЭЮЯ・・・・・・
-・・・・・・・・・абвгдеёжзий ・・・・・・・・・абвгдеёжзий
-клмнопрстуфхцчшщъыьэ клмнопрстуфхцчшщъыьэ
-юя・・・・・・・・・・・・・・・・・・ юя・・・・・・・・・・・・・・・・・・
-・─│┌┐┘└├┬┤┴┼━┃┏┓┛┗┣┳ ・─│┌┐┘└├┬┤┴┼━┃┏┓┛┗┣┳
-┫┻╋┠┯┨┷┿┝┰┥┸╂・・・・・・・ ┫┻╋┠┯┨┷┿┝┰┥┸╂・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵 ・亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵
-梓圧斡扱宛姐虻飴絢綾鮎或粟袷安庵按暗案闇 梓圧斡扱宛姐虻飴絢綾鮎或粟袷安庵按暗案闇
-鞍杏以伊位依偉囲夷委威尉惟意慰易椅為畏異 鞍杏以伊位依偉囲夷委威尉惟意慰易椅為畏異
-移維緯胃萎衣謂違遺医井亥域育郁磯一壱溢逸 移維緯胃萎衣謂違遺医井亥域育郁磯一壱溢逸
-稲茨芋鰯允印咽員因姻引飲淫胤蔭・・・・・ 稲茨芋鰯允印咽員因姻引飲淫胤蔭・・・・・
-・蓮連錬呂魯櫓炉賂路露労婁廊弄朗楼榔浪漏 ・蓮連錬呂魯櫓炉賂路露労婁廊弄朗楼榔浪漏
-牢狼篭老聾蝋郎六麓禄肋録論倭和話歪賄脇惑 牢狼篭老聾蝋郎六麓禄肋録論倭和話歪賄脇惑
-枠鷲亙亘鰐詫藁蕨椀湾碗腕・・・・・・・・ 枠鷲亙亘鰐詫藁蕨椀湾碗腕・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞 ・弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞
-亟亠亢亰亳亶从仍仄仆仂仗仞仭仟价伉佚估佛 亟亠亢亰亳亶从仍仄仆仂仗仞仭仟价伉佚估佛
-佝佗佇佶侈侏侘佻佩佰侑佯來侖儘俔俟俎俘俛 佝佗佇佶侈侏侘佻佩佰侑佯來侖儘俔俟俎俘俛
-俑俚俐俤俥倚倨倔倪倥倅伜俶倡倩倬俾俯們倆 俑俚俐俤俥倚倨倔倪倥倅伜俶倡倩倬俾俯們倆
-偃假會偕偐偈做偖偬偸傀傚傅傴傲・・・・・ 偃假會偕偐偈做偖偬偸傀傚傅傴傲・・・・・
-・鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻 ・鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻
-鶸鶺鷆鷏鷂鷙鷓鷸鷦鷭鷯鷽鸚鸛鸞鹵鹹鹽麁麈 鶸鶺鷆鷏鷂鷙鷓鷸鷦鷭鷯鷽鸚鸛鸞鹵鹹鹽麁麈
-麋麌麒麕麑麝麥麩麸麪麭靡黌黎黏黐黔黜點黝 麋麌麒麕麑麝麥麩麸麪麭靡黌黎黏黐黔黜點黝
-黠黥黨黯黴黶黷黹黻黼黽鼇鼈皷鼕鼡鼬鼾齊齒 黠黥黨黯黴黶黷黹黻黼黽鼇鼈皷鼕鼡鼬鼾齊齒
-齔齣齟齠齡齦齧齬齪齷齲齶龕龜龠・・・・・ 齔齣齟齠齡齦齧齬齪齷齲齶龕龜龠・・・・・
-・堯槇遙瑤凜熙・・・・・・・・・・・・・ ・堯槇遙瑤凜熙・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-SELECT `Ｃ１`, CONVERT(`Ｃ１` using ujis) FROM `Ｔ１２`;
-Ｃ１ CONVERT(`Ｃ１` using ujis)
-・・・・・・・・・・・・・・・˘ˇ¸˙˝ ・・・・・・・・・・・・・・・˘ˇ¸˙˝
-・˛˚～΄΅・・・・・・・・¡¦¿・・・ ・˛˚?΄΅・・・・・・・・¡¦¿・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・ºª©®™ ・・・・・・・・・・・・・・・ºª©®™
-¤№・・・・・・・・・・・・・・・・・・ ¤№・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・・・・・ΆΈΉΊΪ・Ό・ΎΫ・Ώ・・・ ・・・・・ΆΈΉΊΪ・Ό・ΎΫ・Ώ・・・
-・άέήίϊΐόςύϋΰώ・・・・・・・ ・άέήίϊΐόςύϋΰώ・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・ЂЃЄЅІЇ ・・・・・・・・・・・・・・ЂЃЄЅІЇ
-ЈЉЊЋЌЎЏ・・・・・・・・・・・・・ ЈЉЊЋЌЎЏ・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・・ђѓєѕіїјљњћќўџ・・・・・ ・・ђѓєѕіїјљњћќўџ・・・・・
-・ÆĐ・Ħ・IJ・ŁĿ・ŊØŒ・ŦÞ・・・ ・ÆĐ・Ħ・IJ・ŁĿ・ŊØŒ・ŦÞ・・・
-・・・・・・・・・・・・・æđðħıijĸ ・・・・・・・・・・・・・æđðħıijĸ
-łŀʼnŋøœßŧþ・・・・・・・・・・・ łŀʼnŋøœßŧþ・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・ÁÀÄÂĂǍĀĄÅÃĆĈČÇĊĎÉÈË ・ÁÀÄÂĂǍĀĄÅÃĆĈČÇĊĎÉÈË
-ÊĚĖĒĘ・ĜĞĢĠĤÍÌÏÎǏİĪĮĨ ÊĚĖĒĘ・ĜĞĢĠĤÍÌÏÎǏİĪĮĨ
-ĴĶĹĽĻŃŇŅÑÓÒÖÔǑŐŌÕŔŘŖ ĴĶĹĽĻŃŇŅÑÓÒÖÔǑŐŌÕŔŘŖ
-ŚŜŠŞŤŢÚÙÜÛŬǓŰŪŲŮŨǗǛǙ ŚŜŠŞŤŢÚÙÜÛŬǓŰŪŲŮŨǗǛǙ
-ǕŴÝŸŶŹŽŻ・・・・・・・・・・・・ ǕŴÝŸŶŹŽŻ・・・・・・・・・・・・
-・áàäâăǎāąåãćĉčçċďéèë ・áàäâăǎāąåãćĉčçċďéèë
-êěėēęǵĝğ・ġĥíìïîǐ・īįĩ êěėēęǵĝğ・ġĥíìïîǐ・īįĩ
-ĵķĺľļńňņñóòöôǒőōõŕřŗ ĵķĺľļńňņñóòöôǒőōõŕřŗ
-śŝšşťţúùüûŭǔűūųůũǘǜǚ śŝšşťţúùüûŭǔűūųůũǘǜǚ
-ǖŵýÿŷźžż・・・・・・・・・・・・ ǖŵýÿŷźžż・・・・・・・・・・・・
-・丂丄丅丌丒丟丣两丨丫丮丯丰丵乀乁乄乇乑 ・丂丄丅丌丒丟丣两丨丫丮丯丰丵乀乁乄乇乑
-乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠 乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠
-仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众 仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众
-伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘 伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘
-佟佣佪佬佮佱佷佸佹佺佽佾侁侂侄・・・・・ 佟佣佪佬佮佱佷佸佹佺佽佾侁侂侄・・・・・
-・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪 ・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪
-鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖 鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖
-齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒 齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒
-龔龖龗龞龡龢龣龥・・・・・・・・・・・・ 龔龖龗龞龡龢龣龥・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-SELECT `Ｃ１`, CONVERT(`Ｃ１` using ucs2) FROM `Ｔ１２`;
-Ｃ１ CONVERT(`Ｃ１` using ucs2)
-・・・・・・・・・・・・・・・˘ˇ¸˙˝ ・・・・・・・・・・・・・・・˘ˇ¸˙˝
-・˛˚～΄΅・・・・・・・・¡¦¿・・・ ・˛˚～΄΅・・・・・・・・¡¦¿・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・ºª©®™ ・・・・・・・・・・・・・・・ºª©®™
-¤№・・・・・・・・・・・・・・・・・・ ¤№・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・・・・・ΆΈΉΊΪ・Ό・ΎΫ・Ώ・・・ ・・・・・ΆΈΉΊΪ・Ό・ΎΫ・Ώ・・・
-・άέήίϊΐόςύϋΰώ・・・・・・・ ・άέήίϊΐόςύϋΰώ・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・ЂЃЄЅІЇ ・・・・・・・・・・・・・・ЂЃЄЅІЇ
-ЈЉЊЋЌЎЏ・・・・・・・・・・・・・ ЈЉЊЋЌЎЏ・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・・ђѓєѕіїјљњћќўџ・・・・・ ・・ђѓєѕіїјљњћќўџ・・・・・
-・ÆĐ・Ħ・IJ・ŁĿ・ŊØŒ・ŦÞ・・・ ・ÆĐ・Ħ・IJ・ŁĿ・ŊØŒ・ŦÞ・・・
-・・・・・・・・・・・・・æđðħıijĸ ・・・・・・・・・・・・・æđðħıijĸ
-łŀʼnŋøœßŧþ・・・・・・・・・・・ łŀʼnŋøœßŧþ・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・ÁÀÄÂĂǍĀĄÅÃĆĈČÇĊĎÉÈË ・ÁÀÄÂĂǍĀĄÅÃĆĈČÇĊĎÉÈË
-ÊĚĖĒĘ・ĜĞĢĠĤÍÌÏÎǏİĪĮĨ ÊĚĖĒĘ・ĜĞĢĠĤÍÌÏÎǏİĪĮĨ
-ĴĶĹĽĻŃŇŅÑÓÒÖÔǑŐŌÕŔŘŖ ĴĶĹĽĻŃŇŅÑÓÒÖÔǑŐŌÕŔŘŖ
-ŚŜŠŞŤŢÚÙÜÛŬǓŰŪŲŮŨǗǛǙ ŚŜŠŞŤŢÚÙÜÛŬǓŰŪŲŮŨǗǛǙ
-ǕŴÝŸŶŹŽŻ・・・・・・・・・・・・ ǕŴÝŸŶŹŽŻ・・・・・・・・・・・・
-・áàäâăǎāąåãćĉčçċďéèë ・áàäâăǎāąåãćĉčçċďéèë
-êěėēęǵĝğ・ġĥíìïîǐ・īįĩ êěėēęǵĝğ・ġĥíìïîǐ・īįĩ
-ĵķĺľļńňņñóòöôǒőōõŕřŗ ĵķĺľļńňņñóòöôǒőōõŕřŗ
-śŝšşťţúùüûŭǔűūųůũǘǜǚ śŝšşťţúùüûŭǔűūųůũǘǜǚ
-ǖŵýÿŷźžż・・・・・・・・・・・・ ǖŵýÿŷźžż・・・・・・・・・・・・
-・丂丄丅丌丒丟丣两丨丫丮丯丰丵乀乁乄乇乑 ・丂丄丅丌丒丟丣两丨丫丮丯丰丵乀乁乄乇乑
-乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠 乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠
-仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众 仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众
-伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘 伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘
-佟佣佪佬佮佱佷佸佹佺佽佾侁侂侄・・・・・ 佟佣佪佬佮佱佷佸佹佺佽佾侁侂侄・・・・・
-・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪 ・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪
-鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖 鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖
-齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒 齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒
-龔龖龗龞龡龢龣龥・・・・・・・・・・・・ 龔龖龗龞龡龢龣龥・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-SELECT `Ｃ１`, CONVERT(`Ｃ１` using sjis) FROM `Ｔ１２`;
-Ｃ１ CONVERT(`Ｃ１` using sjis)
-・・・・・・・・・・・・・・・˘ˇ¸˙˝ ・・・・・・・・・・・・・・・?????
-・˛˚～΄΅・・・・・・・・¡¦¿・・・ ・?????・・・・・・・・???・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・ºª©®™ ・・・・・・・・・・・・・・・?????
-¤№・・・・・・・・・・・・・・・・・・ ??・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・・・・・ΆΈΉΊΪ・Ό・ΎΫ・Ώ・・・ ・・・・・?????・?・??・?・・・
-・άέήίϊΐόςύϋΰώ・・・・・・・ ・????????????・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・ЂЃЄЅІЇ ・・・・・・・・・・・・・・??????
-ЈЉЊЋЌЎЏ・・・・・・・・・・・・・ ???????・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・・ђѓєѕіїјљњћќўџ・・・・・ ・・?????????????・・・・・
-・ÆĐ・Ħ・IJ・ŁĿ・ŊØŒ・ŦÞ・・・ ・??・?・?・??・???・??・・・
-・・・・・・・・・・・・・æđðħıijĸ ・・・・・・・・・・・・・???????
-łŀʼnŋøœßŧþ・・・・・・・・・・・ ?????????・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
-・ÁÀÄÂĂǍĀĄÅÃĆĈČÇĊĎÉÈË ・???????????????????
-ÊĚĖĒĘ・ĜĞĢĠĤÍÌÏÎǏİĪĮĨ ?????・??????????????
-ĴĶĹĽĻŃŇŅÑÓÒÖÔǑŐŌÕŔŘŖ ????????????????????
-ŚŜŠŞŤŢÚÙÜÛŬǓŰŪŲŮŨǗǛǙ ????????????????????
-ǕŴÝŸŶŹŽŻ・・・・・・・・・・・・ ????????・・・・・・・・・・・・
-・áàäâăǎāąåãćĉčçċďéèë ・???????????????????
-êěėēęǵĝğ・ġĥíìïîǐ・īįĩ ????????・???????・???
-ĵķĺľļńňņñóòöôǒőōõŕřŗ ????????????????????
-śŝšşťţúùüûŭǔűūųůũǘǜǚ ????????????????????
-ǖŵýÿŷźžż・・・・・・・・・・・・ ????????・・・・・・・・・・・・
-・丂丄丅丌丒丟丣两丨丫丮丯丰丵乀乁乄乇乑 ・???????????????????
-乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠 ????????????????????
-仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众 ????????????????????
-伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘 ????????????????????
-佟佣佪佬佮佱佷佸佹佺佽佾侁侂侄・・・・・ ???????????????・・・・・
-・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪 ・???????????????????
-鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖 ????????????????????
-齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒 ????????????????????
-龔龖龗龞龡龢龣龥・・・・・・・・・・・・ ????????・・・・・・・・・・・・
-・・・・・・・・・・・・・・・・・・・・ ・・・・・・・・・・・・・・・・・・・・
drop table `Ｔ１`;
drop table `Ｔ２`;
drop table `Ｔ３`;
@@ -1509,6 +1134,3 @@ drop table `Ｔ６`;
drop table `Ｔ７`;
drop table `Ｔ８`;
drop table `Ｔ９`;
-drop table `Ｔ１０`;
-drop table `Ｔ１１`;
-drop table `Ｔ１２`;
diff -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 `Ｔ６`;
drop table if exists `Ｔ７`;
drop table if exists `Ｔ８`;
drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
SET NAMES utf8;
SET character_set_database = utf8;
CREATE TABLE `Ｔ１` (`Ｃ１` ENUM('ｱ','ｲ','ｳ'), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = innodb;
CREATE TABLE `Ｔ４` (`Ｃ１` ENUM('ｱ','ｲ','ｳ'), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam;
CREATE TABLE `Ｔ５` (`Ｃ１` ENUM('あ','い','う'), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam;
CREATE TABLE `Ｔ６` (`Ｃ１` ENUM('龔','龖','龗'), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` ENUM('ｱ','ｲ','ｳ'), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` ENUM('あ','い','う'), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` ENUM('龔','龖','龗'), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` ENUM('ｱ','ｲ','ｳ'), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` ENUM('あ','い','う'), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` ENUM('龔','龖','龗'), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` ENUM('ｱ','ｲ','ｳ'), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` ENUM('あ','い','う'), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` ENUM('龔','龖','龗'), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY;
INSERT INTO `Ｔ１` VALUES ('ｱ'),('ｲ'),('ｳ');
INSERT INTO `Ｔ２` VALUES ('あ'),('い'),('う');
INSERT INTO `Ｔ３` VALUES ('龔'),('龖'),('龗');
INSERT INTO `Ｔ７` VALUES ('ｱ'),('ｲ'),('ｳ');
INSERT INTO `Ｔ８` VALUES ('あ'),('い'),('う');
INSERT INTO `Ｔ９` VALUES ('龔'),('龖'),('龗');
-INSERT INTO `Ｔ１０` VALUES ('ｱ'),('ｲ'),('ｳ');
-INSERT INTO `Ｔ１１` VALUES ('あ'),('い'),('う');
-INSERT INTO `Ｔ１２` VALUES ('龔'),('龖'),('龗');
SELECT * FROM `Ｔ１`;
Ｃ１
ｱ
@@ -81,93 +72,60 @@ SELECT * FROM `Ｔ９`;
龔
龖
龗
-SELECT * FROM `Ｔ１０`;
-Ｃ１
-ｱ
-ｲ
-ｳ
-SELECT * FROM `Ｔ１１`;
-Ｃ１
-あ
-い
-う
-SELECT * FROM `Ｔ１２`;
-Ｃ１
-龔
-龖
-龗
SHOW CREATE TABLE `Ｔ１`;
Table Create Table
Ｔ１ CREATE TABLE `Ｔ１` (
- `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL,
+ `Ｃ１` enum('ｱ','ｲ','ｳ') DEFAULT NULL,
KEY `Ｃ１` (`Ｃ１`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8
SHOW CREATE TABLE `Ｔ２`;
Table Create Table
Ｔ２ CREATE TABLE `Ｔ２` (
- `Ｃ１` enum('あ','い','う') default NULL,
+ `Ｃ１` enum('あ','い','う') DEFAULT NULL,
KEY `Ｃ１` (`Ｃ１`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8
SHOW CREATE TABLE `Ｔ３`;
Table Create Table
Ｔ３ CREATE TABLE `Ｔ３` (
- `Ｃ１` enum('龔','龖','龗') default NULL,
+ `Ｃ１` enum('龔','龖','龗') DEFAULT NULL,
KEY `Ｃ１` (`Ｃ１`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8
SHOW CREATE TABLE `Ｔ４`;
Table Create Table
Ｔ４ CREATE TABLE `Ｔ４` (
- `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL,
+ `Ｃ１` enum('ｱ','ｲ','ｳ') DEFAULT NULL,
KEY `Ｃ１` (`Ｃ１`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8
SHOW CREATE TABLE `Ｔ５`;
Table Create Table
Ｔ５ CREATE TABLE `Ｔ５` (
- `Ｃ１` enum('あ','い','う') default NULL,
+ `Ｃ１` enum('あ','い','う') DEFAULT NULL,
KEY `Ｃ１` (`Ｃ１`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8
SHOW CREATE TABLE `Ｔ６`;
Table Create Table
Ｔ６ CREATE TABLE `Ｔ６` (
- `Ｃ１` enum('龔','龖','龗') default NULL,
+ `Ｃ１` enum('龔','龖','龗') DEFAULT NULL,
KEY `Ｃ１` (`Ｃ１`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8
SHOW CREATE TABLE `Ｔ７`;
Table Create Table
Ｔ７ CREATE TABLE `Ｔ７` (
- `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL,
+ `Ｃ１` enum('ｱ','ｲ','ｳ') DEFAULT NULL,
KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
SHOW CREATE TABLE `Ｔ８`;
Table Create Table
Ｔ８ CREATE TABLE `Ｔ８` (
- `Ｃ１` enum('あ','い','う') default NULL,
+ `Ｃ１` enum('あ','い','う') DEFAULT NULL,
KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
SHOW CREATE TABLE `Ｔ９`;
Table Create Table
Ｔ９ CREATE TABLE `Ｔ９` (
- `Ｃ１` enum('龔','龖','龗') default NULL,
- KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=HEAP DEFAULT CHARSET=utf8
-SHOW CREATE TABLE `Ｔ１０`;
-Table Create Table
-Ｔ１０ CREATE TABLE `Ｔ１０` (
- `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL,
- KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
-SHOW CREATE TABLE `Ｔ１１`;
-Table Create Table
-Ｔ１１ CREATE TABLE `Ｔ１１` (
- `Ｃ１` enum('あ','い','う') default NULL,
- KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
-SHOW CREATE TABLE `Ｔ１２`;
-Table Create Table
-Ｔ１２ CREATE TABLE `Ｔ１２` (
- `Ｃ１` enum('龔','龖','龗') default NULL,
+ `Ｃ１` enum('龔','龖','龗') DEFAULT NULL,
KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
DESC `Ｔ１`;
Field Type Null Key Default Extra
Ｃ１ enum('ｱ','ｲ','ｳ') YES MUL NULL
@@ -195,15 +153,6 @@ Field Type Null Key Default Extra
DESC `Ｔ９`;
Field Type Null Key Default Extra
Ｃ１ enum('龔','龖','龗') YES MUL NULL
-DESC `Ｔ１０`;
-Field Type Null Key Default Extra
-Ｃ１ enum('ｱ','ｲ','ｳ') YES MUL NULL
-DESC `Ｔ１１`;
-Field Type Null Key Default Extra
-Ｃ１ enum('あ','い','う') YES MUL NULL
-DESC `Ｔ１２`;
-Field Type Null Key Default Extra
-Ｃ１ enum('龔','龖','龗') YES MUL NULL
ALTER TABLE `Ｔ１` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
ALTER TABLE `Ｔ２` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
ALTER TABLE `Ｔ３` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
@@ -213,140 +162,104 @@ ALTER TABLE `Ｔ６` ADD `Ｃ２` CHAR(1
ALTER TABLE `Ｔ７` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
ALTER TABLE `Ｔ８` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
ALTER TABLE `Ｔ９` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
-ALTER TABLE `Ｔ１０` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
-ALTER TABLE `Ｔ１１` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
-ALTER TABLE `Ｔ１２` ADD `Ｃ２` CHAR(1) NOT NULL FIRST;
SHOW CREATE TABLE `Ｔ１`;
Table Create Table
Ｔ１ CREATE TABLE `Ｔ１` (
- `Ｃ２` char(1) NOT NULL default '',
- `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL,
+ `Ｃ２` char(1) NOT NULL,
+ `Ｃ１` enum('ｱ','ｲ','ｳ') DEFAULT NULL,
KEY `Ｃ１` (`Ｃ１`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8
SHOW CREATE TABLE `Ｔ２`;
Table Create Table
Ｔ２ CREATE TABLE `Ｔ２` (
- `Ｃ２` char(1) NOT NULL default '',
- `Ｃ１` enum('あ','い','う') default NULL,
+ `Ｃ２` char(1) NOT NULL,
+ `Ｃ１` enum('あ','い','う') DEFAULT NULL,
KEY `Ｃ１` (`Ｃ１`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8
SHOW CREATE TABLE `Ｔ３`;
Table Create Table
Ｔ３ CREATE TABLE `Ｔ３` (
- `Ｃ２` char(1) NOT NULL default '',
- `Ｃ１` enum('龔','龖','龗') default NULL,
+ `Ｃ２` char(1) NOT NULL,
+ `Ｃ１` enum('龔','龖','龗') DEFAULT NULL,
KEY `Ｃ１` (`Ｃ１`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8
SHOW CREATE TABLE `Ｔ４`;
Table Create Table
Ｔ４ CREATE TABLE `Ｔ４` (
- `Ｃ２` char(1) NOT NULL default '',
- `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL,
+ `Ｃ２` char(1) NOT NULL,
+ `Ｃ１` enum('ｱ','ｲ','ｳ') DEFAULT NULL,
KEY `Ｃ１` (`Ｃ１`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8
SHOW CREATE TABLE `Ｔ５`;
Table Create Table
Ｔ５ CREATE TABLE `Ｔ５` (
- `Ｃ２` char(1) NOT NULL default '',
- `Ｃ１` enum('あ','い','う') default NULL,
+ `Ｃ２` char(1) NOT NULL,
+ `Ｃ１` enum('あ','い','う') DEFAULT NULL,
KEY `Ｃ１` (`Ｃ１`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8
SHOW CREATE TABLE `Ｔ６`;
Table Create Table
Ｔ６ CREATE TABLE `Ｔ６` (
- `Ｃ２` char(1) NOT NULL default '',
- `Ｃ１` enum('龔','龖','龗') default NULL,
+ `Ｃ２` char(1) NOT NULL,
+ `Ｃ１` enum('龔','龖','龗') DEFAULT NULL,
KEY `Ｃ１` (`Ｃ１`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8
SHOW CREATE TABLE `Ｔ７`;
Table Create Table
Ｔ７ CREATE TABLE `Ｔ７` (
- `Ｃ２` char(1) NOT NULL default '',
- `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL,
+ `Ｃ２` char(1) NOT NULL,
+ `Ｃ１` enum('ｱ','ｲ','ｳ') DEFAULT NULL,
KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
SHOW CREATE TABLE `Ｔ８`;
Table Create Table
Ｔ８ CREATE TABLE `Ｔ８` (
- `Ｃ２` char(1) NOT NULL default '',
- `Ｃ１` enum('あ','い','う') default NULL,
+ `Ｃ２` char(1) NOT NULL,
+ `Ｃ１` enum('あ','い','う') DEFAULT NULL,
KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=HEAP DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
SHOW CREATE TABLE `Ｔ９`;
Table Create Table
Ｔ９ CREATE TABLE `Ｔ９` (
- `Ｃ２` char(1) NOT NULL default '',
- `Ｃ１` enum('龔','龖','龗') default NULL,
- KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=HEAP DEFAULT CHARSET=utf8
-SHOW CREATE TABLE `Ｔ１０`;
-Table Create Table
-Ｔ１０ CREATE TABLE `Ｔ１０` (
- `Ｃ２` char(1) NOT NULL default '',
- `Ｃ１` enum('ｱ','ｲ','ｳ') default NULL,
- KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
-SHOW CREATE TABLE `Ｔ１１`;
-Table Create Table
-Ｔ１１ CREATE TABLE `Ｔ１１` (
- `Ｃ２` char(1) NOT NULL default '',
- `Ｃ１` enum('あ','い','う') default NULL,
- KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
-SHOW CREATE TABLE `Ｔ１２`;
-Table Create Table
-Ｔ１２ CREATE TABLE `Ｔ１２` (
- `Ｃ２` char(1) NOT NULL default '',
- `Ｃ１` enum('龔','龖','龗') default NULL,
+ `Ｃ２` char(1) NOT NULL,
+ `Ｃ１` enum('龔','龖','龗') DEFAULT NULL,
KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
DESC `Ｔ１`;
Field Type Null Key Default Extra
-Ｃ２ char(1)
+Ｃ２ char(1) NO NULL
Ｃ１ enum('ｱ','ｲ','ｳ') YES MUL NULL
DESC `Ｔ２`;
Field Type Null Key Default Extra
-Ｃ２ char(1)
+Ｃ２ char(1) NO NULL
Ｃ１ enum('あ','い','う') YES MUL NULL
DESC `Ｔ３`;
Field Type Null Key Default Extra
-Ｃ２ char(1)
+Ｃ２ char(1) NO NULL
Ｃ１ enum('龔','龖','龗') YES MUL NULL
DESC `Ｔ４`;
Field Type Null Key Default Extra
-Ｃ２ char(1)
+Ｃ２ char(1) NO NULL
Ｃ１ enum('ｱ','ｲ','ｳ') YES MUL NULL
DESC `Ｔ５`;
Field Type Null Key Default Extra
-Ｃ２ char(1)
+Ｃ２ char(1) NO NULL
Ｃ１ enum('あ','い','う') YES MUL NULL
DESC `Ｔ６`;
Field Type Null Key Default Extra
-Ｃ２ char(1)
+Ｃ２ char(1) NO NULL
Ｃ１ enum('龔','龖','龗') YES MUL NULL
DESC `Ｔ７`;
Field Type Null Key Default Extra
-Ｃ２ char(1)
+Ｃ２ char(1) NO NULL
Ｃ１ enum('ｱ','ｲ','ｳ') YES MUL NULL
DESC `Ｔ８`;
Field Type Null Key Default Extra
-Ｃ２ char(1)
+Ｃ２ char(1) NO NULL
Ｃ１ enum('あ','い','う') YES MUL NULL
DESC `Ｔ９`;
Field Type Null Key Default Extra
-Ｃ２ char(1)
-Ｃ１ enum('龔','龖','龗') YES MUL NULL
-DESC `Ｔ１０`;
-Field Type Null Key Default Extra
-Ｃ２ char(1)
-Ｃ１ enum('ｱ','ｲ','ｳ') YES MUL NULL
-DESC `Ｔ１１`;
-Field Type Null Key Default Extra
-Ｃ２ char(1)
-Ｃ１ enum('あ','い','う') YES MUL NULL
-DESC `Ｔ１２`;
-Field Type Null Key Default Extra
-Ｃ２ char(1)
+Ｃ２ char(1) NO NULL
Ｃ１ enum('龔','龖','龗') YES MUL NULL
DROP TABLE `Ｔ１`;
DROP TABLE `Ｔ２`;
@@ -357,6 +270,3 @@ DROP TABLE `Ｔ６`;
DROP TABLE `Ｔ７`;
DROP TABLE `Ｔ８`;
DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff -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 `Ｔ６`;
drop table if exists `Ｔ７`;
drop table if exists `Ｔ８`;
drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
SET NAMES utf8;
SET character_set_database = utf8;
CREATE TABLE `Ｔ１` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5))
CREATE TABLE `Ｔ４` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = myisam;
CREATE TABLE `Ｔ５` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = myisam;
CREATE TABLE `Ｔ６` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = MEMORY;
INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
INSERT INTO `Ｔ２` VALUES ('あいうえお');
INSERT INTO `Ｔ３` VALUES ('龔龖龗龞龡');
INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ');
INSERT INTO `Ｔ８` VALUES ('あいうえお');
INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡');
SELECT INSERT(`Ｃ１`,1,1,'ｶ') FROM `Ｔ１`;
INSERT(`Ｃ１`,1,1,'ｶ')
ｶｲｳｴｵ
@@ -711,186 +702,6 @@ INSERT(`Ｃ１`,4,2,'丂丂' )
SELECT INSERT(`Ｃ１`,5,1,'丂') FROM `Ｔ９`;
INSERT(`Ｃ１`,5,1,'丂')
龔龖龗龞丂
-SELECT INSERT(`Ｃ１`,1,1,'ｶ') FROM `Ｔ１０`;
-INSERT(`Ｃ１`,1,1,'ｶ')
-ｶｲｳｴｵ
-SELECT INSERT(`Ｃ１`,1,2,'ｶｶ') FROM `Ｔ１０`;
-INSERT(`Ｃ１`,1,2,'ｶｶ')
-ｶｶｳｴｵ
-SELECT INSERT(`Ｃ１`,1,3,'ｶｶｶ') FROM `Ｔ１０`;
-INSERT(`Ｃ１`,1,3,'ｶｶｶ')
-ｶｶｶｴｵ
-SELECT INSERT(`Ｃ１`,1,4,'ｶｶｶｶ') FROM `Ｔ１０`;
-INSERT(`Ｃ１`,1,4,'ｶｶｶｶ')
-ｶｶｶｶｵ
-SELECT INSERT(`Ｃ１`,1,5,'ｶｶｶｶｶ') FROM `Ｔ１０`;
-INSERT(`Ｃ１`,1,5,'ｶｶｶｶｶ')
-ｶｶｶｶｶ
-SELECT INSERT(`Ｃ１`,2,1,'ｶ') FROM `Ｔ１０`;
-INSERT(`Ｃ１`,2,1,'ｶ')
-ｱｶｳｴｵ
-SELECT INSERT(`Ｃ１`,2,2,'ｶｶ') FROM `Ｔ１０`;
-INSERT(`Ｃ１`,2,2,'ｶｶ')
-ｱｶｶｴｵ
-SELECT INSERT(`Ｃ１`,2,3,'ｶｶｶ') FROM `Ｔ１０`;
-INSERT(`Ｃ１`,2,3,'ｶｶｶ')
-ｱｶｶｶｵ
-SELECT INSERT(`Ｃ１`,2,4,'ｶｶｶｶ') FROM `Ｔ１０`;
-INSERT(`Ｃ１`,2,4,'ｶｶｶｶ')
-ｱｶｶｶｶ
-SELECT INSERT(`Ｃ１`,3,1,'ｶ') FROM `Ｔ１０`;
-INSERT(`Ｃ１`,3,1,'ｶ')
-ｱｲｶｴｵ
-SELECT INSERT(`Ｃ１`,3,2,'ｶｶ') FROM `Ｔ１０`;
-INSERT(`Ｃ１`,3,2,'ｶｶ')
-ｱｲｶｶｵ
-SELECT INSERT(`Ｃ１`,3,3,'ｶｶｶ') FROM `Ｔ１０`;
-INSERT(`Ｃ１`,3,3,'ｶｶｶ')
-ｱｲｶｶｶ
-SELECT INSERT(`Ｃ１`,4,1,'ｶ') FROM `Ｔ１０`;
-INSERT(`Ｃ１`,4,1,'ｶ')
-ｱｲｳｶｵ
-SELECT INSERT(`Ｃ１`,4,2,'ｶｶ') FROM `Ｔ１０`;
-INSERT(`Ｃ１`,4,2,'ｶｶ')
-ｱｲｳｶｶ
-SELECT INSERT(`Ｃ１`,5,1,'ｶ') FROM `Ｔ１０`;
-INSERT(`Ｃ１`,5,1,'ｶ')
-ｱｲｳｴｶ
-SELECT INSERT(`Ｃ１`,1,1,'か') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,1,1,'か')
-かいうえお
-SELECT INSERT(`Ｃ１`,1,2,'かか') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,1,2,'かか')
-かかうえお
-SELECT INSERT(`Ｃ１`,1,3,'かかか') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,1,3,'かかか')
-かかかえお
-SELECT INSERT(`Ｃ１`,1,4,'かかかか') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,1,4,'かかかか')
-かかかかお
-SELECT INSERT(`Ｃ１`,1,5,'かかかかか') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,1,5,'かかかかか')
-かかかかか
-SELECT INSERT(`Ｃ１`,2,1,'か') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,2,1,'か')
-あかうえお
-SELECT INSERT(`Ｃ１`,2,2,'かか') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,2,2,'かか')
-あかかえお
-SELECT INSERT(`Ｃ１`,2,3,'かかか') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,2,3,'かかか')
-あかかかお
-SELECT INSERT(`Ｃ１`,2,4,'かかかか') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,2,4,'かかかか')
-あかかかか
-SELECT INSERT(`Ｃ１`,3,1,'か') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,3,1,'か')
-あいかえお
-SELECT INSERT(`Ｃ１`,3,2,'かか') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,3,2,'かか')
-あいかかお
-SELECT INSERT(`Ｃ１`,3,3,'かかか') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,3,3,'かかか')
-あいかかか
-SELECT INSERT(`Ｃ１`,4,1,'か') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,4,1,'か')
-あいうかお
-SELECT INSERT(`Ｃ１`,4,2,'かか') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,4,2,'かか')
-あいうかか
-SELECT INSERT(`Ｃ１`,5,1,'か') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,5,1,'か')
-あいうえか
-SELECT INSERT(`Ｃ１`,1,1,' ') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,1,1,' ')
- いうえお
-SELECT INSERT(`Ｃ１`,1,2,' ') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,1,2,' ')
- うえお
-SELECT INSERT(`Ｃ１`,1,3,' ') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,1,3,' ')
- えお
-SELECT INSERT(`Ｃ１`,1,4,' ') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,1,4,' ')
- お
-SELECT INSERT(`Ｃ１`,1,5,' ') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,1,5,' ')
-
-SELECT INSERT(`Ｃ１`,2,1,' ') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,2,1,' ')
-あ うえお
-SELECT INSERT(`Ｃ１`,2,2,' ') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,2,2,' ')
-あ えお
-SELECT INSERT(`Ｃ１`,2,3,' ') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,2,3,' ')
-あ お
-SELECT INSERT(`Ｃ１`,2,4,' ') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,2,4,' ')
-あ
-SELECT INSERT(`Ｃ１`,3,1,' ') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,3,1,' ')
-あい えお
-SELECT INSERT(`Ｃ１`,3,2,' ') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,3,2,' ')
-あい お
-SELECT INSERT(`Ｃ１`,3,3,' ') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,3,3,' ')
-あい
-SELECT INSERT(`Ｃ１`,4,1,' ') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,4,1,' ')
-あいう お
-SELECT INSERT(`Ｃ１`,4,2,' ') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,4,2,' ')
-あいう
-SELECT INSERT(`Ｃ１`,5,1,' ') FROM `Ｔ１１`;
-INSERT(`Ｃ１`,5,1,' ')
-あいうえ
-SELECT INSERT(`Ｃ１`,1,1,'丂') FROM `Ｔ１２`;
-INSERT(`Ｃ１`,1,1,'丂')
-丂龖龗龞龡
-SELECT INSERT(`Ｃ１`,1,2,'丂丂') FROM `Ｔ１２`;
-INSERT(`Ｃ１`,1,2,'丂丂')
-丂丂龗龞龡
-SELECT INSERT(`Ｃ１`,1,3,'丂丂丂') FROM `Ｔ１２`;
-INSERT(`Ｃ１`,1,3,'丂丂丂')
-丂丂丂龞龡
-SELECT INSERT(`Ｃ１`,1,4,'丂丂丂丂') FROM `Ｔ１２`;
-INSERT(`Ｃ１`,1,4,'丂丂丂丂')
-丂丂丂丂龡
-SELECT INSERT(`Ｃ１`,1,5,'丂丂丂丂丂') FROM `Ｔ１２`;
-INSERT(`Ｃ１`,1,5,'丂丂丂丂丂')
-丂丂丂丂丂
-SELECT INSERT(`Ｃ１`,2,1,'丂') FROM `Ｔ１２`;
-INSERT(`Ｃ１`,2,1,'丂')
-龔丂龗龞龡
-SELECT INSERT(`Ｃ１`,2,2,'丂丂') FROM `Ｔ１２`;
-INSERT(`Ｃ１`,2,2,'丂丂')
-龔丂丂龞龡
-SELECT INSERT(`Ｃ１`,2,3,'丂丂丂') FROM `Ｔ１２`;
-INSERT(`Ｃ１`,2,3,'丂丂丂')
-龔丂丂丂龡
-SELECT INSERT(`Ｃ１`,2,4,'丂丂丂丂') FROM `Ｔ１２`;
-INSERT(`Ｃ１`,2,4,'丂丂丂丂')
-龔丂丂丂丂
-SELECT INSERT(`Ｃ１`,3,1,'丂') FROM `Ｔ１２`;
-INSERT(`Ｃ１`,3,1,'丂')
-龔龖丂龞龡
-SELECT INSERT(`Ｃ１`,3,2,'丂丂') FROM `Ｔ１２`;
-INSERT(`Ｃ１`,3,2,'丂丂')
-龔龖丂丂龡
-SELECT INSERT(`Ｃ１`,3,3,'丂丂丂') FROM `Ｔ１２`;
-INSERT(`Ｃ１`,3,3,'丂丂丂')
-龔龖丂丂丂
-SELECT INSERT(`Ｃ１`,4,1,'丂') FROM `Ｔ１２`;
-INSERT(`Ｃ１`,4,1,'丂')
-龔龖龗丂龡
-SELECT INSERT(`Ｃ１`,4,2,'丂丂') FROM `Ｔ１２`;
-INSERT(`Ｃ１`,4,2,'丂丂')
-龔龖龗丂丂
-SELECT INSERT(`Ｃ１`,5,1,'丂') FROM `Ｔ１２`;
-INSERT(`Ｃ１`,5,1,'丂')
-龔龖龗龞丂
DROP TABLE `Ｔ１`;
DROP TABLE `Ｔ２`;
DROP TABLE `Ｔ３`;
@@ -900,6 +711,3 @@ DROP TABLE `Ｔ６`;
DROP TABLE `Ｔ７`;
DROP TABLE `Ｔ８`;
DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff -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 `Ｔ６`;
drop table if exists `Ｔ７`;
drop table if exists `Ｔ８`;
drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
SET NAMES utf8;
SET character_set_database = utf8;
CREATE TABLE `Ｔ１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = innodb;
@@ -16,12 +15,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5),
CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam;
CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam;
CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY;
INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
INSERT INTO `Ｔ２` VALUES ('あいうえお');
INSERT INTO `Ｔ３` VALUES ('龔龖龗龞龡');
INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ');
INSERT INTO `Ｔ８` VALUES ('あいうえお');
INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡');
SELECT INSTR(`Ｃ１`,'ｱ') from `Ｔ１`;
INSTR(`Ｃ１`,'ｱ')
1
@@ -196,60 +189,6 @@ INSTR(`Ｃ１`,'龡')
SELECT INSTR(`Ｃ１`,'丂') from `Ｔ９`;
INSTR(`Ｃ１`,'丂')
0
-SELECT INSTR(`Ｃ１`,'ｱ') from `Ｔ１０`;
-INSTR(`Ｃ１`,'ｱ')
-1
-SELECT INSTR(`Ｃ１`,'ｲ') from `Ｔ１０`;
-INSTR(`Ｃ１`,'ｲ')
-2
-SELECT INSTR(`Ｃ１`,'ｳ') from `Ｔ１０`;
-INSTR(`Ｃ１`,'ｳ')
-3
-SELECT INSTR(`Ｃ１`,'ｴ') from `Ｔ１０`;
-INSTR(`Ｃ１`,'ｴ')
-4
-SELECT INSTR(`Ｃ１`,'ｵ') from `Ｔ１０`;
-INSTR(`Ｃ１`,'ｵ')
-5
-SELECT INSTR(`Ｃ１`,'ﾝ') from `Ｔ１０`;
-INSTR(`Ｃ１`,'ﾝ')
-0
-SELECT INSTR(`Ｃ１`,'あ') from `Ｔ１１`;
-INSTR(`Ｃ１`,'あ')
-1
-SELECT INSTR(`Ｃ１`,'い') from `Ｔ１１`;
-INSTR(`Ｃ１`,'い')
-2
-SELECT INSTR(`Ｃ１`,'う') from `Ｔ１１`;
-INSTR(`Ｃ１`,'う')
-3
-SELECT INSTR(`Ｃ１`,'え') from `Ｔ１１`;
-INSTR(`Ｃ１`,'え')
-4
-SELECT INSTR(`Ｃ１`,'お') from `Ｔ１１`;
-INSTR(`Ｃ１`,'お')
-5
-SELECT INSTR(`Ｃ１`,'ん') from `Ｔ１１`;
-INSTR(`Ｃ１`,'ん')
-0
-SELECT INSTR(`Ｃ１`,'龔') from `Ｔ１２`;
-INSTR(`Ｃ１`,'龔')
-1
-SELECT INSTR(`Ｃ１`,'龖') from `Ｔ１２`;
-INSTR(`Ｃ１`,'龖')
-2
-SELECT INSTR(`Ｃ１`,'龗') from `Ｔ１２`;
-INSTR(`Ｃ１`,'龗')
-3
-SELECT INSTR(`Ｃ１`,'龞') from `Ｔ１２`;
-INSTR(`Ｃ１`,'龞')
-4
-SELECT INSTR(`Ｃ１`,'龡') from `Ｔ１２`;
-INSTR(`Ｃ１`,'龡')
-5
-SELECT INSTR(`Ｃ１`,'丂') from `Ｔ１２`;
-INSTR(`Ｃ１`,'丂')
-0
DROP TABLE `Ｔ１`;
DROP TABLE `Ｔ２`;
DROP TABLE `Ｔ３`;
@@ -259,6 +198,3 @@ DROP TABLE `Ｔ６`;
DROP TABLE `Ｔ７`;
DROP TABLE `Ｔ８`;
DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;
diff -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#28563 | mleich | 15 May |
