bk commit into 6.0 tree (rafal:1.2557)

[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-14 21:57:18+01:00, rafal@quant.(none) +4 -0
  This patch implements another solution for the problem with failing 
  rpl_ndb_ctype_ucs2_def test when run after backup tests. The problem
  is that when test database is restored then the db.opt file is created in it and 
  this makes test such as rpl_ndb_ctype_ucs2_def, which use server options and 
  rely on test/ dir being empty, to fail. This patch solves this problem by 
  deleting test/db.opt file at the end of backup tests which might create it.
  
  The patch also undoes the changes to rpl_ndb_ctype_ucs2_def introduced by 
  previous fix to this problem (which was rejected because it caused other 
  problems).

  mysql-test/suite/rpl_ndb/r/rpl_ndb_ctype_ucs2_def.result@stripped, 2008-02-14 21:57:14+01:00, rafal@quant.(none) +0 -3
    Updated results.

  mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def.test@stripped, 2008-02-14 21:57:14+01:00, rafal@quant.(none) +0 -9
    Undo the previos change as it is not needed any more.

  mysql-test/t/backup_ddl_blocker.test@stripped, 2008-02-14 21:57:14+01:00, rafal@quant.(none) +11 -0
    Remove test/db.opt as a part of clean-up.

  mysql-test/t/backup_no_data.test@stripped, 2008-02-14 21:57:14+01:00, rafal@quant.(none) +11 -0
    Remove test/db.opt as a part of clean-up.

diff -Nrup a/mysql-test/suite/rpl_ndb/r/rpl_ndb_ctype_ucs2_def.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_ctype_ucs2_def.result
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_ctype_ucs2_def.result	2008-02-14 16:36:46 +01:00
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_ctype_ucs2_def.result	2008-02-14 21:57:14 +01:00
@@ -10,9 +10,6 @@ collation_server	ucs2_unicode_ci
 show variables like "%character_set_ser%";
 Variable_name	Value
 character_set_server	ucs2
-DROP DATABASE test;
-CREATE DATABASE test;
-USE test;
 DROP TABLE IF EXISTS t1;
 create table t1 (a int) ENGINE=NDB;
 drop table t1;
diff -Nrup a/mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def.test
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def.test	2008-02-14 16:36:46 +01:00
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def.test	2008-02-14 21:57:14 +01:00
@@ -20,15 +20,6 @@ show variables like 'collation_server';
 #
 show variables like "%character_set_ser%";
 --disable_warnings
-#
-# Re-create test database so that the default character set and collation settings
-# are taken from server options (which are specified in the option file for this test). 
-# Otherwise, if test database exists before this test is run and has these defaults 
-# set explicitly, the server options would have no effect.
-#
-DROP DATABASE test;
-CREATE DATABASE test;
-USE test;
 DROP TABLE IF EXISTS t1;
 --enable_warnings
 create table t1 (a int) ENGINE=NDB;
diff -Nrup a/mysql-test/t/backup_ddl_blocker.test b/mysql-test/t/backup_ddl_blocker.test
--- a/mysql-test/t/backup_ddl_blocker.test	2007-12-20 21:32:16 +01:00
+++ b/mysql-test/t/backup_ddl_blocker.test	2008-02-14 21:57:14 +01:00
@@ -2362,6 +2362,17 @@ WHERE TABLE_NAME = 't3' AND TABLE_SCHEMA
 DROP TABLE test.t2;
 DROP DATABASE bup_ddl_blocker;
 
+#
+# Normally, when tests are run the test/ directory corresponding to the test database
+# is empty. In particular, it doesn't contain the db.opt file storing database settings.
+# Some tests rely on that, as they use server options to determine these settings.
+# If we backup test database (e.g., with "BACKUP DATABASE * ...") and then restore it,
+# then it will be created using "CREATE DATABASE test" statement and this will create
+# the db.opt file. As a result, some tests run after that will fail. To avoid this situation
+# we remove the test/db.opt file as a part of clean-up.
+#
+--error 0,1
+--remove_file $MYSQLTEST_VARDIR/master-data/test/db.opt
 --remove_file $MYSQLTEST_VARDIR/master-data/bup_ddl_blocker_orig.bak
 --remove_file $MYSQLTEST_VARDIR/master-data/bup_ddl_blocker.bak
 
diff -Nrup a/mysql-test/t/backup_no_data.test b/mysql-test/t/backup_no_data.test
--- a/mysql-test/t/backup_no_data.test	2008-02-13 12:40:23 +01:00
+++ b/mysql-test/t/backup_no_data.test	2008-02-14 21:57:14 +01:00
@@ -71,6 +71,17 @@ SHOW TABLES;
 --disable_warnings
 DROP DATABASE IF EXISTS empty_db;
 DROP DATABASE IF EXISTS other_db;
+#
+# Normally, when tests are run the test/ directory corresponding to the test database
+# is empty. In particular, it doesn't contain the db.opt file storing database settings.
+# Some tests rely on that, as they use server options to determine these settings.
+# If we backup test database (e.g., with "BACKUP DATABASE * ...") and then restore it,
+# then it will be created using "CREATE DATABASE test" statement and this will create
+# the db.opt file. As a result, some tests run after that will fail. To avoid this situation
+# we remove the test/db.opt file as a part of clean-up.
+#
+--error 0,1
+--remove_file $MYSQLTEST_VARDIR/master-data/test/db.opt
 --enable_warnings
 
 --error 0,1