List:Commits« Previous MessageNext Message »
From:Hemant Kumar Date:July 4 2012 6:59am
Subject:bzr push into mysql-trunk branch (hemant.hk.kumar:3962 to 3963)
View as plain text  
 3963 Hemant Kumar	2012-07-04
      changes in collection suite default.daily and defailt.weekly
      in order to: 
      -add binlog stmt mode explicitly and remove normal mode
      -remove ps_row mode since we already have ps mode

    modified:
      mysql-test/collections/default.daily
      mysql-test/collections/default.weekly
 3962 Jimmy Yang	2012-07-04 [merge]
      Merge mysql-5.6 to mysql-trunk

    modified:
      mysql-test/suite/sys_vars/r/innodb_ft_enable_diag_print_basic.result
      storage/innobase/fts/fts0fts.cc
      storage/innobase/fts/fts0que.cc
      storage/innobase/handler/ha_innodb.cc
=== modified file 'mysql-test/collections/default.daily'
--- a/mysql-test/collections/default.daily	2012-05-18 11:57:06 +0000
+++ b/mysql-test/collections/default.daily	2012-07-04 06:58:40 +0000
@@ -1,8 +1,7 @@
-# Default suites in modes normal, binlog format mixed/row,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
+# 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
-perl mysql-test-run.pl --force --timer  --debug-server --parallel=auto --experimental=collections/default.experimental --comment=ps_row-debug  --vardir=var-ps_row-debug  --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-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
 

=== modified file 'mysql-test/collections/default.weekly'
--- a/mysql-test/collections/default.weekly	2012-05-18 11:57:06 +0000
+++ b/mysql-test/collections/default.weekly	2012-07-04 06:58:40 +0000
@@ -10,13 +10,12 @@
 
 # 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 --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  --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
-perl mysql-test-run.pl --force --timer   --debug-server --parallel=auto --experimental=collections/default.experimental --comment=ps_row-debug  --vardir=var-ps_row-debug  --mysqld=--binlog-format=row     --ps-protocol --skip-test-list=collections/disabled-daily.list
+# 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  --debug-server --parallel=auto --experimental=collections/default.experimental --comment=ps-debug  --vardir=var-ps-debug  --ps-protocol --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=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
 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
@@ -48,10 +47,9 @@ 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=normal  --vardir=var-normal-big  --report-features --skip-test-list=collections/disabled-daily.list --unit-tests
-perl mysql-test-run.pl --force --timer  --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  --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   --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  --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
 

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