List:Commits« Previous MessageNext Message »
From:Bernt M. Johnsen Date:August 19 2010 7:31am
Subject:bzr commit into mysql-5.5-bugfixing branch (bernt.johnsen:3189) Bug#53563
View as plain text  
#At file:///export/home/tmp/mysql/5.5-bugfixing/ based on revid:bar@stripped

 3189 Bernt M. Johnsen	2010-08-19
      Bug#53563  Fix and enable charset/collation tests in funcs_2

    modified:
      mysql-test/suite/funcs_2/charset/charset_master.test
      mysql-test/suite/funcs_2/r/innodb_charset.result
      mysql-test/suite/funcs_2/r/memory_charset.result
      mysql-test/suite/funcs_2/r/myisam_charset.result
      mysql-test/suite/funcs_2/t/disabled.def
=== modified file 'mysql-test/suite/funcs_2/charset/charset_master.test'
--- a/mysql-test/suite/funcs_2/charset/charset_master.test	2009-04-24 17:00:17 +0000
+++ b/mysql-test/suite/funcs_2/charset/charset_master.test	2010-08-19 07:31:24 +0000
@@ -695,3 +695,5 @@ let $coll= utf8_unicode_ci; 
 
 }
 
+DROP database test;
+CREATE database test;
\ No newline at end of file

=== modified file 'mysql-test/suite/funcs_2/r/innodb_charset.result'
--- a/mysql-test/suite/funcs_2/r/innodb_charset.result	2007-10-18 11:13:21 +0000
+++ b/mysql-test/suite/funcs_2/r/innodb_charset.result	2010-08-19 07:31:24 +0000
@@ -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;

=== modified file 'mysql-test/suite/funcs_2/r/memory_charset.result'
--- a/mysql-test/suite/funcs_2/r/memory_charset.result	2007-10-18 11:13:21 +0000
+++ b/mysql-test/suite/funcs_2/r/memory_charset.result	2010-08-19 07:31:24 +0000
@@ -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;

=== modified file 'mysql-test/suite/funcs_2/r/myisam_charset.result'
--- a/mysql-test/suite/funcs_2/r/myisam_charset.result	2007-10-18 11:13:21 +0000
+++ b/mysql-test/suite/funcs_2/r/myisam_charset.result	2010-08-19 07:31:24 +0000
@@ -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;

=== modified file 'mysql-test/suite/funcs_2/t/disabled.def'
--- a/mysql-test/suite/funcs_2/t/disabled.def	2008-12-08 14:36:42 +0000
+++ b/mysql-test/suite/funcs_2/t/disabled.def	2010-08-19 07:31:24 +0000
@@ -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
 


Attachment: [text/bzr-bundle] bzr/bernt.johnsen@sun.com-20100819073124-kbucdjdvp9tpps71.bundle
Thread
bzr commit into mysql-5.5-bugfixing branch (bernt.johnsen:3189) Bug#53563Bernt M. Johnsen19 Aug