Author: paul
Date: 2007-07-10 01:01:31 +0200 (Tue, 10 Jul 2007)
New Revision: 7062
Log:
r22620@frost: paul | 2007-07-09 17:16:16 -0500
Document mysqld_safe --skip-kill-mysqld option. (It was missing.)
Modified:
trunk/dynamic-docs/command-optvars/mysqld_safe.xml
trunk/refman-4.1/dba-core.xml
trunk/refman-5.0/dba-core.xml
trunk/refman-5.1/dba-core.xml
trunk/refman-5.2/dba-core.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:27458
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:22619
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:18941
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:27458
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:22620
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:18941
Modified: trunk/dynamic-docs/command-optvars/mysqld_safe.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysqld_safe.xml 2007-07-09 23:01:06 UTC (rev 7061)
+++ trunk/dynamic-docs/command-optvars/mysqld_safe.xml 2007-07-09 23:01:31 UTC (rev 7062)
Changed blocks: 1, Lines Added: 17, Lines Deleted: 0; 1158 bytes
@@ -313,6 +313,23 @@
<manual version="5.2"/>
</versions>
</option>
+ <option command="mysqld_safe" section="server" id="skip-kill-mysqld">
+ <xrefto id="option_mysqld_safe_skip-kill-mysqld"/>
+ <name>skip-kill-mysqld</name>
+ <shortdescription lang="en">
+ Do not try to kill stray mysqld processes
+ </shortdescription>
+ <types>
+ <optype class="cmdline" format="--skip-kill-mysqld"/>
+ <optype class="mycnf"/>
+ </types>
+ <versions>
+ <manual version="4.1"/>
+ <manual version="5.0"/>
+ <manual version="5.1"/>
+ <manual version="5.2"/>
+ </versions>
+ </option>
<option command="mysqld_safe" section="server" id="socket">
<xrefto id="option_mysqld_safe_socket"/>
<name>socket</name>
Modified: trunk/refman-4.1/dba-core.xml
===================================================================
--- trunk/refman-4.1/dba-core.xml 2007-07-09 23:01:06 UTC (rev 7061)
+++ trunk/refman-4.1/dba-core.xml 2007-07-09 23:01:31 UTC (rev 7062)
Changed blocks: 1, Lines Added: 21, Lines Deleted: 0; 1153 bytes
@@ -10934,6 +10934,27 @@
</listitem>
<listitem>
+ <para id="option_mysqld_safe_skip-kill-mysqld">
+ <indexterm>
+ <primary>mysqld_safe</primary>
+ <secondary>skip-kill-mysqld option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>skip-kill-mysqld option</primary>
+ <secondary>mysqld_safe</secondary>
+ </indexterm>
+
+ <option>--skip-kill-mysqld</option>
+ </para>
+
+ <para>
+ Do not try to kill stray <command>mysqld</command>
+ processes at startup. This option works only on Linux.
+ </para>
+ </listitem>
+
+ <listitem>
<para id="option_mysqld_safe_socket">
<indexterm>
<primary>mysqld_safe</primary>
Modified: trunk/refman-5.0/dba-core.xml
===================================================================
--- trunk/refman-5.0/dba-core.xml 2007-07-09 23:01:06 UTC (rev 7061)
+++ trunk/refman-5.0/dba-core.xml 2007-07-09 23:01:31 UTC (rev 7062)
Changed blocks: 1, Lines Added: 21, Lines Deleted: 0; 1153 bytes
@@ -12343,6 +12343,27 @@
</listitem>
<listitem>
+ <para id="option_mysqld_safe_skip-kill-mysqld">
+ <indexterm>
+ <primary>mysqld_safe</primary>
+ <secondary>skip-kill-mysqld option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>skip-kill-mysqld option</primary>
+ <secondary>mysqld_safe</secondary>
+ </indexterm>
+
+ <option>--skip-kill-mysqld</option>
+ </para>
+
+ <para>
+ Do not try to kill stray <command>mysqld</command>
+ processes at startup. This option works only on Linux.
+ </para>
+ </listitem>
+
+ <listitem>
<para id="option_mysqld_safe_socket">
<indexterm>
<primary>mysqld_safe</primary>
Modified: trunk/refman-5.1/dba-core.xml
===================================================================
--- trunk/refman-5.1/dba-core.xml 2007-07-09 23:01:06 UTC (rev 7061)
+++ trunk/refman-5.1/dba-core.xml 2007-07-09 23:01:31 UTC (rev 7062)
Changed blocks: 1, Lines Added: 21, Lines Deleted: 0; 1153 bytes
@@ -12635,6 +12635,27 @@
</listitem>
<listitem>
+ <para id="option_mysqld_safe_skip-kill-mysqld">
+ <indexterm>
+ <primary>mysqld_safe</primary>
+ <secondary>skip-kill-mysqld option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>skip-kill-mysqld option</primary>
+ <secondary>mysqld_safe</secondary>
+ </indexterm>
+
+ <option>--skip-kill-mysqld</option>
+ </para>
+
+ <para>
+ Do not try to kill stray <command>mysqld</command>
+ processes at startup. This option works only on Linux.
+ </para>
+ </listitem>
+
+ <listitem>
<para id="option_mysqld_safe_socket">
<indexterm>
<primary>mysqld_safe</primary>
Modified: trunk/refman-5.2/dba-core.xml
===================================================================
--- trunk/refman-5.2/dba-core.xml 2007-07-09 23:01:06 UTC (rev 7061)
+++ trunk/refman-5.2/dba-core.xml 2007-07-09 23:01:31 UTC (rev 7062)
Changed blocks: 1, Lines Added: 21, Lines Deleted: 0; 1153 bytes
@@ -12558,6 +12558,27 @@
</listitem>
<listitem>
+ <para id="option_mysqld_safe_skip-kill-mysqld">
+ <indexterm>
+ <primary>mysqld_safe</primary>
+ <secondary>skip-kill-mysqld option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>skip-kill-mysqld option</primary>
+ <secondary>mysqld_safe</secondary>
+ </indexterm>
+
+ <option>--skip-kill-mysqld</option>
+ </para>
+
+ <para>
+ Do not try to kill stray <command>mysqld</command>
+ processes at startup. This option works only on Linux.
+ </para>
+ </listitem>
+
+ <listitem>
<para id="option_mysqld_safe_socket">
<indexterm>
<primary>mysqld_safe</primary>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r7062 - in trunk: . dynamic-docs/command-optvars refman-4.1 refman-5.0 refman-5.1 refman-5.2 | paul | 10 Jul |
