List:Commits« Previous MessageNext Message »
From:Georgi Kodinov Date:March 22 2011 12:05pm
Subject:bzr commit into mysql-trunk branch (Georgi.Kodinov:3307)
View as plain text  
#At file:///Users/kgeorge/mysql/work/B11763135-trunk/ based on revid:georgi.kodinov@stripped

 3307 Georgi Kodinov	2011-03-22 [merge]
      merge

    modified:
      mysql-test/collections/default.daily
      mysql-test/extra/rpl_tests/rpl_crash_safe.inc
      mysql-test/suite/binlog/t/binlog_variables_relay_log.test
      mysql-test/suite/binlog/t/binlog_variables_relay_log_index.test
      mysql-test/suite/rpl/r/rpl_row_crash_safe.result
      mysql-test/suite/rpl/r/rpl_stm_mixed_crash_safe.result
      mysql-test/suite/rpl/t/rpl_000017.test
      mysql-test/t/flush2.test
=== modified file 'mysql-test/collections/default.daily'
--- a/mysql-test/collections/default.daily	2011-03-11 09:58:45 +0000
+++ b/mysql-test/collections/default.daily	2011-03-22 10:56:44 +0000
@@ -14,3 +14,5 @@ perl mysql-test-run.pl --force --timer -
 perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=nist                 --vardir=var-nist                --suite=nist
 perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=nist+ps              --vardir=var-ps_nist             --suite=nist                                        --ps-protocol
 perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=rpl_binlog_checksum  --vardir=var-rpl_binlog_checksum --suite=rpl,binlog --mysqld=--binlog-checksum=CRC32 --skip-test-list=collections/disabled-daily.list
+perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=rpl_crash_safe_relay --vardir=var-rpl_crash_safe_relay --suite=rpl --mysqld=--relay-log-info-repository=TABLE --skip-test-list=collections/disabled-daily.list
+perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=rpl_crash_safe_master --vardir=var-rpl_crash_safe_master --suite=rpl --mysqld=--master-info-repository=TABLE --skip-test-list=collections/disabled-daily.list

=== modified file 'mysql-test/extra/rpl_tests/rpl_crash_safe.inc'
--- a/mysql-test/extra/rpl_tests/rpl_crash_safe.inc	2010-12-20 14:27:17 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_crash_safe.inc	2011-03-22 10:56:44 +0000
@@ -10,9 +10,11 @@
 if (`SELECT HEX(@commands) = HEX('configure')`)
 {
   --sync_slave_with_master
+  --source include/stop_slave.inc
   SHOW CREATE TABLE mysql.slave_relay_log_info;
   ALTER TABLE mysql.slave_relay_log_info ENGINE= Innodb;
   SHOW CREATE TABLE mysql.slave_relay_log_info;
+  --source include/start_slave.inc
 
   connection master;
   --source extra/rpl_tests/rpl_mixing_engines.inc

=== modified file 'mysql-test/suite/binlog/t/binlog_variables_relay_log.test'
--- a/mysql-test/suite/binlog/t/binlog_variables_relay_log.test	2010-11-04 14:43:52 +0000
+++ b/mysql-test/suite/binlog/t/binlog_variables_relay_log.test	2011-03-22 10:56:44 +0000
@@ -1,4 +1,5 @@
 --source include/not_embedded.inc
+--source include/not_relay_log_info_table.inc
 
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 --query_vertical SHOW VARIABLES LIKE 'relay_log%'

=== modified file 'mysql-test/suite/binlog/t/binlog_variables_relay_log_index.test'
--- a/mysql-test/suite/binlog/t/binlog_variables_relay_log_index.test	2010-11-04 14:43:52 +0000
+++ b/mysql-test/suite/binlog/t/binlog_variables_relay_log_index.test	2011-03-22 10:56:44 +0000
@@ -1,4 +1,5 @@
 --source include/not_embedded.inc
+--source include/not_relay_log_info_table.inc
 
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 --query_vertical SHOW VARIABLES LIKE 'relay_log%'

=== modified file 'mysql-test/suite/rpl/r/rpl_row_crash_safe.result'
--- a/mysql-test/suite/rpl/r/rpl_row_crash_safe.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_crash_safe.result	2011-03-22 10:56:44 +0000
@@ -10,6 +10,7 @@ call mtr.add_suppression(".*int __cxa_pu
 ###################################################################################
 SET @verbose= 'Y';
 SET @commands= 'configure';
+include/stop_slave.inc
 SHOW CREATE TABLE mysql.slave_relay_log_info;
 Table	Create Table
 slave_relay_log_info	CREATE TABLE `slave_relay_log_info` (
@@ -35,6 +36,7 @@ slave_relay_log_info	CREATE TABLE `slave
   `Sql_delay` int(11) NOT NULL,
   PRIMARY KEY (`Master_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Relay Log Information'
+include/start_slave.inc
 SET SQL_LOG_BIN=0;
 CREATE TABLE nt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
 CREATE TABLE nt_2 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_mixed_crash_safe.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_mixed_crash_safe.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_mixed_crash_safe.result	2011-03-22 10:56:44 +0000
@@ -10,6 +10,7 @@ call mtr.add_suppression(".*int __cxa_pu
 ###################################################################################
 SET @verbose= 'Y';
 SET @commands= 'configure';
+include/stop_slave.inc
 SHOW CREATE TABLE mysql.slave_relay_log_info;
 Table	Create Table
 slave_relay_log_info	CREATE TABLE `slave_relay_log_info` (
@@ -35,6 +36,7 @@ slave_relay_log_info	CREATE TABLE `slave
   `Sql_delay` int(11) NOT NULL,
   PRIMARY KEY (`Master_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Relay Log Information'
+include/start_slave.inc
 SET SQL_LOG_BIN=0;
 CREATE TABLE nt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
 CREATE TABLE nt_2 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;

=== modified file 'mysql-test/suite/rpl/t/rpl_000017.test'
--- a/mysql-test/suite/rpl/t/rpl_000017.test	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/t/rpl_000017.test	2011-03-22 10:56:44 +0000
@@ -8,6 +8,7 @@
 # --skip-slave-start.
 
 --source include/not_windows.inc
+--source include/not_master_info_table.inc
 
 --let $rpl_skip_start_slave= 1
 --source include/master-slave.inc

=== modified file 'mysql-test/t/flush2.test'
--- a/mysql-test/t/flush2.test	2010-11-17 08:49:58 +0000
+++ b/mysql-test/t/flush2.test	2011-03-22 10:56:44 +0000
@@ -3,6 +3,7 @@
 #
 
 --source include/not_embedded.inc
+--source include/not_relay_log_info_table.inc
 
 flush logs;
 set global expire_logs_days = 3;

No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).
Thread
bzr commit into mysql-trunk branch (Georgi.Kodinov:3307) Georgi Kodinov22 Mar