List:Commits« Previous MessageNext Message »
From:Luis Soares Date:March 30 2010 10:57pm
Subject:bzr push into mysql-5.1-rpl-wl5092 branch (luis.soares:3184 to 3185)
View as plain text  
 3185 Luis Soares	2010-03-30
      Various test cases clean up and small improvements:
      
        - diff_tables.inc
          removed check of CURRENT_CONNECTION before switching
          connection.
      
        - rpl_loaddata 
          small fix to make it compliant with new diff_tables behavior
          of restoring the original connection at the end;
      
        - rpl_nondeterministic_functions
          clean up was not being properly done. Also, exhibited the
          same issue as rpl_loaddata;
      
        - rpl_row_tbl_metadata
          Minor clean up.

    modified:
      mysql-test/include/diff_tables.inc
      mysql-test/suite/rpl/t/rpl_loadfile.test
      mysql-test/suite/rpl/t/rpl_nondeterministic_functions.test
      mysql-test/suite/rpl/t/rpl_row_tbl_metadata.test
 3184 Luis Soares	2010-03-30
      Fixes for two rpl_ndb failures.
      
        - rpl_ndb_extrCol
          Now that full row is enforced, NDB has
          marked on the write set the columns that 
          were filled with default values. As such
          it will not ignore them.
      
        - rpl_ndb_idempotent
          disabled due to BUG#52473

    modified:
      mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result
      mysql-test/suite/rpl_ndb/t/disabled.def
=== modified file 'mysql-test/include/diff_tables.inc'
--- a/mysql-test/include/diff_tables.inc	2010-03-26 11:09:50 +0000
+++ b/mysql-test/include/diff_tables.inc	2010-03-30 22:46:05 +0000
@@ -86,13 +86,7 @@ let $_diff_i=2;
 let $_connection_name=$conn2;
 while ($_diff_i) {
 
-  # we need to check whether the current connection name matches the
-  # one provided in the current parameter. If it does not, then we
-  # switch the connection
-  if (`SELECT STRCMP('$CURRENT_CONNECTION', '$_connection_name')=0`)
-  {
-    -- connection $_connection_name
-  }
+  -- connection $_connection_name
 
   # Sanity-check the input.
   let $_diff_error= `SELECT '$_diff_table' NOT LIKE '_%._%'`;

=== modified file 'mysql-test/suite/rpl/t/rpl_loadfile.test'
--- a/mysql-test/suite/rpl/t/rpl_loadfile.test	2009-03-27 10:59:31 +0000
+++ b/mysql-test/suite/rpl/t/rpl_loadfile.test	2010-03-30 22:46:05 +0000
@@ -110,6 +110,7 @@ let $diff_table_2=slave:test.t1;
 source include/diff_tables.inc;
 
 # CLEAN UP
+connection master;
 DROP TABLE t1;
 DROP PROCEDURE p;
 sync_slave_with_master;

=== modified file 'mysql-test/suite/rpl/t/rpl_nondeterministic_functions.test'
--- a/mysql-test/suite/rpl/t/rpl_nondeterministic_functions.test	2010-02-13 11:02:46 +0000
+++ b/mysql-test/suite/rpl/t/rpl_nondeterministic_functions.test	2010-03-30 22:46:05 +0000
@@ -54,4 +54,6 @@ INSERT INTO t1 VALUES (LAST_INSERT_ID())
 --let $diff_table_2= slave:test.t1
 --source include/diff_tables.inc
 
+--connection master
 DROP TABLE t1;
+--sync_slave_with_master

=== modified file 'mysql-test/suite/rpl/t/rpl_row_tbl_metadata.test'
--- a/mysql-test/suite/rpl/t/rpl_row_tbl_metadata.test	2010-01-14 10:49:40 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_tbl_metadata.test	2010-03-30 22:46:05 +0000
@@ -197,9 +197,8 @@ FLUSH LOGS;
 -- let $diff_table_2=slave:test.t1
 -- source include/diff_tables.inc
 
-DROP TABLE `t1`;
-
 -- connection master
+DROP TABLE `t1`;
 -- sync_slave_with_master
 -- connection master
 


Attachment: [text/bzr-bundle] bzr/luis.soares@sun.com-20100330224605-s68sx9unhj007c33.bundle
Thread
bzr push into mysql-5.1-rpl-wl5092 branch (luis.soares:3184 to 3185)Luis Soares31 Mar