From: Anitha Gopi
Date: March 10 2011 4:30am
Subject: bzr commit into mysql-trunk branch (anitha.gopi:3743)
List-Archive: http://lists.mysql.com/commits/132725
Message-Id: <0LHT00L7GR75VF20@fe-emea-10.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_krwo8TcoEeGLojCDBzR7xA)"

--Boundary_(ID_krwo8TcoEeGLojCDBzR7xA)
MIME-version: 1.0
Content-type: text/plain; CHARSET=US-ASCII
Content-transfer-encoding: 7BIT
Content-disposition: inline

#At file:///home/anitha/mysql/repo/mysql-trunk/ based on revid:anitha.gopi@stripped

 3743 Anitha Gopi	2011-03-10 [merge]
      Null merged default.weekly changes from 5.5 and made trunk specific changes to default.weekly

    modified:
      mysql-test/collections/default.weekly
=== modified file 'mysql-test/collections/default.weekly'
--- a/mysql-test/collections/default.weekly	2011-02-08 13:56:25 +0000
+++ b/mysql-test/collections/default.weekly	2011-03-10 04:29:36 +0000
@@ -1,8 +1,8 @@
-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=all_binlog_checksum --experimental=collections/default.experimental --mysqld=--binlog-checksum=CRC32 --vardir=var-all_binlog_checksum --suite=main,binlog,innodb,federated,rpl,sys_vars,perfschema
+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
+perl mysql-test-run.pl --timer --force --debug-server --parallel=auto --comment=all_binlog_checksum --experimental=collections/default.experimental --mysqld=--binlog-checksum=CRC32 --vardir=var-all_binlog_checksum --suite=main,binlog,innodb,federated,rpl,sys_vars,perfschema --skip-test-list=collections/disabled-weekly.list


--Boundary_(ID_krwo8TcoEeGLojCDBzR7xA)
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-trunk/
# testament_sha1: 529af3da7d666ff40499f14858f02fa6c4b91793
# timestamp: 2011-03-10 10:00:35 +0530
# source_branch: file:///home/anitha/mysql/repo/mysql-5.5/
# base_revision_id: anitha.gopi@stripped\
#   d1o3pihtd8je4cle
# 
# Begin bundle
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
eJ622ufGbxyvwLuSKcKEhstPOkA=


--Boundary_(ID_krwo8TcoEeGLojCDBzR7xA)--