bzr commit into mysql-6.0-bugfixing branch (davi:2837) Bug#45238

[Davi Arnaut]

# At a local mysql-6.0-bugfixing repository of davi

 2837 Davi Arnaut	2009-09-23
      Post-merge fix for Bug#45238: re-enable disabled test cases.

    modified:
      mysql-test/include/master-slave.inc
      mysql-test/suite/rpl/t/rpl_backup_multi.test
      mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test
      mysql-test/suite/rpl/t/rpl_row_colSize.test
      mysql-test/suite/rpl/t/rpl_row_create_table.test
      mysql-test/suite/rpl/t/rpl_stm_log.test
      mysql-test/suite/rpl/t/rpl_temporary.test
      mysql-test/suite/rpl/t/rpl_truncate_3innodb.test
=== modified file 'mysql-test/include/master-slave.inc'
--- a/mysql-test/include/master-slave.inc	2009-06-25 12:33:12 +0000
+++ b/mysql-test/include/master-slave.inc	2009-09-23 20:37:24 +0000
@@ -1,9 +1,5 @@
 # Replication tests need binlog
 #
-
-# -- [DISABLED Bug#45238]
---source include/not_windows.inc
-
 # $skip_slave_start  If true, the slave will not be started
 source include/have_log_bin.inc;
 

=== modified file 'mysql-test/suite/rpl/t/rpl_backup_multi.test'
--- a/mysql-test/suite/rpl/t/rpl_backup_multi.test	2009-06-24 19:39:33 +0000
+++ b/mysql-test/suite/rpl/t/rpl_backup_multi.test	2009-09-23 20:37:24 +0000
@@ -8,10 +8,6 @@
 
 --source include/not_embedded.inc
 --source include/have_innodb.inc
-
-# -- [DISABLED Bug#45238]
---source include/not_windows.inc
-
 # Set up multi master-slave configuration
 --source suite/rpl/include/rpl_backup_multi.inc
 

=== modified file 'mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test'
--- a/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test	2009-06-24 19:39:33 +0000
+++ b/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test	2009-09-23 20:37:24 +0000
@@ -7,9 +7,6 @@
 #############################################################
 --source include/have_innodb.inc
 
-# -- [DISABLED Bug#45238]
---source include/not_windows.inc
-
 # Use wait_for_slave_to_(start|stop) for current connections
 let $keep_connection= 1;
 

=== modified file 'mysql-test/suite/rpl/t/rpl_row_colSize.test'
--- a/mysql-test/suite/rpl/t/rpl_row_colSize.test	2009-06-24 19:39:33 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_colSize.test	2009-09-23 20:37:24 +0000
@@ -6,9 +6,6 @@
 # having columns that are smaller (shorter) than the slave.      #
 ##################################################################
 
-# -- [DISABLED Bug#45238]
---source include/not_windows.inc
-
 -- source include/master-slave.inc
 -- source include/have_binlog_format_row.inc
 

=== modified file 'mysql-test/suite/rpl/t/rpl_row_create_table.test'
--- a/mysql-test/suite/rpl/t/rpl_row_create_table.test	2009-06-24 19:39:33 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_create_table.test	2009-09-23 20:37:24 +0000
@@ -1,9 +1,5 @@
 # Testing table creations for row-based replication.
 --source include/have_binlog_format_row.inc
-
-# -- [DISABLED Bug#45238]
---source include/not_windows.inc
-
 --source include/master-slave.inc
 --source include/have_innodb.inc
 connection slave;

=== modified file 'mysql-test/suite/rpl/t/rpl_stm_log.test'
--- a/mysql-test/suite/rpl/t/rpl_stm_log.test	2009-06-24 19:39:33 +0000
+++ b/mysql-test/suite/rpl/t/rpl_stm_log.test	2009-09-23 20:37:24 +0000
@@ -1,10 +1,6 @@
 # Requires statement logging
 
 -- source include/have_binlog_format_mixed_or_statement.inc
-
-# -- [DISABLED Bug#45238]
---source include/not_windows.inc
-
 -- source include/master-slave.inc
 let $engine_type=MyISAM;
 -- source extra/rpl_tests/rpl_log.test

=== modified file 'mysql-test/suite/rpl/t/rpl_temporary.test'
--- a/mysql-test/suite/rpl/t/rpl_temporary.test	2009-06-24 19:39:33 +0000
+++ b/mysql-test/suite/rpl/t/rpl_temporary.test	2009-09-23 20:37:24 +0000
@@ -1,9 +1,5 @@
 # Test need anonymous user when connection are made as "zedjzlcsjhd"
 source include/add_anonymous_users.inc;
-
-# -- [DISABLED Bug#45238]
---source include/not_windows.inc
-
 -- source include/master-slave.inc
 
 # Clean up old slave's binlogs.

=== modified file 'mysql-test/suite/rpl/t/rpl_truncate_3innodb.test'
--- a/mysql-test/suite/rpl/t/rpl_truncate_3innodb.test	2009-06-24 19:39:33 +0000
+++ b/mysql-test/suite/rpl/t/rpl_truncate_3innodb.test	2009-09-23 20:37:24 +0000
@@ -1,10 +1,4 @@
-
 --source include/have_innodb.inc
 --source include/not_ndb_default.inc
-
-# -- [DISABLED Bug#45238]
---source include/not_windows.inc
-
-
 let $engine=InnoDB;
 --source extra/rpl_tests/rpl_truncate.test


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