From: Andrei Elkin Date: June 23 2011 4:56am Subject: bzr push into mysql-next-mr-wl5569 branch (andrei.elkin:3317 to 3318) WL#5569 List-Archive: http://lists.mysql.com/commits/139709 Message-Id: <201106230456.p5N4ubOQ018333@mysql1000.dsl.inet.fi> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1366543085==" --===============1366543085== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline 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'. --===============1366543085== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/andrei.elkin@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: andrei.elkin@stripped # target_branch: file:///home/andrei/MySQL/BZR/2a-23May/WL/mysql-next-\ # mr-wl5569/ # testament_sha1: 802bc53b73686b598216b953b21a7f5ae8021064 # timestamp: 2011-06-23 07:56:37 +0300 # source_branch: file:///home/andrei/MySQL/BZR/2a-23May/mysql-trunk/ # base_revision_id: alfranio.correia@stripped\ # boavw70fc3l7yswa # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTJAW0IAAhPfgAAQWOP/93en DoC////wUAWMPbdlrT2e7zrl2Zc9713oSSRoAFPaEJtNRNMnqb1QGgGaI9IMk0AmTJpT0p6n6SPU 0aADQAGmgGmgRATFNNT0YiNohoDQyaNABDSieo9TJpo0ZHqNAaMjQADQAEkQqfpU/aKnhqM00ap7 VH6k9NQHpAyABVsKFn+rcjt2XxS5fjGwPpzd+eXhy+8Vx1Ub9hezWuWl+2JEpgrr6Zi2Yuw3AcjN CDd9KFCUA+/in5epzGbNpoVGhq8Q7nI0JOmiqZlmg2X6pzWhQc27hrHnheQHa3g3OaeMO55t7Vx4 FXNa50vo7fY5XS3lapwUubZakCCLoEUj+4BhANl99z1B1VF6giIvbdQ4dG3YfaikIOOdTGNNBBFC RQ7BEKK0jzOt9JSUKW3RI3HC/RYiI8yqYo0FF3U20F0jpkitPpAZQax+U3XRKLJkmYcrdaMyiBBC BhBFRDp1hJgILjaHqKJSEpxEyEHdZ4GgMKrMP59g9kQ0EY4jkyNQQ9rlrgMGl8pEj+1Vm+iq9Jlf 7qFjnDIYqhNVg/COvB1mQKJdzEqtUqgwuXRRRsyFE0caiZ0KApMz2mA3nSXmVxCsrjtwTnogpDTD 8u8o11mJwxqDipGwtKMamQu08s70bvEIbGnUJlwo7BfLbKokrChMeVmeh5ZK4V7d433BICRycWj0 Nizl3UltnmgSYOFQgXNo8U2sGHdmJtTbWdQyMCe85q2rmLCFWEW1pzojsHSWrAxiUJLqGc610Ull 1s8uCjWu9nqKQYKWdnffqec8ugT0m6qBxUVD7icmLeLK5M3ShsH1TEaiVDELmsHI/VgeGFHo0RAV TBOTlniXJC0CAZJjzM3zrjMGd950gCG1+htD60IR+W5fByhVNkwYuw+riVwbTb0nd8V6xzT6HA1S IqrA1VMUbwz3qvWM58TEtwfTP1nsGd4vB/ZBKFy3Ho6Vqzv1QfJZSGh0s48QvN92srMKj4qVt06h c0LGw9mVDvBRGQZ8Mr87wFxNUkAhI8xI0VhUMMEI2HXjGk+yKQhZNVnQG15YJgIBq4hUAgzXq8z8 egh9l2bed/l6svQJSpFgggMAncMxnsVOHhELjZpZTZgqtQDQYlrIEYX6mWkhK/XPh1q9vD06bkGb Kkf0cWbycPpAgHC6McEBCfXmxCqaEa9z2dNqvIW3KXz295xE8OfBXAmtnUogxXNT9Au07qMZmHBY 9uZce3lp8zv1agdRY7obVXCGpgh1sHZykc9uOwYHXewNSISOJLy4utYtWqAqAEOFTK8529yOtai4 bE3sO3HoPaAoCPOUWgvSzZNgP1vwng6zwiFKT2ARGnDrqdf9zW4OrOIqTyZEheHAXqiG/fa6HrCr XHzpl+ZAPMNGXOiQ7ttooPpUOT+NYG+CqbOqroTCKti6umbiGhIyrvDc8hQdOIfhZECnEJSjnv7z MCpqoUA6FQAfxWA4HJ+2AEuTUhAWSQ6zCEkAlA/kEZMNOIJ0UOmC6owaYtjmAe8XTEFMTQeU2rX7 SLAfP/MhwnVLxMHeQnLEb+zhZxbbo5l6vlPtJSzV7gbpVG+dypdYbrRPloZmJmHMFdrlpGknmeSx kfSvegxVU6IEGsuJtQSoThPh0zIW3gTYWpRqMAEeBGV0XEEhMHTpGz4Q9Q4gwXLLK1F6G21qjUw5 0gNCx7vO6hu8PA1ns4BNSC7HawqF1AMAZRp1GMmO9CPiXlYcWqjhelbxoE7mEwsGNC0xwuKhw6hE 0AgLFFYJpJC2Ue/BjdfrvhUvIbOv1hW+zIsmvlbQVApyZA5Wri8cLpL4K1V3mRuewYZojC8CrTD6 ECwaxw2YBFl1U44i8lJOD5hT4/8XckU4UJAyQFtC --===============1366543085==--