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

Bug#53563 Fix and enable charset/collation tests in funcs_2

Browse Source
This commit is contained in:
Bernt M. Johnsen 2010-08-19 09:31:24 +02:00
parent 89e6eb0b1e
commit 67d895d499
5 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/funcs_2/charset/charset_master.test
View File

@ -695,3 +695,5 @@ let $coll= utf8_unicode_ci;
}
DROP database test;
CREATE database test;

6
mysql-test/suite/funcs_2/r/innodb_charset.result
View File

@ -27980,6 +27980,7 @@ F6 1
213 1
53 1
73 1
DF 1
15A 1
15B 1
15C 1
@ -28150,7 +28151,6 @@ F8 1
1FF 1
DE 1
FE 1
DF 1
F7 1
110 1
111 1
@ -78790,6 +78790,7 @@ C892 1
C893 1
53 1
73 1
C39F 1
C59A 1
C59B 1
C59C 1
@ -78960,7 +78961,6 @@ C7BE 1
C7BF 1
C39E 1
C3BE 1
C39F 1
C3B7 1
C490 1
C491 1
@ -119154,3 +119154,5 @@ DFBD 1
DFBE 1
DFBF 1
DROP TABLE IF EXISTS test.t1;
DROP database test;
CREATE database test;

6
mysql-test/suite/funcs_2/r/memory_charset.result
View File

@ -27980,6 +27980,7 @@ F6 1
213 1
53 1
73 1
DF 1
15A 1
15B 1
15C 1
@ -28150,7 +28151,6 @@ F8 1
1FF 1
DE 1
FE 1
DF 1
F7 1
110 1
111 1
@ -78790,6 +78790,7 @@ C892 1
C893 1
53 1
73 1
C39F 1
C59A 1
C59B 1
C59C 1
@ -78960,7 +78961,6 @@ C7BE 1
C7BF 1
C39E 1
C3BE 1
C39F 1
C3B7 1
C490 1
C491 1
@ -119154,3 +119154,5 @@ DFBD 1
DFBE 1
DFBF 1
DROP TABLE IF EXISTS test.t1;
DROP database test;
CREATE database test;

6
mysql-test/suite/funcs_2/r/myisam_charset.result
View File

@ -27980,6 +27980,7 @@ F6 1
213 1
53 1
73 1
DF 1
15A 1
15B 1
15C 1
@ -28150,7 +28151,6 @@ F8 1
1FF 1
DE 1
FE 1
DF 1
F7 1
110 1
111 1
@ -78790,6 +78790,7 @@ C892 1
C893 1
53 1
73 1
C39F 1
C59A 1
C59B 1
C59C 1
@ -78960,7 +78961,6 @@ C7BE 1
C7BF 1
C39E 1
C3BE 1
C39F 1
C3B7 1
C490 1
C491 1
@ -119154,3 +119154,5 @@ DFBD 1
DFBE 1
DFBF 1
DROP TABLE IF EXISTS test.t1;
DROP database test;
CREATE database test;

6
mysql-test/suite/funcs_2/t/disabled.def
View File

@ -1,6 +1,4 @@
# Disabled by hhunger (2008-03-03) due to WL4204
innodb_charset : Bug#20447 Problem with prefix keys with contractions and expansions
myisam_charset : Bug#20447 Problem with prefix keys with contractions and expansions
memory_charset : Bug#20447 Problem with prefix keys with contractions and expansions
# Should maybe be enabled, but ndb is not part of the ordinary build.
# Bernt M. Johnsen 2010-05-10
ndb_charset : Bug#20447 Problem with prefix keys with contractions and expansions