Patch approved.
> -----Original Message-----
> From: rsomla@stripped [mailto:rsomla@stripped]
> Sent: Wednesday, February 06, 2008 7:25 AM
> To: commits@stripped
> Subject: bk commit into 6.0 tree (rafal:1.2763) BUG#34346
>
> Below is the list of changes that have just been committed
> into a local 6.0 repository of rafal. When rafal 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-02-06 13:25:00+01:00, rafal@quant.(none) +3 -0
> Bug #34346 (ctype_latin1_de test fails if test database is
> recreated):
>
> This patch implements the solution described in the bug
> report. In short, default
> character set and collation are set using ALTER DATABASE
> instead of using server
> startup options.
>
> BitKeeper/deleted/.del-ctype_latin1_de-master.opt@stripped,
> 2008-02-06 13:19:39+01:00, rafal@quant.(none) +0 -0
> Delete: mysql-test/t/ctype_latin1_de-master.opt
>
> mysql-test/r/ctype_latin1_de.result@stripped, 2008-02-06
> 13:24:50+01:00, rafal@quant.(none) +5 -0
> Updated results.
>
> mysql-test/t/ctype_latin1_de.test@stripped, 2008-02-06
> 13:24:51+01:00, rafal@quant.(none) +8 -0
> Set default character set and collaction of test database
> explicitly.
> Restore factory defaults at the end of the test.
>
> diff -Nrup a/mysql-test/r/ctype_latin1_de.result
> b/mysql-test/r/ctype_latin1_de.result
> --- a/mysql-test/r/ctype_latin1_de.result 2007-04-03
> 13:16:07 +02:00
> +++ b/mysql-test/r/ctype_latin1_de.result 2008-02-06
> 13:24:50 +01:00
> @@ -4,6 +4,9 @@ select @@collation_connection;
> @@collation_connection latin1_german2_ci drop table if exists t1;
> +ALTER DATABASE test
> +CHARACTER SET latin1
> +COLLATE latin1_german2_ci;
> create table t1 (a char (20) not null, b int not null
> auto_increment, index (a,b)); insert into t1 (a) values
> ('ä'),('ac'),('ae'),('ad'),('Äc'),('aeb');
> insert into t1 (a) values
> ('üc'),('uc'),('ue'),('ud'),('Ü'),('ueb'),('uf');
> @@ -448,3 +451,5 @@ hex(weight_string('xü' as char(2)))
> select hex(weight_string('xß' as char(2)));
> hex(weight_string('xß' as char(2)))
> 5853
> +DROP DATABASE test;
> +CREATE DATABASE test;
> diff -Nrup a/mysql-test/t/ctype_latin1_de-master.opt
> b/mysql-test/t/ctype_latin1_de-master.opt
> --- a/mysql-test/t/ctype_latin1_de-master.opt 2005-09-15
> 16:17:11 +02:00
> +++ /dev/null Wed Dec 31 16:00:00 196900
> @@ -1 +0,0 @@
> ---default-character-set=latin1 --default-collation=latin1_german2_ci
> diff -Nrup a/mysql-test/t/ctype_latin1_de.test
> b/mysql-test/t/ctype_latin1_de.test
> --- a/mysql-test/t/ctype_latin1_de.test 2007-04-03
> 13:16:07 +02:00
> +++ b/mysql-test/t/ctype_latin1_de.test 2008-02-06
> 13:24:51 +01:00
> @@ -11,6 +11,10 @@ select @@collation_connection; drop table
> if exists t1; --enable_warnings
>
> +ALTER DATABASE test
> +CHARACTER SET latin1
> +COLLATE latin1_german2_ci;
> +
> create table t1 (a char (20) not null, b int not null
> auto_increment, index (a,b)); insert into t1 (a) values
> ('ä'),('ac'),('ae'),('ad'),('Äc'),('aeb');
> insert into t1 (a) values
> ('üc'),('uc'),('ue'),('ud'),('Ü'),('ueb'),('uf');
> @@ -165,3 +169,7 @@ select hex(weight_string('xä' as char(2)
> select hex(weight_string('xö' as char(2))); select
> hex(weight_string('xü' as char(2))); select
> hex(weight_string('xß' as char(2)));
> +
> +# Re-create test database to restore default collation settings DROP
> +DATABASE test; CREATE DATABASE test;
>
> --
> MySQL Code Commits Mailing List
> For list archives: http://lists.mysql.com/commits
> To unsubscribe:
> http://lists.mysql.com/commits?unsub=1
>
