Author: paul
Date: 2008-02-25 21:51:49 +0100 (Mon, 25 Feb 2008)
New Revision: 10010
Log:
r29503@frost: paul | 2008-02-25 14:51:25 -0600
Corrections for server opts/vars:
--chroot has a short form, -r which takes an argument
--event-scheduler takes an optional argument
event_scheduler is dynamic
--log-output doesn't *enable* logs, it just selects destinations
sql_mode default is '', not OFF (OFF is not legal)
Modified:
trunk/dynamic-docs/command-optvars/mysqld.xml
trunk/refman-4.1/dba-core.xml
trunk/refman-5.0/dba-core.xml
trunk/refman-5.1/dba-core.xml
trunk/refman-6.0/dba-core.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:34985
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:29500
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:29591
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:34985
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:29503
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:29591
Modified: trunk/dynamic-docs/command-optvars/mysqld.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysqld.xml 2008-02-25 20:31:03 UTC (rev 10009)
+++ trunk/dynamic-docs/command-optvars/mysqld.xml 2008-02-25 20:51:49 UTC (rev 10010)
Changed blocks: 3, Lines Added: 4, Lines Deleted: 5; 1272 bytes
@@ -6070,7 +6070,7 @@
<types>
<optype class="cmdline" format="--chroot=name"/>
- <optype class="cmdline" format="-r"/>
+ <optype class="cmdline" format="-r name"/>
<optype class="mycnf"/>
</types>
@@ -7116,9 +7116,9 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--event-scheduler=#" setvar="event-scheduler"/>
+ <optype class="cmdline" format="--event-scheduler[=value]" setvar="event-scheduler"/>
<optype class="mycnf"/>
- <vartype class="system" scope="global" isdynamic="no" format="event_scheduler"/>
+ <vartype class="system" scope="global" isdynamic="yes" format="event_scheduler"/>
</types>
<values vartype="enumeration" platform="all">
@@ -16563,8 +16563,7 @@
<choice value="REAL_AS_FLOAT"/>
<choice value="STRICT_ALL_TABLES"/>
<choice value="STRICT_TRANS_TABLES"/>
- <choice value="OFF"/>
- <value default="OFF"/>
+ <value default="''"/>
</values>
Modified: trunk/refman-4.1/dba-core.xml
===================================================================
--- trunk/refman-4.1/dba-core.xml 2008-02-25 20:31:03 UTC (rev 10009)
+++ trunk/refman-4.1/dba-core.xml 2008-02-25 20:51:49 UTC (rev 10010)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 2; 870 bytes
@@ -259,7 +259,8 @@
<para>
You can also set the values of server system variables by using
- variable names as options, as described later in this section.
+ variable names as options, as described at the end of this
+ section.
</para>
<itemizedlist>
@@ -537,7 +538,8 @@
<secondary>mysqld</secondary>
</indexterm>
- <option>--chroot=<replaceable>path</replaceable></option>
+ <option>--chroot=<replaceable>path</replaceable></option>,
+ <option>-r <replaceable>path</replaceable></option>
</para>
<para>
Modified: trunk/refman-5.0/dba-core.xml
===================================================================
--- trunk/refman-5.0/dba-core.xml 2008-02-25 20:31:03 UTC (rev 10009)
+++ trunk/refman-5.0/dba-core.xml 2008-02-25 20:51:49 UTC (rev 10010)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 2; 928 bytes
@@ -254,7 +254,8 @@
<para>
You can also set the values of server system variables by using
- variable names as options, as described later in this section.
+ variable names as options, as described at the end of this
+ section.
</para>
<itemizedlist>
@@ -581,7 +582,8 @@
<secondary>mysqld</secondary>
</indexterm>
- <option>--chroot=<replaceable>path</replaceable></option>
+ <option>--chroot=<replaceable>path</replaceable></option>,
+ <option>-r <replaceable>path</replaceable></option>
</para>
<para condition="dynamic:optvar:item" role="5.0:mysqld:chroot"/>
Modified: trunk/refman-5.1/dba-core.xml
===================================================================
--- trunk/refman-5.1/dba-core.xml 2008-02-25 20:31:03 UTC (rev 10009)
+++ trunk/refman-5.1/dba-core.xml 2008-02-25 20:51:49 UTC (rev 10010)
Changed blocks: 5, Lines Added: 13, Lines Deleted: 10; 3015 bytes
@@ -254,7 +254,8 @@
<para>
You can also set the values of server system variables by using
- variable names as options, as described later in this section.
+ variable names as options, as described at the end of this
+ section.
</para>
<itemizedlist>
@@ -631,7 +632,8 @@
<secondary>mysqld</secondary>
</indexterm>
- <option>--chroot=<replaceable>path</replaceable></option>
+ <option>--chroot=<replaceable>path</replaceable></option>,
+ <option>-r <replaceable>path</replaceable></option>
</para>
<para condition="dynamic:optvar:item" role="5.1:mysqld:chroot"/>
@@ -1064,7 +1066,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <option>--event-scheduler</option>
+ <option>--event-scheduler[=<replaceable>value</replaceable>]</option>
</para>
<para condition="dynamic:optvar:item" role="5.1:mysqld:event-scheduler"/>
@@ -1575,14 +1577,15 @@
option is given without a value, the default is
<literal>FILE</literal>. (For MySQL 5.1.6 through 5.1.20,
the default is <literal>TABLE</literal>.)
- <literal>TABLE</literal> causes logging to the
+ <literal>TABLE</literal> select logging to the
<literal>general_log</literal> and
<literal>slow_log</literal> tables in the
- <literal>mysql</literal> database. <literal>FILE</literal>
- causes logging to log files. (For <literal>FILE</literal>
- logging, the <option>--log</option> and
- <option>-slow-log</option> options determine the log file
- location.) <literal>NONE</literal> disables logging. If
+ <literal>mysql</literal> database as a destination.
+ <literal>FILE</literal> selects logging to log files as a
+ destination. (For <literal>FILE</literal> logging, the
+ <option>--log</option> and <option>-slow-log</option>
+ options determine the log file location.)
+ <literal>NONE</literal> disables logging. If
<literal>NONE</literal> is present in the option value, it
takes precedence over any other words that are present.
<literal>TABLE</literal> and <literal>FILE</literal> can
@@ -11566,7 +11569,7 @@
You can set these variables at runtime to change the names
of the log files. (If the <option>--log</option> and
<literal>--log-slow-queries</literal> options were not
- given, the variable values are set to the default log
+ given, the initial variable values are the default log
filenames.)
</para>
</listitem>
Modified: trunk/refman-6.0/dba-core.xml
===================================================================
--- trunk/refman-6.0/dba-core.xml 2008-02-25 20:31:03 UTC (rev 10009)
+++ trunk/refman-6.0/dba-core.xml 2008-02-25 20:51:49 UTC (rev 10010)
Changed blocks: 5, Lines Added: 14, Lines Deleted: 13; 3148 bytes
@@ -254,7 +254,8 @@
<para>
You can also set the values of server system variables by using
- variable names as options, as described later in this section.
+ variable names as options, as described at the end of this
+ section.
</para>
<itemizedlist>
@@ -628,7 +629,8 @@
<secondary>mysqld</secondary>
</indexterm>
- <option>--chroot=<replaceable>path</replaceable></option>
+ <option>--chroot=<replaceable>path</replaceable></option>,
+ <option>-r <replaceable>path</replaceable></option>
</para>
<para condition="dynamic:optvar:item" role="6.0:mysqld:chroot"/>
@@ -1052,7 +1054,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <option>--event-scheduler</option>
+ <option>--event-scheduler[=<replaceable>value</replaceable>]</option>
</para>
<para condition="dynamic:optvar:item" role="6.0:mysqld:event-scheduler"/>
@@ -1553,16 +1555,15 @@
one or more of the words <literal>TABLE</literal>,
<literal>FILE</literal>, or <literal>NONE</literal>. If the
option is given without a value, the default is
- <literal>FILE</literal>.
- <literal>TABLE</literal> causes logging to the
- <literal>general_log</literal> and
+ <literal>FILE</literal>. <literal>TABLE</literal> selects
+ logging to the <literal>general_log</literal> and
<literal>slow_log</literal> tables in the
- <literal>mysql</literal> database.
- <literal>FILE</literal>
- causes logging to log files. (For <literal>FILE</literal>
- logging, the <option>--log</option> and
- <option>-slow-log</option> options determine the log file
- location.) <literal>NONE</literal> disables logging. If
+ <literal>mysql</literal> database as a destination.
+ <literal>FILE</literal> selects logging to log files as a
+ destination. (For <literal>FILE</literal> logging, the
+ <option>--log</option> and <option>-slow-log</option>
+ options determine the log file location.)
+ <literal>NONE</literal> disables logging. If
<literal>NONE</literal> is present in the option value, it
takes precedence over any other words that are present.
<literal>TABLE</literal> and <literal>FILE</literal> can
@@ -11439,7 +11440,7 @@
You can set these variables at runtime to change the names
of the log files. (If the <option>--log</option> and
<literal>--log-slow-queries</literal> options were not
- given, the variable values are set to the default log
+ given, the initial variable values are the default log
filenames.)
</para>
</listitem>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r10010 - in trunk: . dynamic-docs/command-optvars refman-4.1 refman-5.0 refman-5.1 refman-6.0 | paul | 25 Feb |
