List:Commits« Previous MessageNext Message »
From:Alfranio Correia Date:October 2 2009 3:45pm
Subject:bzr commit into mysql-5.1-bugteam branch (alfranio.correia:3109)
Bug#47160
View as plain text  
#At file:///home/acorreia/workspace.sun/repository.mysql/bzrwork/bug-47160/mysql-5.1-bugteam/ based on revid:alexey.kopytov@stripped

 3109 Alfranio Correia	2009-10-02
      BUG#47160 rpl_binlog_max_cache_size fails sporadically on PB2
      
      The errors reported seem to be related to environment problems, specifically
      storage space. There are other tests failing due to the same reasons.
      
      In this patch, however, we are going to try to minimize the problem by avoiding
      using ./include/diff_master_slave.inc as it dumps tables in order to the
      comparison. In particular, this is not a good approach as the tables are bigger
      than usual to trigger the cache failures.

    modified:
      mysql-test/suite/rpl/r/rpl_binlog_max_cache_size.result
      mysql-test/suite/rpl/t/rpl_binlog_max_cache_size.test
=== modified file 'mysql-test/suite/rpl/r/rpl_binlog_max_cache_size.result'
--- a/mysql-test/suite/rpl/r/rpl_binlog_max_cache_size.result	2009-06-18 13:52:46 +0000
+++ b/mysql-test/suite/rpl/r/rpl_binlog_max_cache_size.result	2009-10-02 15:45:46 +0000
@@ -34,7 +34,12 @@ Got one of the listed errors
 BEGIN;
 Got one of the listed errors
 Got one of the listed errors
-source include/diff_master_slave.inc;
+SELECT SUM(COALESCE(a,1)) FROM t1;
+SUM(COALESCE(a,1))
+232
+SELECT SUM(COALESCE(a,1)) FROM t1;
+SUM(COALESCE(a,1))
+232
 ########################################################################################
 #                                     3 - BEGIN - COMMIT
 ########################################################################################
@@ -46,7 +51,12 @@ Got one of the listed errors
 Got one of the listed errors
 Got one of the listed errors
 COMMIT;
-source include/diff_master_slave.inc;
+SELECT SUM(COALESCE(a,1)) FROM t1;
+SUM(COALESCE(a,1))
+22
+SELECT SUM(COALESCE(a,1)) FROM t1;
+SUM(COALESCE(a,1))
+22
 ########################################################################################
 #                                      4 - BEGIN - ROLLBACK
 ########################################################################################
@@ -60,7 +70,12 @@ Got one of the listed errors
 ROLLBACK;
 Warnings:
 Warning	1196	Some non-transactional changed tables couldn't be rolled back
-source include/diff_master_slave.inc;
+SELECT SUM(COALESCE(a,1)) FROM t1;
+SUM(COALESCE(a,1))
+NULL
+SELECT SUM(COALESCE(a,1)) FROM t1;
+SUM(COALESCE(a,1))
+NULL
 ########################################################################################
 #                                         5 - PROCEDURE 
 ########################################################################################
@@ -84,7 +99,12 @@ TRUNCATE TABLE t1;
 BEGIN;
 Got one of the listed errors
 ROLLBACK;
-source include/diff_master_slave.inc;
+SELECT SUM(COALESCE(a,1)) FROM t1;
+SUM(COALESCE(a,1))
+NULL
+SELECT SUM(COALESCE(a,1)) FROM t1;
+SUM(COALESCE(a,1))
+NULL
 ########################################################################################
 #                                           6 - XID
 ########################################################################################
@@ -99,7 +119,12 @@ ROLLBACK TO sv;
 Warnings:
 Warning	1196	Some non-transactional changed tables couldn't be rolled back
 COMMIT;
-source include/diff_master_slave.inc;
+SELECT SUM(COALESCE(a,1)) FROM t1;
+SUM(COALESCE(a,1))
+6
+SELECT SUM(COALESCE(a,1)) FROM t1;
+SUM(COALESCE(a,1))
+6
 ########################################################################################
 #                                        7 - NON-TRANS TABLE
 ########################################################################################

=== modified file 'mysql-test/suite/rpl/t/rpl_binlog_max_cache_size.test'
--- a/mysql-test/suite/rpl/t/rpl_binlog_max_cache_size.test	2009-06-18 13:52:46 +0000
+++ b/mysql-test/suite/rpl/t/rpl_binlog_max_cache_size.test	2009-10-02 15:45:46 +0000
@@ -186,8 +186,10 @@ BEGIN;
 CREATE TABLE t5 (a int);
 --enable_query_log
 
-let $diff_statement= SELECT * FROM t1;
---source include/diff_master_slave.inc
+connection master;
+SELECT SUM(COALESCE(a,1)) FROM t1;
+--sync_slave_with_master
+SELECT SUM(COALESCE(a,1)) FROM t1;
 
 --echo ########################################################################################
 --echo #                                     3 - BEGIN - COMMIT
@@ -215,8 +217,10 @@ BEGIN;
 --enable_query_log
 COMMIT;
 
-let $diff_statement= SELECT * FROM t1;
---source include/diff_master_slave.inc
+connection master;
+SELECT SUM(COALESCE(a,1)) FROM t1;
+--sync_slave_with_master
+SELECT SUM(COALESCE(a,1)) FROM t1;
 
 --echo ########################################################################################
 --echo #                                      4 - BEGIN - ROLLBACK
@@ -244,8 +248,10 @@ BEGIN;
 --enable_query_log
 ROLLBACK;
 
-let $diff_statement= SELECT * FROM t1;
---source include/diff_master_slave.inc
+connection master;
+SELECT SUM(COALESCE(a,1)) FROM t1;
+--sync_slave_with_master
+SELECT SUM(COALESCE(a,1)) FROM t1;
 
 --echo ########################################################################################
 --echo #                                         5 - PROCEDURE 
@@ -293,8 +299,10 @@ eval CALL p1($data);
 --enable_query_log
 ROLLBACK;
 
-let $diff_statement= SELECT * FROM t1;
---source include/diff_master_slave.inc
+connection master;
+SELECT SUM(COALESCE(a,1)) FROM t1;
+--sync_slave_with_master
+SELECT SUM(COALESCE(a,1)) FROM t1;
 
 --echo ########################################################################################
 --echo #                                           6 - XID
@@ -324,8 +332,10 @@ SAVEPOINT sv;
 ROLLBACK TO sv;
 COMMIT;
 
-let $diff_statement= SELECT * FROM t1;
---source include/diff_master_slave.inc
+connection master;
+SELECT SUM(COALESCE(a,1)) FROM t1;
+--sync_slave_with_master
+SELECT SUM(COALESCE(a,1)) FROM t1;
 
 --echo ########################################################################################
 --echo #                                        7 - NON-TRANS TABLE


Attachment: [text/bzr-bundle]
Thread
bzr commit into mysql-5.1-bugteam branch (alfranio.correia:3109)Bug#47160Alfranio Correia2 Oct