bzr push into mysql-next-mr-wl5569 branch (andrei.elkin:3317 to 3318) WL#5569

[Andrei Elkin]

 3318 Andrei Elkin	2011-06-23
      wl#5569 MTS
      
      fixing results of mysqld--help-win.

    modified:
      mysql-test/r/mysqld--help-win.result
 3317 Alfranio Correia	2011-06-22 [merge]
      merge mysql-next-mr-wl5569 (local) --> mysql-next-mr-wl5569

    modified:
      mysql-test/include/wait_for_slave_param.inc
      mysql-test/suite/rpl/t/rpl_parallel_start_stop-slave.opt
=== modified file 'mysql-test/r/mysqld--help-win.result'
--- a/mysql-test/r/mysqld--help-win.result	2011-06-15 17:12:11 +0000
+++ b/mysql-test/r/mysqld--help-win.result	2011-06-23 04:56:15 +0000
@@ -276,8 +276,6 @@ The following options may be given as th
  If set to 1 table names are stored in lowercase on disk
  and table names will be case-insensitive.  Should be set
  to 2 if you are using a case insensitive file system
- --master-info-engine=name 
- The storage engine for the master info repository
  --master-info-file=name 
  The location and name of the file that remembers the
  master and where the I/O replication thread is in the
@@ -524,8 +522,6 @@ The following options may be given as th
  --relay-log=name    The location and name to use for relay logs
  --relay-log-index=name 
  File that holds the names for relay log files.
- --relay-log-info-engine=name 
- The storage engine for the relay info repository
  --relay-log-info-file=name 
  The location and name of the file that remembers where
  the SQL replication thread is in the relay logs
@@ -645,6 +641,15 @@ The following options may be given as th
  Don't allow 'SHOW DATABASE' commands
  --skip-slave-start  If set, slave is not autostarted.
  --skip-stack-trace  Don't print a stack trace on failure.
+ --slave-checkpoint-group=# 
+ Maximum number of processed transactions by
+ Multi-threaded slave before a checkpoint operation is
+ called to update progress status.
+ --slave-checkpoint-period=# 
+ Gather workers' activities to Update progress status of
+ Multi-threaded slave and flush the relay log info to disk
+ after every #th milli-seconds. The zero value disables
+ the checkpoint routine (makes sense for debugging).
  --slave-compressed-protocol 
  Use compression on master/slave protocol
  --slave-exec-mode=name 
@@ -660,6 +665,12 @@ The following options may be given as th
  --slave-net-timeout=# 
  Number of seconds to wait for more data from a
  master/slave connection before aborting the read
+ --slave-parallel-workers=# 
+ Number of worker threads for executing events in parallel
+ --slave-pending-jobs-size-max=# 
+ Max size of Slave Worker queues holding yet not applied
+ events.The least possible value must be not less than the
+ master side max_allowed_packet.
  --slave-skip-errors=name 
  Tells the slave thread to continue replication when a
  query event returns an error from the provided list
@@ -680,6 +691,9 @@ The following options may be given as th
  ALL_NON_LOSSY to enable non-lossy conversions. If the
  variable is assigned the empty set, no conversions are
  allowed and it is expected that the types match exactly.
+ --slave-worker-info-repository=name 
+ Defines the type of the repository for the worker
+ information.
  --slow-launch-time=# 
  If creating the thread takes longer than this value (in
  seconds), the Slow_launch_threads counter will be
@@ -764,9 +778,6 @@ The following options may be given as th
  -V, --version       Output version information and exit.
  --wait-timeout=#    The number of seconds the server waits for activity on a
  connection before closing it
- --slave-worker-info-repository=name 
- Defines the type of the repository for the worker
- information.
 
 Variables (--variable-name=value)
 abort-slave-event-count 0
@@ -856,7 +867,6 @@ log-warnings 1
 long-query-time 10
 low-priority-updates FALSE
 lower-case-table-names 1
-master-info-engine (No default value)
 master-info-file master.info
 master-info-repository FILE
 master-retry-count 86400
@@ -949,7 +959,6 @@ read-only FALSE
 read-rnd-buffer-size 262144
 relay-log (No default value)
 relay-log-index (No default value)
-relay-log-info-engine (No default value)
 relay-log-info-file relay-log.info
 relay-log-info-repository FILE
 relay-log-purge TRUE
@@ -983,6 +992,7 @@ slave-skip-errors (No default value)
 slave-sql-verify-checksum TRUE
 slave-transaction-retries 10
 slave-type-conversions 
+slave-worker-info-repository FILE
 slow-launch-time 2
 slow-query-log FALSE
 sort-buffer-size 2097152
@@ -1011,7 +1021,6 @@ transaction-prealloc-size 4096
 updatable-views-with-limit YES
 verbose TRUE
 wait-timeout 28800
-slave-worker-info-repository FILE
 
 To see what values a running MySQL server is using, type
 'mysqladmin variables' instead of 'mysqld --verbose --help'.


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