bk commit into 6.0 tree (rafal:1.2561) BUG#34346

[rsomla]

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-15 11:02:02+01:00, rafal@quant.(none) +3 -0
  BUG#34346 (ctype_latin1_de test fails if test database is recreated):
  
  This patch reverts the changes introduces by previous one since a different
  solution of the problem was implemented. Now all tests which might re-create
  the test database (e.g., the backup tests) take care of cleaning the test/ dir
  so that it doesn't contain the db.opt file. Thus this test can work in the
  form in which it was originaly designed.

  mysql-test/r/ctype_latin1_de.result@stripped, 2008-02-15 11:01:58+01:00, rafal@quant.(none) +0 -0
    Revert to previous version.

  mysql-test/t/ctype_latin1_de-master.opt@stripped, 2008-02-15 10:45:32+01:00, rafal@quant.(none) +0 -0
    Rename: BitKeeper/deleted/.del-ctype_latin1_de-master.opt -> mysql-test/t/ctype_latin1_de-master.opt

  mysql-test/t/ctype_latin1_de.test@stripped, 2008-02-15 11:01:58+01:00, rafal@quant.(none) +0 -0
    Revert to previous version.

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	2008-02-06 13:24:50 +01:00
+++ b/mysql-test/r/ctype_latin1_de.result	2008-02-15 11:01:58 +01:00
@@ -4,9 +4,6 @@ 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));
 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
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/t/ctype_latin1_de-master.opt	2008-02-15 10:45:32 +01:00
@@ -0,0 +1 @@
+--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	2008-02-06 13:24:51 +01:00
+++ b/mysql-test/t/ctype_latin1_de.test	2008-02-15 11:01:58 +01:00
@@ -11,10 +11,6 @@ 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));
-
-# Re-create test database to restore default collation settings
-DROP DATABASE test;
-CREATE DATABASE test;