List:Commits« Previous MessageNext Message »
From:Shivji Kumar Jha Date:July 9 2013 11:53am
Subject:bzr push into mysql-trunk-wl3656 branch (shivji.jha:5504 to 5505) WL#3656
View as plain text  
 5505 Shivji Kumar Jha	2013-07-09
      WL#3656- PERFORMANCE SCHEMA table for SHOW SLAVE STATUS
            
      Fix to handle windows failures in WL branch(mysql-trunk-wl3656)

    modified:
      mysql-test/suite/perfschema/r/ddl_replication_execute_status_by_worker.result
      mysql-test/suite/perfschema/r/dml_replication_execute_status_by_worker.result
      mysql-test/suite/perfschema/t/ddl_replication_execute_status_by_worker.test
      mysql-test/suite/perfschema/t/dml_replication_execute_status_by_worker.test
 5504 Shivji Kumar Jha	2013-07-09
      WL#3656- PERFORMANCE SCHEMA table for SHOW SLAVE STATUS
      
      Fix to handle some failures in WL branch(mysql-trunk-wl3656)

    modified:
      mysql-test/suite/perfschema/r/dml_replication_connection_configuration.result
=== modified file 'mysql-test/suite/perfschema/r/ddl_replication_execute_status_by_worker.result'
--- a/mysql-test/suite/perfschema/r/ddl_replication_execute_status_by_worker.result	revid:shivji.jha@stripped
+++ b/mysql-test/suite/perfschema/r/ddl_replication_execute_status_by_worker.result	revid:shivji.jha@stripped
@@ -31,6 +31,8 @@ CREATE UNIQUE INDEX test_index ON
 performance_schema.replication_execute_status_by_worker(worker_id);
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 include/stop_slave.inc
+reset master;
+reset slave;
 set @@global.slave_parallel_workers= @save.slave_parallel_workers;
 set @@global.slave_transaction_retries= @save.slave_transaction_retries;
 include/start_slave.inc

=== modified file 'mysql-test/suite/perfschema/r/dml_replication_execute_status_by_worker.result'
--- a/mysql-test/suite/perfschema/r/dml_replication_execute_status_by_worker.result	revid:shivji.jha@stripped
+++ b/mysql-test/suite/perfschema/r/dml_replication_execute_status_by_worker.result	revid:shivji.jha@stripped
@@ -59,6 +59,8 @@ LOCK TABLES performance_schema.replicati
 ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'replication_execute_status_by_worker'
 UNLOCK TABLES;
 include/stop_slave.inc
+reset master;
+reset slave;
 set @@global.slave_parallel_workers= @save.slave_parallel_workers;
 set @@global.slave_transaction_retries= @save.slave_transaction_retries;
 include/start_slave.inc

=== modified file 'mysql-test/suite/perfschema/t/ddl_replication_execute_status_by_worker.test'
--- a/mysql-test/suite/perfschema/t/ddl_replication_execute_status_by_worker.test	revid:shivji.jha@stripped
+++ b/mysql-test/suite/perfschema/t/ddl_replication_execute_status_by_worker.test	revid:shivji.jha@stripped
@@ -50,6 +50,10 @@ CREATE UNIQUE INDEX test_index ON
 
 #Cleanup
 source include/stop_slave.inc;
+# we reset master and slave to prevent errors above affecting start_slave.inc
+# below.
+reset master;
+reset slave;
 set @@global.slave_parallel_workers= @save.slave_parallel_workers;
 set @@global.slave_transaction_retries= @save.slave_transaction_retries;
 source include/start_slave.inc;

=== modified file 'mysql-test/suite/perfschema/t/dml_replication_execute_status_by_worker.test'
--- a/mysql-test/suite/perfschema/t/dml_replication_execute_status_by_worker.test	revid:shivji.jha@stripped
+++ b/mysql-test/suite/perfschema/t/dml_replication_execute_status_by_worker.test	revid:shivji.jha@stripped
@@ -92,6 +92,10 @@ UNLOCK TABLES;
 
 #Cleanup
 source include/stop_slave.inc;
+# we reset master and slave to prevent errors above affecting start_slave.inc
+# below.
+reset master;
+reset slave;
 set @@global.slave_parallel_workers= @save.slave_parallel_workers;
 set @@global.slave_transaction_retries= @save.slave_transaction_retries;
 source include/start_slave.inc;

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk-wl3656 branch (shivji.jha:5504 to 5505) WL#3656Shivji Kumar Jha20 Aug