1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Character set sets now check if required non-dynamic charsets were really compiled

Browse Source 
BitKeeper/deleted/.del-ctype_ujis-master.opt~9f5cc09930fc1cf9:
  Delete: mysql-test/t/ctype_ujis-master.opt
This commit is contained in:
unknown 2003-05-23 15:10:05 +05:00
parent d7ab5da88f
commit f461dea4d7
9 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/include/have_ucs2.inc Normal file
View File

@ -0,0 +1,4 @@
-- require r/have_ucs2.require
disable_query_log;
show collation like "ucs2_general_ci";
enable_query_log;

4
mysql-test/include/have_ujis.inc Normal file
View File

@ -0,0 +1,4 @@
-- require r/have_ujis.require
disable_query_log;
show collation like "ujis_japanese_ci";
enable_query_log;

2
mysql-test/r/have_ucs2.require Normal file
View File

@ -0,0 +1,2 @@
Collation Charset Id D C Sortlen
ucs2_general_ci ucs2 35 Y 0

2
mysql-test/r/have_ujis.require Normal file
View File

@ -0,0 +1,2 @@
Collation Charset Id D C Sortlen
ujis_japanese_ci ujis 12 Y 0

12
mysql-test/r/isam.result
View File

@ -73,14 +73,14 @@ test.t2 check error Table 't2' was not locked with LOCK TABLES
test.t1 check status OK test.t1 check status OK
show columns from t1; show columns from t1;
Field Type Collation Null Key Default Extra Field Type Collation Null Key Default Extra
a int(11) binary PRI 0 a int(11) NULL PRI 0
b int(11) binary MUL 0 b int(11) NULL MUL 0
c int(11) binary 0 c int(11) NULL 0
show full columns from t1; show full columns from t1;
Field Type Collation Null Key Default Extra Privileges Comment Field Type Collation Null Key Default Extra Privileges Comment
a int(11) binary PRI 0 select,insert,update,references a int(11) NULL PRI 0 select,insert,update,references
b int(11) binary MUL 0 select,insert,update,references b int(11) NULL MUL 0 select,insert,update,references
c int(11) binary 0 select,insert,update,references c int(11) NULL 0 select,insert,update,references
show index from t1; show index from t1;
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment
t1 0 PRIMARY 1 a A 4 NULL NULL BTREE t1 0 PRIMARY 1 a A 4 NULL NULL BTREE

2
mysql-test/t/ctype_many.test
View File

@ -1,3 +1,5 @@
-- source include/have_ucs2.inc
--disable_warnings --disable_warnings
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
--enable_warnings --enable_warnings

1
mysql-test/t/ctype_ujis-master.opt
View File

@ -1 +0,0 @@
--default-character-set=ujis

4
mysql-test/t/ctype_ujis.test
View File

@ -1,3 +1,5 @@
-- source include/have_ujis.inc
# #
# Tests with the ujis character set # Tests with the ujis character set
# #
@ -9,7 +11,7 @@ drop table if exists t1;
# Test problem with LEFT() # Test problem with LEFT()
# #
create table t1 (c text); create table t1 (c text character set ujis);
insert into t1 values (0xa4a2),(0xa4a3); insert into t1 values (0xa4a2),(0xa4a3);
select hex(left(c,1)) from t1 group by c; select hex(left(c,1)) from t1 group by c;
drop table t1; drop table t1;

15
sql/share/charsets/Index.xml
View File

@ -169,7 +169,10 @@ To make maintaining easier please:
<family>Japanese</family> <family>Japanese</family>
<description>EUC-JP Japanese</description> <description>EUC-JP Japanese</description>
<alias>euc-jp</alias> <alias>euc-jp</alias>
<collation name="ujis_japanese_ci" id="12" order="Japanese" flag="primary"/> <collation name="ujis_japanese_ci" id="12" order="Japanese">
<flag>primary</flag>
<flag>compiled</flag>
</collation>
</charset> </charset>
<charset name="sjis"> <charset name="sjis">
@ -178,7 +181,10 @@ To make maintaining easier please:
<alias>s-jis</alias> <alias>s-jis</alias>
<alias>shift-jis</alias> <alias>shift-jis</alias>
<alias>x-sjis</alias> <alias>x-sjis</alias>
<collation name="sjis_japanese_ci" id="13" order="Japanese" flag="primary"/> <collation name="sjis_japanese_ci" id="13" order="Japanese">
<flag>primary</flag>
<flag>compiled</flag>
</collation>
</charset> </charset>
<charset name="cp1251"> <charset name="cp1251">
@ -376,7 +382,10 @@ To make maintaining easier please:
<charset name="ucs2"> <charset name="ucs2">
<family>Unicode</family> <family>Unicode</family>
<description>UCS-2 Unicode</description> <description>UCS-2 Unicode</description>
<collation name="ucs2_general_ci" id="35" flag="primary"/> <collation name="ucs2_general_ci" id="35">
<flag>primary</flag>
<flag>compiled</flag>
</collation>
</charset> </charset>
<charset name="cp866"> <charset name="cp866">