From: Anitha Gopi Date: March 10 2011 4:54am Subject: bzr push into mysql-5.5 branch (anitha.gopi:3379 to 3382) List-Archive: http://lists.mysql.com/commits/132727 Message-Id: <0LHT007BQSBHCEC0@fe-emea-09.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="Boundary_(ID_13ls2hRejjR3W9um36T6DA)" --Boundary_(ID_13ls2hRejjR3W9um36T6DA) MIME-version: 1.0 Content-type: text/plain; CHARSET=US-ASCII Content-transfer-encoding: 7BIT Content-disposition: inline 3382 Anitha Gopi 2011-03-10 Skip tests in disabled-daily.list modified: mysql-test/collections/default.daily 3381 Anitha Gopi 2011-03-10 Skip the tests listed in disabled-weekly.list modified: mysql-test/collections/default.weekly 3380 Anitha Gopi 2011-03-10 Bug11817185# : Disabled MAIN.ARCHIVE-BIG.TEST modified: mysql-test/t/disabled.def 3379 Mattias Jonsson 2011-03-09 [merge] merge modified: mysql-test/r/partition.result mysql-test/t/partition.test sql/ha_partition.cc === modified file 'mysql-test/collections/default.daily' --- a/mysql-test/collections/default.daily 2011-02-08 11:55:42 +0000 +++ b/mysql-test/collections/default.daily 2011-03-10 04:27:14 +0000 @@ -1,15 +1,15 @@ -perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=normal --vardir=var-normal --report-features -perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=n_mix --vardir=var-n_mix --mysqld=--binlog-format=mixed -perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=row --vardir=var-row --mysqld=--binlog-format=row -perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=ps_row --vardir=var-ps_row --mysqld=--binlog-format=row --ps-protocol -perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=embedded --vardir=var-embedded --embedded -perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=ps --vardir=var-ps --ps-protocol -perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=funcs_1 --vardir=var-funcs_1 --suite=funcs_1 -perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=ps_funcs1 --vardir=var-ps_funcs_1 --suite=funcs_1 --ps-protocol -perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=funcs2 --vardir=var-funcs2 --suite=funcs_2 -perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=partitions --vardir=var-parts --suite=parts -perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=stress --vardir=var-stress --suite=stress -perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=jp --vardir=var-jp --suite=jp -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=normal --vardir=var-normal --report-features --skip-test-list=collections/disabled-daily.list +perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=n_mix --vardir=var-n_mix --mysqld=--binlog-format=mixed --skip-test-list=collections/disabled-daily.list +perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=row --vardir=var-row --mysqld=--binlog-format=row --skip-test-list=collections/disabled-daily.list +perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=ps_row --vardir=var-ps_row --mysqld=--binlog-format=row --ps-protocol --skip-test-list=collections/disabled-daily.list +perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=embedded --vardir=var-embedded --embedded --skip-test-list=collections/disabled-daily.list +perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=ps --vardir=var-ps --ps-protocol --skip-test-list=collections/disabled-daily.list +perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=funcs_1 --vardir=var-funcs_1 --suite=funcs_1 --skip-test-list=collections/disabled-daily.list +perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=ps_funcs1 --vardir=var-ps_funcs_1 --suite=funcs_1 --ps-protocol --skip-test-list=collections/disabled-daily.list +perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=funcs2 --vardir=var-funcs2 --suite=funcs_2 --skip-test-list=collections/disabled-daily.list +perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=partitions --vardir=var-parts --suite=parts --skip-test-list=collections/disabled-daily.list +perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=stress --vardir=var-stress --suite=stress --skip-test-list=collections/disabled-daily.list +perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=jp --vardir=var-jp --suite=jp --skip-test-list=collections/disabled-daily.list +perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=nist --vardir=var-nist --suite=nist --skip-test-list=collections/disabled-daily.list 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 === modified file 'mysql-test/collections/default.weekly' --- a/mysql-test/collections/default.weekly 2011-02-08 11:55:42 +0000 +++ b/mysql-test/collections/default.weekly 2011-03-10 04:24:16 +0000 @@ -1,7 +1,7 @@ -perl mysql-test-run.pl --timer --force --debug-server --parallel=auto --comment=big-tests --experimental=collections/default.experimental --vardir=var-big-tests --big-test --testcase-timeout=60 --suite-timeout=600 main.alter_table-big main.archive-big main.count_distinct3 main.create-big main.events_stress main.events_time_zone main.information_schema-big main.log_tables-big main.merge-big main.mysqlbinlog_row_big main.read_many_rows_innodb main.ssl-big main.sum_distinct-big main.type_newdecimal-big main.variables-big parts.part_supported_sql_func_innodb parts.partition_alter1_1_2_innodb parts.partition_alter1_2_innodb parts.partition_alter2_1_1_innodb parts.partition_alter2_1_2_innodb parts.partition_alter2_2_2_innodb parts.partition_alter4_innodb funcs_1.myisam_views-big -perl mysql-test-run.pl --timer --force --debug-server --parallel=auto --comment=eits-tests-myisam-engine --experimental=collections/default.experimental --vardir=var-stmt-eits-tests-myisam-engine --suite=engines/iuds,engines/funcs --suite-timeout=500 --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=myisam -perl mysql-test-run.pl --timer --force --debug-server --parallel=auto --comment=eits-rpl-binlog-row-tests-myisam-engine --experimental=collections/default.experimental --vardir=var-binlog-row-eits-tests-myisam-engine --suite=engines/iuds,engines/funcs --suite-timeout=500 --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=myisam --do-test=rpl --mysqld=--binlog-format=row -perl mysql-test-run.pl --timer --force --debug-server --parallel=auto --comment=eits-rpl-binlog-mixed-tests-myisam-engine --experimental=collections/default.experimental --vardir=var-binlog-mixed-eits-tests-myisam-engine --suite=engines/iuds,engines/funcs --suite-timeout=500 --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=myisam --do-test=rpl --mysqld=--binlog-format=mixed -perl mysql-test-run.pl --timer --force --debug-server --parallel=auto --comment=eits-tests-innodb-engine --experimental=collections/default.experimental --vardir=var-stmt-eits-tests-innodb-engine --suite=engines/iuds,engines/funcs --suite-timeout=500 --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=innodb --mysqld=--innodb -perl mysql-test-run.pl --timer --force --debug-server --parallel=auto --comment=eits-rpl-binlog-row-tests-innodb-engine --experimental=collections/default.experimental --vardir=var-binlog-row-eits-tests-innodb-engine --suite=engines/iuds,engines/funcs --suite-timeout=500 --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=innodb --mysqld=--innodb --do-test=rpl --mysqld=--binlog-format=row -perl mysql-test-run.pl --timer --force --debug-server --parallel=auto --comment=eits-rpl-binlog-mixed-tests-innodb-engine --experimental=collections/default.experimental --vardir=var-binlog-mixed-eits-tests-innodb-engine --suite=engines/iuds,engines/funcs --suite-timeout=500 --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=innodb --mysqld=--innodb --do-test=rpl --mysqld=--binlog-format=mixed +perl mysql-test-run.pl --timer --force --debug-server --parallel=auto --comment=big-tests --experimental=collections/default.experimental --vardir=var-big-tests --big-test --testcase-timeout=60 --suite-timeout=600 main.alter_table-big main.archive-big main.count_distinct3 main.create-big main.events_stress main.events_time_zone main.information_schema-big main.log_tables-big main.merge-big main.mysqlbinlog_row_big main.read_many_rows_innodb main.ssl-big main.sum_distinct-big main.type_newdecimal-big main.variables-big parts.part_supported_sql_func_innodb parts.partition_alter1_1_2_innodb parts.partition_alter1_2_innodb parts.partition_alter2_1_1_innodb parts.partition_alter2_1_2_innodb parts.partition_alter2_2_2_innodb parts.partition_alter4_innodb funcs_1.myisam_views-big --skip-test-list=collections/disabled-weekly.list +perl mysql-test-run.pl --timer --force --debug-server --parallel=auto --comment=eits-tests-myisam-engine --experimental=collections/default.experimental --vardir=var-stmt-eits-tests-myisam-engine --suite=engines/iuds,engines/funcs --suite-timeout=500 --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=myisam --skip-test-list=collections/disabled-weekly.list +perl mysql-test-run.pl --timer --force --debug-server --parallel=auto --comment=eits-rpl-binlog-row-tests-myisam-engine --experimental=collections/default.experimental --vardir=var-binlog-row-eits-tests-myisam-engine --suite=engines/iuds,engines/funcs --suite-timeout=500 --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=myisam --do-test=rpl --mysqld=--binlog-format=row --skip-test-list=collections/disabled-weekly.list +perl mysql-test-run.pl --timer --force --debug-server --parallel=auto --comment=eits-rpl-binlog-mixed-tests-myisam-engine --experimental=collections/default.experimental --vardir=var-binlog-mixed-eits-tests-myisam-engine --suite=engines/iuds,engines/funcs --suite-timeout=500 --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=myisam --do-test=rpl --mysqld=--binlog-format=mixed --skip-test-list=collections/disabled-weekly.list +perl mysql-test-run.pl --timer --force --debug-server --parallel=auto --comment=eits-tests-innodb-engine --experimental=collections/default.experimental --vardir=var-stmt-eits-tests-innodb-engine --suite=engines/iuds,engines/funcs --suite-timeout=500 --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=innodb --mysqld=--innodb --skip-test-list=collections/disabled-weekly.list +perl mysql-test-run.pl --timer --force --debug-server --parallel=auto --comment=eits-rpl-binlog-row-tests-innodb-engine --experimental=collections/default.experimental --vardir=var-binlog-row-eits-tests-innodb-engine --suite=engines/iuds,engines/funcs --suite-timeout=500 --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=innodb --mysqld=--innodb --do-test=rpl --mysqld=--binlog-format=row --skip-test-list=collections/disabled-weekly.list +perl mysql-test-run.pl --timer --force --debug-server --parallel=auto --comment=eits-rpl-binlog-mixed-tests-innodb-engine --experimental=collections/default.experimental --vardir=var-binlog-mixed-eits-tests-innodb-engine --suite=engines/iuds,engines/funcs --suite-timeout=500 --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=innodb --mysqld=--innodb --do-test=rpl --mysqld=--binlog-format=mixed --skip-test-list=collections/disabled-weekly.list === modified file 'mysql-test/t/disabled.def' --- a/mysql-test/t/disabled.def 2011-03-01 14:42:37 +0000 +++ b/mysql-test/t/disabled.def 2011-03-10 04:17:49 +0000 @@ -16,3 +16,4 @@ read_many_rows_innodb : Bug#37635 201 sum_distinct-big : Bug#56927 2010-11-15 mattiasj was not tested alter_table-big : Bug#37248 2010-11-15 mattiasj was not tested create-big : Bug#37248 2010-11-15 mattiasj was not tested +archive-big : Bug#11817185 2011-03-10 Anitha Disabled since this leads to timeout on Solaris Sparc --Boundary_(ID_13ls2hRejjR3W9um36T6DA) MIME-version: 1.0 Content-type: text/bzr-bundle; CHARSET=US-ASCII; name="bzr/anitha.gopi@stripped" Content-transfer-encoding: 7BIT Content-disposition: inline; filename="bzr/anitha.gopi@stripped" # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: anitha.gopi@stripped # target_branch: file:///home/anitha/mysql/repo/mysql-5.5/ # testament_sha1: 61185920197c9c6c4848723386333fba6882d3af # timestamp: 2011-03-10 10:24:48 +0530 # source_branch: file:///home/anitha/mysql/repo/mysql-5.5/ # base_revision_id: mattias.jonsson@stripped\ # x2y0p7zyfy3b9rxt # # Begin bundle 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 vEPvgA== --Boundary_(ID_13ls2hRejjR3W9um36T6DA)--