List:Commits« Previous MessageNext Message »
From:Alfranio Correia Date:August 26 2010 4:38pm
Subject:bzr push into mysql-next-mr-rpl-merge branch (alfranio.correia:3018 to 3019)
View as plain text  
 3019 Alfranio Correia	2010-08-26
      Fixed result file and temporary removed crash-safe collections until some bugs
      are fixed. To reproduce the bugs, run the following test case:
      
      ./mtr rpl_heartbeat_basic --mysqld=--relay-log-info-repository=TABLE --mysqld=--master-info-repository=TABLE

    removed:
      mysql-test/collections/mysql-next-mr.crash-safe.daily
      mysql-test/collections/mysql-next-mr.crash-safe.push
      mysql-test/collections/mysql-next-mr.crash-safe.weekly
    modified:
      mysql-test/r/mysql_upgrade_ssl.result
      mysql-test/suite/rpl/t/rpl_heartbeat_basic.test
 3018 Alfranio Correia	2010-08-25
      Removed old comment.

    modified:
      sql/rpl_slave.cc
=== removed file 'mysql-test/collections/mysql-next-mr.crash-safe.daily'
--- a/mysql-test/collections/mysql-next-mr.crash-safe.daily	2010-08-24 09:08:11 +0000
+++ b/mysql-test/collections/mysql-next-mr.crash-safe.daily	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=n_mix          --vardir=var-n_mix                  --mysqld=--binlog-format=mixed
-perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=ps_row         --vardir=var-ps_row   --ps-protocol --mysqld=--binlog-format=row
-perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=embedded       --vardir=var-emebbed  --embedded
-perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=funcs_1        --vardir=var-funcs_1                                              --suite=funcs_1
-perl mysql-test-run.pl --timer --force --parallel=auto                                                 --comment=rpl_ndb_row    --vardir=var-rpl_ndb_row            --mysqld=--binlog-format=row  --suite=rpl_ndb,ndb
-perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=rpl_binlog_row --vardir=var-rpl_binlog_row --mysqld=--binlog-format=row --suite=rpl,binlog --skip-ndb
-perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=n_mix_relay          --vardir=var-n_mix_relay                  --mysqld=--binlog-format=mixed --mysqld=--relay-log-info-repository=TABLE
-perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=ps_row_relay         --vardir=var-ps_row_relay   --ps-protocol --mysqld=--binlog-format=row --mysqld=--relay-log-info-repository=TABLE
-perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=embedded_relay       --vardir=var-emebbed_relay  --embedded --mysqld=--relay-log-info-repository=TABLE
-perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=funcs_1_relay        --vardir=var-funcs_1_relay                                              --suite=funcs_1 --mysqld=--relay-log-info-repository=TABLE
-perl mysql-test-run.pl --timer --force --parallel=auto                                                 --comment=rpl_ndb_row_relay    --vardir=var-rpl_ndb_row_relay            --mysqld=--binlog-format=row  --suite=rpl_ndb,ndb --mysqld=--relay-log-info-repository=TABLE
-perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=rpl_binlog_row_relay --vardir=var-rpl_binlog_row_relay --mysqld=--binlog-format=row --suite=rpl,binlog --skip-ndb --mysqld=--relay-log-info-repository=TABLE
-perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=n_mix_master          --vardir=var-n_mix_master                  --mysqld=--binlog-format=mixed --mysqld=--master-info-repository=TABLE
-perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=ps_row_master         --vardir=var-ps_row_master   --ps-protocol --mysqld=--binlog-format=row --mysqld=--master-info-repository=TABLE
-perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=embedded_master       --vardir=var-emebbed_master  --embedded --mysqld=--master-info-repository=TABLE
-perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=funcs_1_master        --vardir=var-funcs_1_master                                              --suite=funcs_1 --mysqld=--master-info-repository=TABLE
-perl mysql-test-run.pl --timer --force --parallel=auto                                                 --comment=rpl_ndb_row_master    --vardir=var-rpl_ndb_row_master            --mysqld=--binlog-format=row  --suite=rpl_ndb,ndb --mysqld=--master-info-repository=TABLE
-perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=rpl_binlog_row_master --vardir=var-rpl_binlog_row_master --mysqld=--binlog-format=row --suite=rpl,binlog --skip-ndb --mysqld=--master-info-repository=TABLE
-perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=n_mix_both          --vardir=var-n_mix_both                  --mysqld=--binlog-format=mixed --mysqld=--master-info-repository=TABLE --mysqld=--relay-log-info-repository=TABLE
-perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=ps_row_both         --vardir=var-ps_row_both   --ps-protocol --mysqld=--binlog-format=row --mysqld=--master-info-repository=TABLE --mysqld=--relay-log-info-repository=TABLE
-perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=embedded_both       --vardir=var-emebbed_both  --embedded --mysqld=--master-info-repository=TABLE --mysqld=--relay-log-info-repository=TABLE
-perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=funcs_1_both        --vardir=var-funcs_1_both                                              --suite=funcs_1 --mysqld=--master-info-repository=TABLE --mysqld=--relay-log-info-repository=TABLE
-perl mysql-test-run.pl --timer --force --parallel=auto                                                 --comment=rpl_ndb_row_both    --vardir=var-rpl_ndb_row_both            --mysqld=--binlog-format=row  --suite=rpl_ndb,ndb --mysqld=--master-info-repository=TABLE --mysqld=--relay-log-info-repository=TABLE
-perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=rpl_binlog_row_both --vardir=var-rpl_binlog_row_both --mysqld=--binlog-format=row --suite=rpl,binlog --skip-ndb --mysqld=--master-info-repository=TABLE --mysqld=--relay-log-info-repository=TABLE

=== removed file 'mysql-test/collections/mysql-next-mr.crash-safe.push'
--- a/mysql-test/collections/mysql-next-mr.crash-safe.push	2010-08-24 09:08:11 +0000
+++ b/mysql-test/collections/mysql-next-mr.crash-safe.push	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-perl mysql-test-run.pl --timer --force --parallel=auto --comment=n_mix --vardir=var-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list
-perl mysql-test-run.pl --timer --force --parallel=auto --comment=ps_row --vardir=var-ps_row --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list
-perl mysql-test-run.pl --timer --force --parallel=auto --comment=embedded --vardir=var-emebbed  --embedded --experimental=collections/default.experimental --skip-ndb
-perl mysql-test-run.pl --timer --force --parallel=auto --comment=rpl_binlog_row --vardir=var-rpl_binlog_row  --suite=rpl,binlog --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list
-perl mysql-test-run.pl --timer --force --parallel=auto --comment=funcs_1 --vardir=var-funcs_1 --suite=funcs_1 --experimental=collections/default.experimental --skip-ndb
-perl mysql-test-run.pl --timer --force --parallel=auto --comment=n_mix_relay --vardir=var-n_mix_relay --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --mysqld=--relay-log-info-repository=TABLE
-perl mysql-test-run.pl --timer --force --parallel=auto --comment=ps_row_relay --vardir=var-ps_row_relay --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --mysqld=--relay-log-info-repository=TABLE
-perl mysql-test-run.pl --timer --force --parallel=auto --comment=embedded_relay --vardir=var-emebbed_relay  --embedded --experimental=collections/default.experimental --skip-ndb --mysqld=--master-info-repository=TABLE --mysqld=--relay-log-info-repository=TABLE
-perl mysql-test-run.pl --timer --force --parallel=auto --comment=rpl_binlog_row_relay --vardir=var-rpl_binlog_row_relay  --suite=rpl,binlog --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --mysqld=--relay-log-info-repository=TABLE
-perl mysql-test-run.pl --timer --force --parallel=auto --comment=funcs_1_relay --vardir=var-funcs_1_relay --suite=funcs_1 --experimental=collections/default.experimental --skip-ndb --mysqld=--relay-log-info-repository=TABLE
-perl mysql-test-run.pl --timer --force --parallel=auto --comment=n_mix_master --vardir=var-n_mix_master --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --mysqld=--master-info-repository=TABLE
-perl mysql-test-run.pl --timer --force --parallel=auto --comment=ps_row_master --vardir=var-ps_row_master --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --mysqld=--master-info-repository=TABLE
-perl mysql-test-run.pl --timer --force --parallel=auto --comment=embedded_master --vardir=var-emebbed_master  --embedded --experimental=collections/default.experimental --skip-ndb --mysqld=--master-info-repository=TABLE
-perl mysql-test-run.pl --timer --force --parallel=auto --comment=rpl_binlog_row_master --vardir=var-rpl_binlog_row_master  --suite=rpl,binlog --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --mysqld=--master-info-repository=TABLE
-perl mysql-test-run.pl --timer --force --parallel=auto --comment=funcs_1_master --vardir=var-funcs_1_master --suite=funcs_1 --experimental=collections/default.experimental --skip-ndb --mysqld=--master-info-repository=TABLE
-perl mysql-test-run.pl --timer --force --parallel=auto --comment=n_mix_both --vardir=var-n_mix_both --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --mysqld=--master-info-repository=TABLE --mysqld=--relay-log-info-repository=TABLE
-perl mysql-test-run.pl --timer --force --parallel=auto --comment=ps_row_both --vardir=var-ps_row_both --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --mysqld=--master-info-repository=TABLE --mysqld=--relay-log-info-repository=TABLE
-perl mysql-test-run.pl --timer --force --parallel=auto --comment=embedded_both --vardir=var-emebbed_both --embedded  --experimental=collections/default.experimental --skip-ndb --mysqld=--master-info-repository=TABLE --mysqld=--relay-log-info-repository=TABLE
-perl mysql-test-run.pl --timer --force --parallel=auto --comment=rpl_binlog_row_both --vardir=var-rpl_binlog_row_both  --suite=rpl,binlog --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --mysqld=--master-info-repository=TABLE --mysqld=--relay-log-info-repository=TABLE
-perl mysql-test-run.pl --timer --force --parallel=auto --comment=funcs_1_both --vardir=var-funcs_1_both --suite=funcs_1 --experimental=collections/default.experimental --skip-ndb --mysqld=--master-info-repository=TABLE --mysqld=--relay-log-info-repository=TABLE

=== removed file 'mysql-test/collections/mysql-next-mr.crash-safe.weekly'
--- a/mysql-test/collections/mysql-next-mr.crash-safe.weekly	2010-08-24 09:08:11 +0000
+++ b/mysql-test/collections/mysql-next-mr.crash-safe.weekly	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-perl mysql-test-run.pl --timer --force --comment=1st --experimental=collections/default.experimental 1st
-perl mysql-test-run.pl --timer --force --comment=1st_relay --experimental=collections/default.experimental 1st --mysqld=--relay-log-info-repository=TABLE
-perl mysql-test-run.pl --timer --force --comment=1st_master --experimental=collections/default.experimental 1st --mysqld=--master-info-repository=TABLE
-perl mysql-test-run.pl --timer --force --comment=1st_both --experimental=collections/default.experimental 1st --mysqld=--master-info-repository=TABLE --mysqld=--relay-log-info-repository=TABLE

=== modified file 'mysql-test/r/mysql_upgrade_ssl.result'
--- a/mysql-test/r/mysql_upgrade_ssl.result	2010-08-11 17:56:56 +0000
+++ b/mysql-test/r/mysql_upgrade_ssl.result	2010-08-26 16:37:57 +0000
@@ -20,6 +20,12 @@ mysql.plugin                            
 mysql.proc                                         OK
 mysql.procs_priv                                   OK
 mysql.servers                                      OK
+mysql.slave_master_info
+Error    : You can't use locks with log tables.
+status   : OK
+mysql.slave_relay_log_info
+Error    : You can't use locks with log tables.
+status   : OK
 mysql.slow_log
 Error    : You can't use locks with log tables.
 status   : OK

=== modified file 'mysql-test/suite/rpl/t/rpl_heartbeat_basic.test'
--- a/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test	2010-08-06 11:00:53 +0000
+++ b/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test	2010-08-26 16:37:57 +0000
@@ -16,11 +16,6 @@
 # in order to not slow down much `make test'.
 #
 --source include/have_binlog_format_mixed.inc
-####
-# We are temporary disabling this until we finish WL#2775.
---source include/not_master_info_table.inc
---source include/not_relay_log_info_table.inc
-####
 --echo
 
 --echo *** Preparing ***


Attachment: [text/bzr-bundle] bzr/alfranio.correia@oracle.com-20100826163757-ogib82ezhr0mqt8b.bundle
Thread
bzr push into mysql-next-mr-rpl-merge branch (alfranio.correia:3018 to 3019)Alfranio Correia26 Aug