4123 Hemant Kumar 2012-07-26 [merge]
* Local merge from mysql-5.6.
* Removed partition suite explicitly
because now it is part of default
mtr suite. (mysql-trunk.push)
modified:
mysql-test/collections/default.daily
mysql-test/collections/default.weekly
mysql-test/collections/mysql-trunk.push
4122 sayantan.dutta@stripped 2012-07-26
Adding parts suite as a defautl suite in MTR
@ mysql-test/mysql-test-run.pl
Adding parts suite as a defautl suite in MTR
modified:
mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/collections/default.daily'
--- a/mysql-test/collections/default.daily 2012-07-05 10:17:46 +0000
+++ b/mysql-test/collections/default.daily 2012-07-26 08:55:39 +0000
@@ -1,13 +1,13 @@
-# Default suites in modes binlog format stmt/mixed/row,embedded and ps-protocol
-perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=stmt-debug --vardir=var-stmt-debug --mysqld=--binlog-format=statement --report-features --skip-test-list=collections/disabled-daily.list --unit-tests
-perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=n_mix-debug --vardir=var-n_mix-debug --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-debug --vardir=var-row-debug --mysqld=--binlog-format=row --skip-test-list=collections/disabled-daily.list
+# Default suites in modes normal(which includes binlog format stmt/mixed/row, parts), embedded and ps-protocol
+perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=normal-debug --vardir=var-normal-debug --report-features --skip-test-list=collections/disabled-daily.list --unit-tests
perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=embedded-debug --vardir=var-embedded-debug --embedded
perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=ps-debug --vardir=var-ps-debug --ps-protocol --skip-test-list=collections/disabled-daily.list
-
-# Run the suites that are not part of the default - funcs_2, parts, stress, jp, nist
+# Adding "--big-test" option to the default suite, normal(which includes 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
+# Run the suites that are not part of the default - funcs_2, stress, jp, nist
perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=funcs2-debug --vardir=var-funcs2-debug --suite=funcs_2
-perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=partitions-debug --vardir=var-parts-debug --suite=parts
perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=stress-debug --vardir=var-stress-debug --suite=stress
perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=jp-debug --vardir=var-jp-debug --suite=jp
perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=nist-debug --vardir=var-nist-debug --suite=nist
=== modified file 'mysql-test/collections/default.weekly'
--- a/mysql-test/collections/default.weekly 2012-07-11 10:28:19 +0000
+++ b/mysql-test/collections/default.weekly 2012-07-26 08:55:39 +0000
@@ -10,16 +10,13 @@
# Repeat daily run
# big-test option for normal runs
-# Default suites in modes binlog format stmt/mixed/row,embedded and ps-protocol
-perl mysql-test-run.pl --force --timer --big-test --testcase-timeout=60 --debug-server --parallel=auto --experimental=collections/default.experimental --comment=stmt-debug-big --vardir=var-stmt-debug-big --mysqld=--binlog-format=statement --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=n_mix-debug-big --vardir=var-n_mix-debug-big --mysqld=--binlog-format=mixed --skip-test-list=collections/disabled-daily.list
-perl mysql-test-run.pl --force --timer --big-test --testcase-timeout=60 --debug-server --parallel=auto --experimental=collections/default.experimental --comment=row-debug-big --vardir=var-row-debug-big --mysqld=--binlog-format=row --skip-test-list=collections/disabled-daily.list
-perl mysql-test-run.pl --force --timer --big-test --debug-server --parallel=auto --experimental=collections/default.experimental --comment=embedded-debug --vardir=var-embedded-debug --embedded
-perl mysql-test-run.pl --force --timer --big-test --testcase-timeout=60 --debug-server --parallel=auto --experimental=collections/default.experimental --comment=ps-debug --vardir=var-ps-debug --ps-protocol --skip-test-list=collections/disabled-daily.list
+# 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
-# Run the suites that are not part of the default - funcs_2, parts, stress, jp, nist
+# 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
-perl mysql-test-run.pl --force --timer --big-test --testcase-timeout=90 --debug-server --parallel=auto --experimental=collections/default.experimental --comment=partitions-debug-big --vardir=var-parts-debug-big --suite=parts
perl mysql-test-run.pl --force --timer --big-test --testcase-timeout=60 --debug-server --parallel=auto --experimental=collections/default.experimental --comment=stress-debug-big --vardir=var-stress-debug-big --suite=stress
perl mysql-test-run.pl --force --timer --big-test --testcase-timeout=60 --debug-server --parallel=auto --experimental=collections/default.experimental --comment=jp-debug-big --vardir=var-jp-debug-big --suite=jp
perl mysql-test-run.pl --force --timer --big-test --testcase-timeout=60 --debug-server --parallel=auto --experimental=collections/default.experimental --comment=nist-debug-big --vardir=var-nist-debug-big --suite=nist
@@ -46,16 +43,13 @@ perl mysql-test-run.pl --timer --force -
# Repeat daily run
# big-test option for normal runs
-# Default suites in modes normal, binlog format mixed/row,embedded and ps-protocol
-perl mysql-test-run.pl --force --timer --big-test --testcase-timeout=60 --parallel=auto --experimental=collections/default.experimental --comment=stmt-big --vardir=var-stmt-big --mysqld=--binlog-format=statement --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=n_mix-big --vardir=var-n_mix-big --mysqld=--binlog-format=mixed --skip-test-list=collections/disabled-daily.list
-perl mysql-test-run.pl --force --timer --big-test --testcase-timeout=60 --parallel=auto --experimental=collections/default.experimental --comment=row-big --vardir=var-row-big --mysqld=--binlog-format=row --skip-test-list=collections/disabled-daily.list
-perl mysql-test-run.pl --force --timer --big-test --parallel=auto --experimental=collections/default.experimental --comment=embedded --vardir=var-embedded --embedded
-perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=ps --vardir=var-ps --ps-protocol --skip-test-list=collections/disabled-daily.list
+# 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
-# Run the suites that are not part of the default - funcs_2, parts, stress, jp, nist
+# 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
-perl mysql-test-run.pl --force --timer --big-test --testcase-timeout=60 --parallel=auto --experimental=collections/default.experimental --comment=partitions-big --vardir=var-parts-big --suite=parts
perl mysql-test-run.pl --force --timer --big-test --testcase-timeout=60 --parallel=auto --experimental=collections/default.experimental --comment=stress-big --vardir=var-stress-big --suite=stress
perl mysql-test-run.pl --force --timer --big-test --testcase-timeout=60 --parallel=auto --experimental=collections/default.experimental --comment=jp-big --vardir=var-jp-big --suite=jp
perl mysql-test-run.pl --force --timer --big-test --testcase-timeout=60 --parallel=auto --experimental=collections/default.experimental --comment=nist-big --vardir=var-nist-big --suite=nist
=== modified file 'mysql-test/collections/mysql-trunk.push'
--- a/mysql-test/collections/mysql-trunk.push 2012-07-12 05:25:09 +0000
+++ b/mysql-test/collections/mysql-trunk.push 2012-07-26 08:55:39 +0000
@@ -2,5 +2,4 @@ perl mysql-test-run.pl --timer --debug-s
perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=main_ps_row-debug --vardir=var-main-ps_row --suite=main --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 --debug-server --force --parallel=auto --comment=main_embedded-debug --vardir=var-main_emebbed --suite=main --embedded --experimental=collections/default.experimental --skip-ndb
perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=innodb_4k_size-debug --vardir=var-innodb-4k --experimental=collections/default.experimental --skip-ndb --suite=innodb --mysqld=--innodb-page-size=4k
-perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=partitions-debug --vardir=var-parts --suite=parts
perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=rpl_binlog_n_mix_MTS-debug --vardir=var-mts-rpl-binlog-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb --unit-tests --mysqld=--slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0 --suite=rpl
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-trunk branch (hemant.hk.kumar:4122 to 4123) | Hemant Kumar | 26 Jul |
