List:Commits« Previous MessageNext Message »
From:Hemant Kumar Date:July 30 2012 10:40am
Subject:bzr push into mysql-trunk branch (hemant.hk.kumar:4139 to 4140)
View as plain text  
 4140 Hemant Kumar	2012-07-30 [merge]
      Merging the default.weekly collection changes from mysql-5.6.

    modified:
      mysql-test/collections/default.weekly
 4139 Nisha Gopalakrishnan	2012-07-30 [merge]
      Null merge from 5.6 to trunk. 

=== modified file 'mysql-test/collections/default.weekly'
--- a/mysql-test/collections/default.weekly	2012-07-26 08:55:39 +0000
+++ b/mysql-test/collections/default.weekly	2012-07-30 10:39:22 +0000
@@ -13,7 +13,7 @@
 # Default suites (in modes binlog format stmt/mixed/row, parts), embedded and ps-protocol
 perl mysql-test-run.pl --force --timer  --big-test --testcase-timeout=90 --debug-server --parallel=auto --experimental=collections/default.experimental --comment=normal-debug-big  --vardir=var-normal-debug-big  --report-features --skip-test-list=collections/disabled-daily.list --unit-tests
 perl mysql-test-run.pl --force --timer  --big-test --testcase-timeout=60 --debug-server --parallel=auto --experimental=collections/default.experimental --comment=embedded-debug-big  --vardir=var-embedded-debug-big  --embedded
-perl mysql-test-run.pl --force --timer  --big-test --testcase-timeout=60 --debug-server --parallel=auto --experimental=collections/default.experimental --comment=ps-debug-big  --vardir=var-ps-debug-big  --ps-protocol --skip-test-list=collections/disabled-daily.list
+perl mysql-test-run.pl --force --timer  --big-test --testcase-timeout=90 --debug-server --parallel=auto --experimental=collections/default.experimental --comment=ps-debug-big  --vardir=var-ps-debug-big  --ps-protocol --skip-test-list=collections/disabled-daily.list
 
 # Run the suites that are not part of the default - funcs_2, stress, jp, nist
 perl mysql-test-run.pl --force --timer  --big-test --testcase-timeout=60 --debug-server --parallel=auto --experimental=collections/default.experimental --comment=funcs2-debug  --vardir=var-funcs2-big  --suite=funcs_2-big
@@ -46,7 +46,7 @@ perl mysql-test-run.pl --timer --force -
 # Default suites in modes normal(binlog format statement/mixed/row, parts), embedded and ps-protocol
 perl mysql-test-run.pl --force --timer  --big-test --testcase-timeout=90 --parallel=auto --experimental=collections/default.experimental --comment=normal-big  --vardir=var-normal-big --report-features --skip-test-list=collections/disabled-daily.list --unit-tests
 perl mysql-test-run.pl --force --timer  --big-test --testcase-timeout=60 --parallel=auto --experimental=collections/default.experimental --comment=embedded-big  --vardir=var-embedded-big  --embedded
-perl mysql-test-run.pl --force --timer  --big-test --testcase-timeout=60--parallel=auto --experimental=collections/default.experimental --comment=ps-big  --vardir=var-ps-big  --ps-protocol --skip-test-list=collections/disabled-daily.list
+perl mysql-test-run.pl --force --timer  --big-test --testcase-timeout=90--parallel=auto --experimental=collections/default.experimental --comment=ps-big  --vardir=var-ps-big  --ps-protocol --skip-test-list=collections/disabled-daily.list
 
 # Run the suites that are not part of the default - funcs_2, stress, jp, nist
 perl mysql-test-run.pl --force --timer  --big-test --testcase-timeout=60 --parallel=auto --experimental=collections/default.experimental --comment=funcs2-big  --vardir=var-funcs2-big  --suite=funcs_2

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (hemant.hk.kumar:4139 to 4140) Hemant Kumar30 Jul