List:Commits« Previous MessageNext Message »
From:magnus.blaudd Date:October 4 2011 1:57pm
Subject:bzr push into mysql-trunk-cluster branch (magnus.blaudd:3392 to 3395)
View as plain text  
 3395 magnus.blaudd@stripped	2011-10-04
      Merge

    modified:
      mysql-test/suite/rpl_ndb/r/rpl_ndb_relayrotate.result
 3394 magnus.blaudd@stripped	2011-10-04
      Merge

    modified:
      mysql-test/suite/rpl_ndb/r/rpl_ndb_row_basic.result
 3393 magnus.blaudd@stripped	2011-10-04
      Merge

    modified:
      mysql-test/suite/rpl_ndb/r/rpl_ndb_sp006.result
 3392 magnus.blaudd@stripped	2011-09-30
      ndb - remove abstract_query_plan.h/cc, should be added to trunk as part of it's own WL#

    removed:
      sql/abstract_query_plan.cc
      sql/abstract_query_plan.h
=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_relayrotate.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_relayrotate.result	2011-04-15 12:45:47 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_relayrotate.result	2011-10-04 13:26:40 +0000
@@ -8,6 +8,6 @@ stop slave;
 start slave;
 select max(a) from t1;
 max(a)
-8000
+loop_max
 drop table t1;
 include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_row_basic.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_row_basic.result	2011-05-18 12:56:24 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_row_basic.result	2011-10-04 13:21:28 +0000
@@ -481,6 +481,7 @@ SET GLOBAL SLAVE_TYPE_CONVERSIONS = @sav
 call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 1 size mismatch.* Error_code: 1535");
 call mtr.add_suppression("Slave SQL.*Could not execute Delete_rows event on table test.t1.* Error_code: 1032");
 call mtr.add_suppression("Slave SQL.*Column 1 of table .test.t.. cannot be converted from type.*, Error_code: 1677");
+call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
 include/rpl_reset.inc
 [expecting slave to replicate correctly]
 INSERT INTO t4 VALUES (1, "", 1);

=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_sp006.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_sp006.result	2011-04-19 12:52:12 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_sp006.result	2011-10-04 13:18:37 +0000
@@ -34,8 +34,6 @@ INSERT INTO t1 VALUES ('MySQL','1993-02-
 END|
 CALL p2();
 CALL p1();
-Warnings:
-Error	1329	No data - zero rows fetched, selected, or processed
 DROP TABLE t1;
 DROP TABLE t2;
 DROP PROCEDURE p1;

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk-cluster branch (magnus.blaudd:3392 to 3395) magnus.blaudd5 Oct