MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Martin Skold Date:May 10 2010 6:24am
Subject:bzr commit into mysql-5.1-telco-7.0 branch (Martin.Skold:3529) Bug#52859
View as plain text  
#At file:///home/marty/MySQL/mysql-5.1-telco-7.0/

 3529 Martin Skold	2010-05-10
      Bug#52859 Replication fails to start after an SQL node restart: Fixed test case to work in Windows
      modified:
        mysql-test/suite/rpl_ndb/r/rpl_ndb_slave_restart.result
        mysql-test/suite/rpl_ndb/t/rpl_ndb_slave_restart.test

=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_slave_restart.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_slave_restart.result	2010-05-06 12:17:56 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_slave_restart.result	2010-05-10 06:24:32 +0000
@@ -36,9 +36,7 @@ master-bin.000001	#	Write_rows	3	#	table
 master-bin.000001	#	Write_rows	3	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	3	#	COMMIT
 set SQL_LOG_BIN=1;
-SELECT @the_pos:=Position,@the_file:=SUBSTRING_INDEX(FILE, '/', -1)
-FROM mysql.ndb_binlog_index WHERE epoch = <the_epoch> ;
-@the_pos:=Position	@the_file:=SUBSTRING_INDEX(FILE, '/', -1)
+@the_pos:=Position	@the_file:=SUBSTRING_INDEX(REPLACE(FILE,'\\','/'), '/', -1)
 107	master-bin.000001
 CHANGE MASTER TO
 master_port=<MASTER_PORT1>,

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_slave_restart.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_slave_restart.test	2010-05-06 12:17:56 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_slave_restart.test	2010-05-10 06:24:32 +0000
@@ -45,8 +45,11 @@ insert into t2 values (1);
 -- source include/show_binlog_events2.inc
 set SQL_LOG_BIN=1;
 --replace_result $the_epoch <the_epoch>
-eval SELECT @the_pos:=Position,@the_file:=SUBSTRING_INDEX(FILE, '/', -1)
+--disable_query_log
+eval SELECT @the_pos:=Position,
+   @the_file:=SUBSTRING_INDEX(REPLACE(FILE,'\\\\','/'), '/', -1)
    FROM mysql.ndb_binlog_index WHERE epoch = $the_epoch ;
+--enable_query_log
 let $the_pos= `SELECT @the_pos` ;
 let $the_file= `SELECT @the_file` ;
 

Thread
bzr commit into mysql-5.1-telco-7.0 branch (Martin.Skold:3529) Bug#52859Martin Skold10 May