bzr commit into mysql-next-mr-wl5569 branch (andrei.elkin:3242) WL#5569

[Andrei Elkin]

#At file:///home/andrei/MySQL/BZR/2a-23May/WL/mysql-next-mr-wl5569/ based on revid:andrei.elkin@stripped

 3242 Andrei Elkin	2010-12-13
      wl#5569 MTS
      
      updating results for few tests.

    modified:
      mysql-test/r/mysqld--help-notwin.result
      mysql-test/r/mysqld--help-win.result
      mysql-test/suite/rpl/r/rpl_parallel.result
      mysql-test/suite/rpl/r/rpl_parallel_conflicts.result
      mysql-test/suite/sys_vars/r/all_vars.result
=== modified file 'mysql-test/r/mysqld--help-notwin.result'
--- a/mysql-test/r/mysqld--help-notwin.result	2010-12-10 12:10:20 +0000
+++ b/mysql-test/r/mysqld--help-notwin.result	2010-12-13 14:52:50 +0000
@@ -340,9 +340,10 @@ The following options may be given as th
  Don't write queries to slow log that examine fewer rows
  than that
  --mts-checkpoint-period=# 
- Gather workers' activities and synchronously flush relay
- log info to disk after every #th mili-seconds. Use 0
- (default) to disable checkpoint
+ Gather workers' activities to flush the relay log info to
+ disk after every #th milli-seconds. The zero value
+ disables the checkpoint routine (makes sense for
+ debugging).
  --mts-partition-hash-soft-max=# 
  Number of records in the mts partition hash below which
  entries with zero usage are tolerated
@@ -887,7 +888,7 @@ max-user-connections 0
 max-write-lock-count 18446744073709551615
 memlock FALSE
 min-examined-row-limit 0
-mts-checkpoint-period 0
+mts-checkpoint-period 300
 mts-partition-hash-soft-max 16
 mts-pending-jobs-size-max 16777216
 mts-slave-worker-queue-len-max 40000
@@ -910,7 +911,7 @@ old FALSE
 old-alter-table FALSE
 old-passwords FALSE
 old-style-user-limits FALSE
-opt-mts-coordinator-basic-nap 0
+opt-mts-coordinator-basic-nap 5
 opt-mts-worker-underrun-level 0
 optimizer-join-cache-level 4
 optimizer-prune-level 1

=== modified file 'mysql-test/r/mysqld--help-win.result'
--- a/mysql-test/r/mysqld--help-win.result	2010-12-10 12:10:20 +0000
+++ b/mysql-test/r/mysqld--help-win.result	2010-12-13 14:52:50 +0000
@@ -339,9 +339,10 @@ The following options may be given as th
  Don't write queries to slow log that examine fewer rows
  than that
  --mts-checkpoint-period=# 
- Gather workers' activities and synchronously flush relay
- log info to disk after every #th mili-seconds. Use 0
- (default) to disable checkpoint
+ Gather workers' activities to flush the relay log info to
+ disk after every #th milli-seconds. The zero value
+ disables the checkpoint routine (makes sense for
+ debugging).
  --mts-partition-hash-soft-max=# 
  Number of records in the mts partition hash below which
  entries with zero usage are tolerated
@@ -890,7 +891,7 @@ max-user-connections 0
 max-write-lock-count 18446744073709551615
 memlock FALSE
 min-examined-row-limit 0
-mts-checkpoint-period 0
+mts-checkpoint-period 300
 mts-partition-hash-soft-max 16
 mts-pending-jobs-size-max 16777216
 mts-slave-worker-queue-len-max 40000
@@ -914,7 +915,7 @@ old FALSE
 old-alter-table FALSE
 old-passwords FALSE
 old-style-user-limits FALSE
-opt-mts-coordinator-basic-nap 0
+opt-mts-coordinator-basic-nap 5
 opt-mts-worker-underrun-level 0
 optimizer-join-cache-level 4
 optimizer-prune-level 1

=== modified file 'mysql-test/suite/rpl/r/rpl_parallel.result'
--- a/mysql-test/suite/rpl/r/rpl_parallel.result	2010-12-08 00:33:48 +0000
+++ b/mysql-test/suite/rpl/r/rpl_parallel.result	2010-12-13 14:52:50 +0000
@@ -4,6 +4,8 @@ reset master;
 reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
+Warnings:
+Note	1724	Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
 set @save.slave_parallel_workers= @@global.slave_parallel_workers;
 select @@global.slave_parallel_workers as 'non-zero means parallel';
 non-zero means parallel
@@ -11,6 +13,8 @@ non-zero means parallel
 call mtr.add_suppression('Slave: Error dropping database');
 include/stop_slave.inc
 start slave;
+Warnings:
+Note	1724	Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
 stop slave sql_thread;
 use test;
 select * from test0.benchmark into outfile 'benchmark.out';

=== modified file 'mysql-test/suite/rpl/r/rpl_parallel_conflicts.result'
--- a/mysql-test/suite/rpl/r/rpl_parallel_conflicts.result	2010-12-02 17:46:46 +0000
+++ b/mysql-test/suite/rpl/r/rpl_parallel_conflicts.result	2010-12-13 14:52:50 +0000
@@ -8,6 +8,8 @@ create view coord_wait_list  as SELECT i
 include/stop_slave.inc
 set @save.slave_parallel_workers= @@global.slave_parallel_workers;
 set @@global.slave_parallel_workers= 4;
+Warnings:
+Note	1724	Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
 include/start_slave.inc
 create database d1;
 create database d2;

=== modified file 'mysql-test/suite/sys_vars/r/all_vars.result'
--- a/mysql-test/suite/sys_vars/r/all_vars.result	2010-12-08 00:33:48 +0000
+++ b/mysql-test/suite/sys_vars/r/all_vars.result	2010-12-13 14:52:50 +0000
@@ -18,6 +18,7 @@ OPT_MTS_WORKER_UNDERRUN_LEVEL
 SLAVE_RUN_QUERY_IN_PARALLEL
 INNODB_STATS_PERSISTENT_SAMPLE_PAGES
 RELAY_LOG_BASENAME
+MTS_CHECKPOINT_PERIOD
 LOG_BIN_BASENAME
 INNODB_ANALYZE_IS_PERSISTENT
 INNODB_RESET_MONITOR_COUNTER
@@ -37,6 +38,7 @@ OPT_MTS_WORKER_UNDERRUN_LEVEL
 SLAVE_RUN_QUERY_IN_PARALLEL
 INNODB_STATS_PERSISTENT_SAMPLE_PAGES
 RELAY_LOG_BASENAME
+MTS_CHECKPOINT_PERIOD
 LOG_BIN_BASENAME
 INNODB_ANALYZE_IS_PERSISTENT
 INNODB_RESET_MONITOR_COUNTER


Attachment: [text/bzr-bundle] bzr/[e-mail]