svn commit - mysqldoc@docsrva: r4559 - trunk/dynamic-docs/mysqld-optvar

[plavin]

Author: plavin
Date: 2007-01-18 18:20:17 +0100 (Thu, 18 Jan 2007)
New Revision: 4559

Log:
add server-shutdown and other misc changes

Modified:
   trunk/dynamic-docs/mysqld-optvar/options.xml


Modified: trunk/dynamic-docs/mysqld-optvar/options.xml
===================================================================
--- trunk/dynamic-docs/mysqld-optvar/options.xml	2007-01-18 16:13:34 UTC (rev 4558)
+++ trunk/dynamic-docs/mysqld-optvar/options.xml	2007-01-18 17:20:17 UTC (rev 4559)
Changed blocks: 6, Lines Added: 35, Lines Deleted: 8; 3324 bytes

@@ -3490,7 +3490,7 @@
       <optype class="cmdline" format="--binlog-do-db=name"/>
       <optype class="mycnf"/>
     </types>
-    <values vartype="filename" platform="all"/>
+    <values vartype="string" platform="all"/>
     <versions>
       <manual version="4.1"/>
       <manual version="5.0"/>

@@ -3510,7 +3510,7 @@
       <optype class="cmdline" format="--binlog-ignore-db=name"/>
       <optype class="mycnf"/>
     </types>
-    <values vartype="filename" platform="all"/>
+    <values vartype="string" platform="all"/>
     <versions>
       <manual version="4.1"/>
       <manual version="5.0"/>

@@ -3847,7 +3847,7 @@
       <vartype class="server" format="concurrent_insert" isdynamic="yes"
         scope="global"/>
     </types>
-    <values vartype="boolean" platform="all">
+    <values vartype="boolean" platform="all" outversion="5.0.6">
       <value default="TRUE"/>
     </values>
     <values vartype="numeric" platform="all" inversion="5.0.6">

@@ -3865,8 +3865,8 @@
   <mysqloption id="connect_timeout">
     <xrefto id="optvar_connect_timeout"/>
     <name>connect_timeout</name>
-    <shortdescription lang="en">The number of seconds the mysqld server is
-      waiting for a connect packet before responding with 'Bad
handshake'</shortdescription>
+    <shortdescription lang="en">The number of seconds the mysqld server 
+      waits for a connect packet before responding with 'Bad
handshake'</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -3878,7 +3878,9 @@
       <vartype isdynamic="yes" class="server" format="connect_timeout"
         scope="global"/>
     </types>
-    <values vartype="numeric" platform="all"/>
+    <values vartype="numeric" platform="all">
+      <value default="5"/>
+    </values>
     <versions>
       <manual version="4.1"/>
       <manual version="5.0"/>

@@ -9068,8 +9070,33 @@
       <manual version="5.1"/>
     </versions>
   </mysqloption>
-  <mysqloption id="skip-automatic-sp-privileges">
-    
+ 
+    <mysqloption id="shutdown_timeout">
+      <xrefto id="optvar_shutdown_timeout"/>
+      <name>shutdown_timeout</name>
+      <shortdescription lang="en">The maximum number of seconds 
+        to wait for server shutdown</shortdescription>
+      <section id="mysqld"/>
+      <opclass class="server"/>
+      <engines includes="all"/>
+      <platforms applies="all"/>
+      <types>
+        <optype class="cmdline" format="--shutdown_timeout=#"
+          setvar="shutdown_timeout"/>
+        <optype class="mycnf"/>
+        <vartype isdynamic="yes" class="server" scope="both"/>
+      </types>
+      <values vartype="numeric" platform="all">
+        <value default="3600"/>
+      </values>
+      <versions>
+        <manual version="4.1"/>
+        <manual version="5.0"/>
+        <manual version="5.1"/>
+      </versions>
+    </mysqloption>
+  
+  <mysqloption id="skip-automatic-sp-privileges">    
     <name>skip-automatic-sp-privileges</name>
     <shortdescription lang="en">Skip Automatic Stored Procedure
Privileges</shortdescription>
     <section id="mysqld"/>