Author: paul
Date: 2009-10-12 19:55:33 +0200 (Mon, 12 Oct 2009)
New Revision: 17085
Log:
r45407@frost: paul | 2009-10-12 12:46:16 -0500
Remove --lc-messages-dir/lc_messages_dir from refman-5.4
(WL#751)
Modified:
trunk/dynamic-docs/changelog/mysqld-1.xml
trunk/dynamic-docs/command-optvars/mysqld.xml
trunk/refman-5.4/dba-mysqld-server-core.xml
trunk/refman-5.4/internationalization.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:27075
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:25547
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:45406
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
+ 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:27075
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:25547
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:45407
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
Modified: trunk/dynamic-docs/changelog/mysqld-1.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld-1.xml 2009-10-12 17:55:18 UTC (rev 17084)
+++ trunk/dynamic-docs/changelog/mysqld-1.xml 2009-10-12 17:55:33 UTC (rev 17085)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 421 bytes
@@ -68655,7 +68655,7 @@
</bugs>
<versions>
- <version ver="5.4.4"/>
+<!--<version ver="5.4.4"/>-->
</versions>
<message>
Modified: trunk/dynamic-docs/command-optvars/mysqld.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysqld.xml 2009-10-12 17:55:18 UTC (rev 17084)
+++ trunk/dynamic-docs/command-optvars/mysqld.xml 2009-10-12 17:55:33 UTC (rev 17085)
Changed blocks: 4, Lines Added: 4, Lines Deleted: 5; 1173 bytes
@@ -11375,7 +11375,7 @@
path
</shortdescription>
- <deprecated version="5.4.4" xref="lc-messages-dir"/>
+ <deprecated version="5.5.0" xref="lc-messages-dir"/>
<types>
<optype class="cmdline" format="--language=name" setvar="language"/>
@@ -11393,6 +11393,7 @@
<manual version="5.0"/>
<manual version="5.1"/>
<manual version="5.4"/>
+ <manual version="5.5"/>
<manual version="6.0"/>
</versions>
@@ -11523,8 +11524,7 @@
<values vartype="string" platform="all"/>
<versions>
- <manual version="5.4"/>
- <introduced version="5.4.4"/>
+ <manual version="5.5"/>
</versions>
</mysqloption>
@@ -11548,8 +11548,7 @@
<values vartype="string" platform="all"/>
<versions>
- <manual version="5.4"/>
- <introduced version="5.4.4"/>
+ <manual version="5.5"/>
</versions>
</mysqloption>
Modified: trunk/refman-5.4/dba-mysqld-server-core.xml
===================================================================
--- trunk/refman-5.4/dba-mysqld-server-core.xml 2009-10-12 17:55:18 UTC (rev 17084)
+++ trunk/refman-5.4/dba-mysqld-server-core.xml 2009-10-12 17:55:33 UTC (rev 17085)
Changed blocks: 4, Lines Added: 0, Lines Deleted: 134; 5379 bytes
@@ -1272,15 +1272,6 @@
the language files are installed. See
<xref linkend="error-message-language"/>.
</para>
-
- <para>
- As of MySQL 5.4.4,
- <option role="mysqld">--lc-messages-dir</option> and
- <option role="mysqld">--lc-messages</option> should be used
- rather than <option role="mysqld">--language</option>, which
- is is deprecated and handled as an alias for
- <option role="mysqld">--lc-messages-dir</option>.
- </para>
</listitem>
<listitem>
@@ -1325,66 +1316,6 @@
</listitem>
<listitem>
- <para id="option_mysqld_lc-messages">
- <indexterm>
- <primary>mysqld</primary>
- <secondary>lc-messages option</secondary>
- </indexterm>
-
- <indexterm>
- <primary>lc-messages option</primary>
- <secondary>mysqld</secondary>
- </indexterm>
-
- <option role="mysqld">--lc-messages=<replaceable>locale_name</replaceable></option>
- </para>
-
- <para condition="dynamic:optvar:item" role="5.4:mysqld:lc-messages"/>
-
- <para>
- The locale to use for error messages. The server converts the
- argument to a language name and combines it with the value of
- the <option>--lc-messages-dir</option> to produce the location
- for the error message file. See
- <xref linkend="error-message-language"/>.
- </para>
-
- <para>
- This option was added in MySQL 5.4.4.
- </para>
- </listitem>
-
- <listitem>
- <para id="option_mysqld_lc-messages-dir">
- <indexterm>
- <primary>mysqld</primary>
- <secondary>lc-messages-dir option</secondary>
- </indexterm>
-
- <indexterm>
- <primary>lc-messages-dir option</primary>
- <secondary>mysqld</secondary>
- </indexterm>
-
- <option role="mysqld">--lc-messages-dir=<replaceable>path</replaceable></option>
- </para>
-
- <para condition="dynamic:optvar:item" role="5.4:mysqld:lc-messages-dir"/>
-
- <para>
- The directory where error messages are located. The value is
- used together with the value of
- <option>--lc-messages-dir</option> to produce the location for
- the error message file. See
- <xref linkend="error-message-language"/>.
- </para>
-
- <para>
- This option was added in MySQL 5.4.4.
- </para>
- </listitem>
-
- <listitem>
<para id="option_mysqld_log">
<indexterm>
<primary>mysqld</primary>
@@ -6050,13 +5981,6 @@
The directory where error messages are located. See
<xref linkend="error-message-language"/>.
</para>
-
- <para>
- <literal role="sysvar">language</literal> is removed as of
- MySQL 5.4.4. Similar information is available from the
- <literal role="sysvar">lc_messages_dir</literal> and
- <literal role="sysvar">lc_messages</literal> variables.
- </para>
</listitem>
<listitem>
@@ -6129,64 +6053,6 @@
</listitem>
<listitem>
- <para id="sysvar_lc_messages">
- <indexterm>
- <primary>lc_messages system variable</primary>
- </indexterm>
-
- <indexterm>
- <primary>system variable</primary>
- <secondary>lc_messages</secondary>
- </indexterm>
-
- <literal role="sysvar">lc_messages</literal>
- </para>
-
- <para condition="dynamic:optvar:item" role="5.4:mysqld:lc-messages"/>
-
- <para>
- The locale to use for error messages. The server converts the
- value to a language name and combines it with the value of the
- <literal role="sysvar">lc_messages_dir</literal> to produce
- the location for the error message file. See
- <xref linkend="error-message-language"/>.
- </para>
-
- <para>
- This variable was added in MySQL 5.4.4.
- </para>
- </listitem>
-
- <listitem>
- <para id="sysvar_lc_messages_dir">
- <indexterm>
- <primary>lc_messages_dir system variable</primary>
- </indexterm>
-
- <indexterm>
- <primary>system variable</primary>
- <secondary>lc_messages_dir</secondary>
- </indexterm>
-
- <literal role="sysvar">lc_messages_dir</literal>
- </para>
-
- <para condition="dynamic:optvar:item" role="5.4:mysqld:lc-messages-dir"/>
-
- <para>
- The directory where error messages are located. The value is
- used together with the value of
- <literal role="sysvar">lc_messages_dir</literal> to produce
- the location for the error message file. See
- <xref linkend="error-message-language"/>.
- </para>
-
- <para>
- This variable was added in MySQL 5.4.4.
- </para>
- </listitem>
-
- <listitem>
<para id="sysvar_lc_time_names">
<indexterm>
<primary>lc_time_names system variable</primary>
Modified: trunk/refman-5.4/internationalization.xml
===================================================================
--- trunk/refman-5.4/internationalization.xml 2009-10-12 17:55:18 UTC (rev 17084)
+++ trunk/refman-5.4/internationalization.xml 2009-10-12 17:55:33 UTC (rev 17085)
Changed blocks: 2, Lines Added: 3, Lines Deleted: 77; 3898 bytes
@@ -6467,77 +6467,9 @@
</para>
<para>
- As of MySQL 5.4.4, the server searches for the error message file
- in two locations:
- </para>
-
- <itemizedlist>
-
- <listitem>
- <para>
- It tries to find the file in a directory constructed from two
- parts, the value of
- <option role="mysqld">--lc-messages-dir</option> and the value
- of <option role="mysqld">--lc-messages</option> converted to a
- language name. Suppose that you start the server using this
- command:
- </para>
-
-<programlisting>
-shell> <userinput>mysqld --lc-messages-dir=/usr/share/mysql --lc-messages=fr_FR</userinput>
-</programlisting>
-
- <para>
- In this case, <command>mysqld</command> maps the locale
- <literal>fr_FR</literal> to the language
- <literal>french</literal> and looks for the error file in the
- <filename>/usr/share/mysql/french</filename> directory.
- </para>
- </listitem>
-
- <listitem>
- <para>
- If the message file cannot be found in the directory
- constructed as just described, the server ignores the
- <option role="mysqld">--lc-messages</option> value and uses
- only the <option role="mysqld">--lc-messages-dir</option>
- value as the location in which to look.
- </para>
- </listitem>
-
- </itemizedlist>
-
- <para>
- The <option role="mysqld">--lc-messages-dir</option> and
- <option role="mysqld">--lc-messages</option> options are
- accompanied by the
- <literal role="sysvar">lc_messages_dir</literal> and
- <literal role="sysvar">lc_messages</literal> system variables.
- <literal role="sysvar">lc_messages_dir</literal> has only a global
- value and is read only.
- <literal role="sysvar">lc_messages</literal> has global and
- session values and can be modified at runtime, so the error
- message language can be changed while the server is running, and
- individual clients each can have a different error message
- language by changing their session
- <literal role="sysvar">lc_messages</literal> value to a different
- locale name. For example, if the server is using the
- <literal>fr_FR</literal> locale for error messages, a client that
- wants error messages in English can execute this statement:
- </para>
-
-<programlisting>
-mysql> <userinput>SET lc_messages = 'en_US';</userinput>
-</programlisting>
-
- <para>
- Before MySQL 5.4.4, the
- <option role="mysqld">--lc-messages-dir</option> and
- <option role="mysqld">--lc-messages</option> options (and
- accompanying system variables) are unavailable. To start
- <command>mysqld</command> with a particular language for error
- messages, use the <option role="mysqld">--language</option> or
- <option>-L</option> option. The option value can be a language
+ To start <command>mysqld</command> with a particular language for
+ error messages, use the <option role="mysqld">--language</option>
+ or <option>-L</option> option. The option value can be a language
name or the full path to the error message file. For example:
</para>
@@ -6558,12 +6490,6 @@
</para>
<para>
- From MySQL 5.4.4 on, <option role="mysqld">--language</option> is
- treated as an alias for
- <option role="mysqld">--lc-messages-dir</option>.
- </para>
-
- <para>
By default, the language files are located in the
<filename>share/mysql/<replaceable>LANGUAGE</replaceable></filename>
directory under the MySQL base directory.
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r17085 - in trunk: . dynamic-docs/changelog dynamic-docs/command-optvars refman-5.4 | paul.dubois | 12 Oct |
