MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Serge Kozlov Date:February 2 2009 9:29pm
Subject:bzr commit into mysql-6.0-bugteam branch (Serge.Kozlov:3005) Bug#38603
View as plain text  
#At file:///home/ksm/sun/repo/bug38603/mysql-6.0-bugteam/ based on revid:aelkin@stripped

 3005 Serge Kozlov	2009-02-03 [merge]
      Bug#38603: 
      The patch adds restart of mysql server and replacing of binlog file 
      when mysql server is stopped.
modified:
  mysql-test/suite/rpl/r/rpl_trigger.result
  mysql-test/suite/rpl/t/rpl_trigger.test

=== modified file 'mysql-test/suite/rpl/r/rpl_trigger.result'
--- a/mysql-test/suite/rpl/r/rpl_trigger.result	2008-12-08 13:31:24 +0000
+++ b/mysql-test/suite/rpl/r/rpl_trigger.result	2009-02-02 21:29:18 +0000
@@ -862,6 +862,9 @@ drop table t21,t31;
 drop table t11;
 STOP SLAVE;
 FLUSH LOGS;
+--> Stop master server
+--> Start master server
+--> Master binlog: Server ver: 5.0.16-debug-log, Binlog ver: 4
 RESET SLAVE;
 START SLAVE;
 SELECT MASTER_POS_WAIT('master-bin.000001', 513) >= 0;

=== modified file 'mysql-test/suite/rpl/t/rpl_trigger.test'
--- a/mysql-test/suite/rpl/t/rpl_trigger.test	2009-02-01 14:30:58 +0000
+++ b/mysql-test/suite/rpl/t/rpl_trigger.test	2009-02-02 21:29:18 +0000
@@ -298,8 +298,28 @@ STOP SLAVE;
 connection master;
 let $MYSQLD_DATADIR= `select @@datadir`;
 FLUSH LOGS;
+
+# Stop master server
+--echo --> Stop master server
+--write_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+wait
+EOF
+--shutdown_server 10
+--source include/wait_until_disconnected.inc
+# Replace binlog
 remove_file $MYSQLD_DATADIR/master-bin.000001;
 copy_file $MYSQL_TEST_DIR/std_data/bug16266.000001 $MYSQLD_DATADIR/master-bin.000001;
+  
+--echo --> Start master server
+--append_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+restart
+EOF
+--enable_reconnect
+--source include/wait_until_connected_again.inc
+let $binlog_version= query_get_value(SHOW BINLOG EVENTS, Info, 1);
+
+# Make the slave to replay the new binlog.
+--echo --> Master binlog: $binlog_version
 
 # Make the slave to replay the new binlog.
 

Thread
bzr commit into mysql-6.0-bugteam branch (Serge.Kozlov:3005) Bug#38603Serge Kozlov2 Feb