bzr commit into mysql-6.0-backup branch (charles.bell:2887) Bug#46934

[Chuck Bell]

#At file:///Users/cbell/source/bzr/mysql-6.0-bug-46934/ based on revid:rafal.somla@stripped026093723-s2abyd8cyzek76hb

 2887 Chuck Bell	2009-10-26
      BUG#46934 : backup.backup_datatypes fails on Mac OS X
      
      The test backup_datatypes fails on Mac OS X systems. This
      is because there is a problem processing uppercase characters
      in table names for UTF-8 character sets. A new bug has
      been opened to deal with this issue. See BUG#48151.
      
      The solution for this bug is to issue a workaround 
      that flushes the tables after a backup. This forces the
      server to give up its hold on the table(s) in question and
      allows the test to run on Mac OS X.
     @ mysql-test/collections/default.experimental
        Remove the test from the list of experimental tests.
     @ mysql-test/extra/scripts/monitor_disabled_tests/comments.txt
        Remove the test from the monitoring list.
     @ mysql-test/suite/backup/t/backup_datatypes.test
        Add code to issue FLUSH TABLES to overcome problem.

    modified:
      mysql-test/collections/default.experimental
      mysql-test/extra/scripts/monitor_disabled_tests/comments.txt
      mysql-test/suite/backup/t/backup_datatypes.test
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental	2009-10-24 10:46:38 +0000
+++ b/mysql-test/collections/default.experimental	2009-10-26 14:47:30 +0000
@@ -1,7 +1,6 @@
 # For easier human reading (MTR doesn't care), please keep entries
 # in alphabetical order. This also helps with merge conflict resolution.
 
-backup.backup_datatypes  @darwin         # Bug#46934 2009-08-26 alik backup_datatypes fails on Mac OS X
 backup.backup_dbname_lctn2  @windows  @darwin   # Bug#46933 2009-08-26 alik backup_*_lctn2 tests fail on windows
 backup.backup_events                     # Bug#47211 2009-09-25 alik backup_events.test fails randomly
 backup.backup_external_non_win*          # BUG#45877

=== modified file 'mysql-test/extra/scripts/monitor_disabled_tests/comments.txt'
--- a/mysql-test/extra/scripts/monitor_disabled_tests/comments.txt	2009-09-23 19:32:57 +0000
+++ b/mysql-test/extra/scripts/monitor_disabled_tests/comments.txt	2009-10-26 14:47:30 +0000
@@ -60753,20 +60753,6 @@ suite/backup/t/backup_objects_dependency
 suite/backup/t/backup_objects_dependency.test:#           non-deterministic.
 suite/backup/t/backup_objects_dependency.test:#
 suite/backup/t/backup_objects_dependency.test:#SELECT * FROM ob3.log;
-suite/backup/t/backup_datatypes.test:####################################################################
-suite/backup/t/backup_datatypes.test:# Author: Hema
-suite/backup/t/backup_datatypes.test:# Date: 2008-03-11
-suite/backup/t/backup_datatypes.test:# Purpose: To test the backup/restore of all datatypes using accented letters.
-suite/backup/t/backup_datatypes.test:# We will ensure that backup stores identifiers properly in utf8 format and
-suite/backup/t/backup_datatypes.test:# is retreived during restore without changing the client character set.
-suite/backup/t/backup_datatypes.test:#########################################################################
-suite/backup/t/backup_datatypes.test:##############################################################
-suite/backup/t/backup_datatypes.test:##############################################################
-suite/backup/t/backup_datatypes.test:#Create Database and tables with different datatypes for this test.
-suite/backup/t/backup_datatypes.test:#SET NAMES latin1;
-suite/backup/t/backup_datatypes.test:# Bug #37212  Restore crashes if table has longblob of size 1MB
-suite/backup/t/backup_datatypes.test:#show data and table columns
-suite/backup/t/backup_datatypes.test:# Test cleanup section
 suite/backup/t/backup_client_binlog.test:#
 suite/backup/t/backup_client_binlog.test:# Note: Windows cannot parse command line continuation by backspace.
 suite/backup/t/backup_client_binlog.test:# So please excuse the long lines in this test case.

=== modified file 'mysql-test/suite/backup/t/backup_datatypes.test'
--- a/mysql-test/suite/backup/t/backup_datatypes.test	2009-05-27 13:34:05 +0000
+++ b/mysql-test/suite/backup/t/backup_datatypes.test	2009-10-26 14:47:30 +0000
@@ -93,6 +93,17 @@ DESCRIBE `§¶œ`;
 --replace_column 1 #
 BACKUP DATABASE `¥ü` to 'bup_datatype.bak';
 
+#
+# BUG#48151 : Table names with uppercase characters and not being
+# closed completely for Mac OS X systems.
+#
+if (`select @@version_compile_os like 'apple-darwin%'`)
+{
+  --disable_query_log
+  FLUSH TABLES;
+  --enable_query_log
+}
+
 --echo ** dropping  database**
 DROP DATABASE `¥ü`;
 

Attachment: [text/bzr-bundle] bzr/[e-mail]