| List: | Commits | « Previous MessageNext Message » | |
| From: | jon.stephens | Date: | March 31 2009 11:55am |
| Subject: | svn commit - mysqldoc@docsrva: r14434 - in trunk: refman-4.1 refman-5.0 refman-5.1 refman-6.0 | ||
| View as plain text | |||
Author: jstephens Date: 2009-03-31 11:55:29 +0200 (Tue, 31 Mar 2009) New Revision: 14434 Log: Moved --log-slow-slave-statements and --abort-slave-event-count options (Thanks, JasonH!) Modified: trunk/refman-4.1/replication-options-core.xml trunk/refman-5.0/dba-mysqld-server-core.xml trunk/refman-5.0/replication-options-core.xml trunk/refman-5.1/dba-mysqld-server-core.xml trunk/refman-5.1/replication-options-core.xml trunk/refman-6.0/dba-mysqld-server-core.xml trunk/refman-6.0/replication-options-core.xml Modified: trunk/refman-4.1/replication-options-core.xml =================================================================== --- trunk/refman-4.1/replication-options-core.xml 2009-03-31 09:30:22 UTC (rev 14433) +++ trunk/refman-4.1/replication-options-core.xml 2009-03-31 09:55:29 UTC (rev 14434) Changed blocks: 1, Lines Added: 41, Lines Deleted: 2; 2379 bytes @@ -1874,13 +1874,52 @@ </listitem> <listitem> - <para id="option_mysqld_disconnect-slave-event-count"> + <para id="option_mysqld_abort-slave-event-count"> <remark role="NOTE"> - [js] Leave this one last in the list + [js] Leave abort-slave-event-count and + disconnect-slave-event-count as the last 2 in the list </remark> <indexterm> <primary>mysqld</primary> + <secondary>abort-slave-event-count option</secondary> + </indexterm> + + <indexterm> + <primary>abort-slave-event-count option</primary> + <secondary>mysqld</secondary> + </indexterm> + + <option role="mysqld">--abort-slave-event-count</option> + </para> + + <para> + When this option is set to some positive integer + <replaceable>value</replaceable> other than 0 (the default) it + affects replication behavior as follows: After the slave SQL + thread has started, <replaceable>value</replaceable> log + events are allowed to be executed; after that, the slave SQL + thread does not receive any more events, just as if the + network connection from the master were cut. The slave thread + continues to run, and the output from + <literal role="stmt">SHOW SLAVE STATUS</literal> displays + <literal>Yes</literal> in both the + <literal>Slave_IO_Running</literal> and the + <literal>Slave_SQL_Running</literal> columns, but no further + events are read from the relay log. + </para> + + <para> + This option is used internally by the MySQL test suite for + replication testing and debugging. It is not intended for use + in a production setting. + </para> + </listitem> + + <listitem> + <para id="option_mysqld_disconnect-slave-event-count"> + <indexterm> + <primary>mysqld</primary> <secondary>disconnect-slave-event-count option</secondary> </indexterm> Modified: trunk/refman-5.0/dba-mysqld-server-core.xml =================================================================== --- trunk/refman-5.0/dba-mysqld-server-core.xml 2009-03-31 09:30:22 UTC (rev 14433) +++ trunk/refman-5.0/dba-mysqld-server-core.xml 2009-03-31 09:55:29 UTC (rev 14434) Changed blocks: 1, Lines Added: 0, Lines Deleted: 40; 2077 bytes @@ -238,46 +238,6 @@ </listitem> <listitem> - <para id="option_mysqld_abort-slave-event-count"> - <indexterm> - <primary>mysqld</primary> - <secondary>abort-slave-event-count option</secondary> - </indexterm> - - <indexterm> - <primary>abort-slave-event-count option</primary> - <secondary>mysqld</secondary> - </indexterm> - - <option role="mysqld">--abort-slave-event-count</option> - </para> - - <para condition="dynamic:optvar:item" role="5.0:mysqld:abort-slave-event-count"/> - - <para> - When this option is set to some positive integer - <replaceable>value</replaceable> other than 0 (the default) it - affects replication behavior as follows: After the slave SQL - thread has started, <replaceable>value</replaceable> log - events are allowed to be executed; after that, the slave SQL - thread does not receive any more events, just as if the - network connection from the master were cut. The slave thread - continues to run, and the output from - <literal role="stmt">SHOW SLAVE STATUS</literal> displays - <literal>Yes</literal> in both the - <literal>Slave_IO_Running</literal> and the - <literal>Slave_SQL_Running</literal> columns, but no further - events are read from the relay log. - </para> - - <para> - This option is used internally by the MySQL test suite for - replication testing and debugging. It is not intended for use - in a production setting. - </para> - </listitem> - - <listitem> <para id="option_mysqld_allow-suspicious-udfs"> <indexterm> <primary>mysqld</primary> Modified: trunk/refman-5.0/replication-options-core.xml =================================================================== --- trunk/refman-5.0/replication-options-core.xml 2009-03-31 09:30:22 UTC (rev 14433) +++ trunk/refman-5.0/replication-options-core.xml 2009-03-31 09:55:29 UTC (rev 14434) Changed blocks: 1, Lines Added: 43, Lines Deleted: 2; 2470 bytes @@ -2143,13 +2143,54 @@ </listitem> <listitem> - <para id="option_mysqld_disconnect-slave-event-count"> + <para id="option_mysqld_abort-slave-event-count"> <remark role="NOTE"> - [js] Leave this one last in the list + [js] Leave abort-slave-event-count and + disconnect-slave-event-count as the last 2 in the list </remark> <indexterm> <primary>mysqld</primary> + <secondary>abort-slave-event-count option</secondary> + </indexterm> + + <indexterm> + <primary>abort-slave-event-count option</primary> + <secondary>mysqld</secondary> + </indexterm> + + <option role="mysqld">--abort-slave-event-count</option> + </para> + + <para condition="dynamic:optvar:item" role="5.0:mysqld:abort-slave-event-count"/> + + <para> + When this option is set to some positive integer + <replaceable>value</replaceable> other than 0 (the default) it + affects replication behavior as follows: After the slave SQL + thread has started, <replaceable>value</replaceable> log + events are allowed to be executed; after that, the slave SQL + thread does not receive any more events, just as if the + network connection from the master were cut. The slave thread + continues to run, and the output from + <literal role="stmt">SHOW SLAVE STATUS</literal> displays + <literal>Yes</literal> in both the + <literal>Slave_IO_Running</literal> and the + <literal>Slave_SQL_Running</literal> columns, but no further + events are read from the relay log. + </para> + + <para> + This option is used internally by the MySQL test suite for + replication testing and debugging. It is not intended for use + in a production setting. + </para> + </listitem> + + <listitem> + <para id="option_mysqld_disconnect-slave-event-count"> + <indexterm> + <primary>mysqld</primary> <secondary>disconnect-slave-event-count option</secondary> </indexterm> Modified: trunk/refman-5.1/dba-mysqld-server-core.xml =================================================================== --- trunk/refman-5.1/dba-mysqld-server-core.xml 2009-03-31 09:30:22 UTC (rev 14433) +++ trunk/refman-5.1/dba-mysqld-server-core.xml 2009-03-31 09:55:29 UTC (rev 14434) Changed blocks: 2, Lines Added: 0, Lines Deleted: 69; 3151 bytes @@ -237,46 +237,6 @@ </listitem> <listitem> - <para id="option_mysqld_abort-slave-event-count"> - <indexterm> - <primary>mysqld</primary> - <secondary>abort-slave-event-count option</secondary> - </indexterm> - - <indexterm> - <primary>abort-slave-event-count option</primary> - <secondary>mysqld</secondary> - </indexterm> - - <option role="mysqld">--abort-slave-event-count</option> - </para> - - <para condition="dynamic:optvar:item" role="5.1:mysqld:abort-slave-event-count"/> - - <para> - When this option is set to some positive integer - <replaceable>value</replaceable> other than 0 (the default) it - affects replication behavior as follows: After the slave SQL - thread has started, <replaceable>value</replaceable> log - events are allowed to be executed; after that, the slave SQL - thread does not receive any more events, just as if the - network connection from the master were cut. The slave thread - continues to run, and the output from - <literal role="stmt">SHOW SLAVE STATUS</literal> displays - <literal>Yes</literal> in both the - <literal>Slave_IO_Running</literal> and the - <literal>Slave_SQL_Running</literal> columns, but no further - events are read from the relay log. - </para> - - <para> - This option is used internally by the MySQL test suite for - replication testing and debugging. It is not intended for use - in a production setting. - </para> - </listitem> - - <listitem> <para id="option_mysqld_allow-suspicious-udfs"> <indexterm> <primary>mysqld</primary> @@ -1664,35 +1624,6 @@ </listitem> <listitem> - <para id="option_mysqld_log-slow-slave-statements"> - <indexterm> - <primary>mysqld</primary> - <secondary>log-slow-slave-statements option</secondary> - </indexterm> - - <indexterm> - <primary>log-slow-slave-statements option</primary> - <secondary>mysqld</secondary> - </indexterm> - - <option role="mysqld">--log-slow-slave-statements</option> - </para> - - <para condition="dynamic:optvar:item" role="5.1:mysqld:log-slow-slave-statements"/> - - <para> - When the slow query log is enabled, this option enables - logging for queries that have taken more than - <literal role="sysvar">long_query_time</literal> seconds to - execute on the slave. - </para> - - <para> - This option was added in MySQL 5.1.21. - </para> - </listitem> - - <listitem> <para id="option_mysqld_log-tc"> <indexterm> <primary>mysqld</primary> Modified: trunk/refman-5.1/replication-options-core.xml =================================================================== --- trunk/refman-5.1/replication-options-core.xml 2009-03-31 09:30:22 UTC (rev 14433) +++ trunk/refman-5.1/replication-options-core.xml 2009-03-31 09:55:29 UTC (rev 14434) Changed blocks: 2, Lines Added: 71, Lines Deleted: 1; 3374 bytes @@ -828,7 +828,36 @@ </listitem> <listitem> + <para id="option_mysqld_log-slow-slave-statements"> + <indexterm> + <primary>mysqld</primary> + <secondary>log-slow-slave-statements option</secondary> + </indexterm> + + <indexterm> + <primary>log-slow-slave-statements option</primary> + <secondary>mysqld</secondary> + </indexterm> + + <option role="mysqld">--log-slow-slave-statements</option> + </para> + + <para condition="dynamic:optvar:item" role="5.1:mysqld:log-slow-slave-statements"/> + <para> + When the slow query log is enabled, this option enables + logging for queries that have taken more than + <literal role="sysvar">long_query_time</literal> seconds to + execute on the slave. + </para> + + <para> + This option was added in MySQL 5.1.21. + </para> + </listitem> + + <listitem> + <para> <indexterm> <primary>mysqld</primary> <secondary>log-warnings option</secondary> @@ -2436,9 +2465,50 @@ </listitem> <listitem> + <para id="option_mysqld_abort-slave-event-count"> + <indexterm> + <primary>mysqld</primary> + <secondary>abort-slave-event-count option</secondary> + </indexterm> + + <indexterm> + <primary>abort-slave-event-count option</primary> + <secondary>mysqld</secondary> + </indexterm> + + <option role="mysqld">--abort-slave-event-count</option> + </para> + + <para condition="dynamic:optvar:item" role="5.1:mysqld:abort-slave-event-count"/> + + <para> + When this option is set to some positive integer + <replaceable>value</replaceable> other than 0 (the default) it + affects replication behavior as follows: After the slave SQL + thread has started, <replaceable>value</replaceable> log + events are allowed to be executed; after that, the slave SQL + thread does not receive any more events, just as if the + network connection from the master were cut. The slave thread + continues to run, and the output from + <literal role="stmt">SHOW SLAVE STATUS</literal> displays + <literal>Yes</literal> in both the + <literal>Slave_IO_Running</literal> and the + <literal>Slave_SQL_Running</literal> columns, but no further + events are read from the relay log. + </para> + + <para> + This option is used internally by the MySQL test suite for + replication testing and debugging. It is not intended for use + in a production setting. + </para> + </listitem> + + <listitem> <para id="option_mysqld_disconnect-slave-event-count"> <remark role="NOTE"> - [js] Leave this one last in the list + [js] Leave abort-slave-event-count and + disconnect-slave-event-count as the last 2 in the list </remark> <indexterm> Modified: trunk/refman-6.0/dba-mysqld-server-core.xml =================================================================== --- trunk/refman-6.0/dba-mysqld-server-core.xml 2009-03-31 09:30:22 UTC (rev 14433) +++ trunk/refman-6.0/dba-mysqld-server-core.xml 2009-03-31 09:55:29 UTC (rev 14434) Changed blocks: 2, Lines Added: 0, Lines Deleted: 69; 3150 bytes @@ -236,46 +236,6 @@ </listitem> <listitem> - <para id="option_mysqld_abort-slave-event-count"> - <indexterm> - <primary>mysqld</primary> - <secondary>abort-slave-event-count option</secondary> - </indexterm> - - <indexterm> - <primary>abort-slave-event-count option</primary> - <secondary>mysqld</secondary> - </indexterm> - - <option role="mysqld">--abort-slave-event-count</option> - </para> - - <para condition="dynamic:optvar:item" role="6.0:mysqld:abort-slave-event-count"/> - - <para> - When this option is set to some positive integer - <replaceable>value</replaceable> other than 0 (the default) it - affects replication behavior as follows: After the slave SQL - thread has started, <replaceable>value</replaceable> log - events are allowed to be executed; after that, the slave SQL - thread does not receive any more events, just as if the - network connection from the master were cut. The slave thread - continues to run, and the output from - <literal role="stmt">SHOW SLAVE STATUS</literal> displays - <literal>Yes</literal> in both the - <literal>Slave_IO_Running</literal> and the - <literal>Slave_SQL_Running</literal> columns, but no further - events are read from the relay log. - </para> - - <para> - This option is used internally by the MySQL test suite for - replication testing and debugging. It is not intended for use - in a production setting. - </para> - </listitem> - - <listitem> <para id="option_mysqld_allow-suspicious-udfs"> <indexterm> <primary>mysqld</primary> @@ -1707,35 +1667,6 @@ </listitem> <listitem> - <para id="option_mysqld_log-slow-slave-statements"> - <indexterm> - <primary>mysqld</primary> - <secondary>log-slow-slave-statements option</secondary> - </indexterm> - - <indexterm> - <primary>log-slow-slave-statements option</primary> - <secondary>mysqld</secondary> - </indexterm> - - <option role="mysqld">--log-slow-slave-statements</option> - </para> - - <para condition="dynamic:optvar:item" role="6.0:mysqld:log-slow-slave-statements"/> - - <para> - When the slow query log is enabled, this option enables - logging for queries that have taken more than - <literal role="sysvar">long_query_time</literal> seconds to - execute on the slave. - </para> - - <para> - This option was added in MySQL 6.0.4. - </para> - </listitem> - - <listitem> <para id="option_mysqld_log-tc"> <indexterm> <primary>mysqld</primary> Modified: trunk/refman-6.0/replication-options-core.xml =================================================================== --- trunk/refman-6.0/replication-options-core.xml 2009-03-31 09:30:22 UTC (rev 14433) +++ trunk/refman-6.0/replication-options-core.xml 2009-03-31 09:55:29 UTC (rev 14434) Changed blocks: 2, Lines Added: 73, Lines Deleted: 4; 3599 bytes @@ -631,7 +631,36 @@ </listitem> <listitem> + <para id="option_mysqld_log-slow-slave-statements"> + <indexterm> + <primary>mysqld</primary> + <secondary>log-slow-slave-statements option</secondary> + </indexterm> + + <indexterm> + <primary>log-slow-slave-statements option</primary> + <secondary>mysqld</secondary> + </indexterm> + + <option role="mysqld">--log-slow-slave-statements</option> + </para> + + <para condition="dynamic:optvar:item" role="6.0:mysqld:log-slow-slave-statements"/> + <para> + When the slow query log is enabled, this option enables + logging for queries that have taken more than + <literal role="sysvar">long_query_time</literal> seconds to + execute on the slave. + </para> + + <para> + This option was added in MySQL 6.0.4. + </para> + </listitem> + + <listitem> + <para> <indexterm> <primary>mysqld</primary> <secondary>log-warnings option</secondary> @@ -2117,12 +2146,52 @@ times before stopping with an error. The default value is 10. </para> </listitem> - <listitem> + <para id="option_mysqld_abort-slave-event-count"><remark role="NOTE"> + [js] Leave abort-slave-event-count and disconnect-slave-event-count as + the last 2 in the list + </remark> + <indexterm> + <primary>mysqld</primary> + <secondary>abort-slave-event-count option</secondary> + </indexterm> + + <indexterm> + <primary>abort-slave-event-count option</primary> + <secondary>mysqld</secondary> + </indexterm> + + <option role="mysqld">--abort-slave-event-count</option> + </para> + + <para condition="dynamic:optvar:item" role="6.0:mysqld:abort-slave-event-count"/> + + <para> + When this option is set to some positive integer + <replaceable>value</replaceable> other than 0 (the default) it + affects replication behavior as follows: After the slave SQL + thread has started, <replaceable>value</replaceable> log + events are allowed to be executed; after that, the slave SQL + thread does not receive any more events, just as if the + network connection from the master were cut. The slave thread + continues to run, and the output from + <literal role="stmt">SHOW SLAVE STATUS</literal> displays + <literal>Yes</literal> in both the + <literal>Slave_IO_Running</literal> and the + <literal>Slave_SQL_Running</literal> columns, but no further + events are read from the relay log. + </para> + + <para> + This option is used internally by the MySQL test suite for + replication testing and debugging. It is not intended for use + in a production setting. + </para> + </listitem> + <listitem> <para id="option_mysqld_disconnect-slave-event-count"> - <remark role="NOTE"> - [js] Leave this one last in the list - </remark> + + <indexterm> <primary>mysqld</primary>
| Thread | ||
|---|---|---|
| • svn commit - mysqldoc@docsrva: r14434 - in trunk: refman-4.1 refman-5.0 refman-5.1 refman-6.0 | jon.stephens | 31 Mar 2009 |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 0.664 sec. using MySQL 5.1.14-beta-log