Author: paul
Date: 2010-11-30 18:30:57 +0100 (Tue, 30 Nov 2010)
New Revision: 24131
Log:
r66265@frost: paul | 2010-11-30 10:14:50 -0500
The CMake equivalent of --with-extra-charsets is WITH_EXTRA_CHARSETS,
not EXTRA_CHARSETS
Modified:
trunk/dynamic-docs/build-configure/cmake.xml
trunk/refman-5.5/errors-problems.xml
trunk/refman-5.5/installing-source-core.xml
trunk/refman-5.6/errors-problems.xml
trunk/refman-5.6/installing-source-core.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:44847
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:66244
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:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:44847
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:66265
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/build-configure/cmake.xml
===================================================================
--- trunk/dynamic-docs/build-configure/cmake.xml 2010-11-30 16:53:41 UTC (rev 24130)
+++ trunk/dynamic-docs/build-configure/cmake.xml 2010-11-30 17:30:57 UTC (rev 24131)
Changed blocks: 2, Lines Added: 22, Lines Deleted: 22; 1502 bytes
@@ -163,28 +163,6 @@
</buildoption>
- <buildoption id="extra_charsets">
-
- <xrefto id="option_cmake_extra_charsets"/>
-
- <formatbase format="EXTRA_CHARSETS">
- <description>Which extra character sets to include</description>
- </formatbase>
-
- <values>
- <default>all</default>
- <choice>complex</choice>
- <choice>none</choice>
- </values>
-
- <versions>
- <manual version="5.5"/>
- <introduced version="5.5.7"/>
- <manual version="5.6"/>
- </versions>
-
- </buildoption>
-
<buildoption id="install_bindir">
<xrefto id="option_cmake_install_bindir"/>
@@ -568,6 +546,28 @@
</buildoption>
+ <buildoption id="with_extra_charsets">
+
+ <xrefto id="option_cmake_with_extra_charsets"/>
+
+ <formatbase format="WITH_EXTRA_CHARSETS">
+ <description>Which extra character sets to include</description>
+ </formatbase>
+
+ <values>
+ <default>all</default>
+ <choice>complex</choice>
+ <choice>none</choice>
+ </values>
+
+ <versions>
+ <manual version="5.5"/>
+ <introduced version="5.5.7"/>
+ <manual version="5.6"/>
+ </versions>
+
+ </buildoption>
+
<buildoption id="with_libwrap">
<xrefto id="option_cmake_with_libwrap"/>
Modified: trunk/refman-5.5/errors-problems.xml
===================================================================
--- trunk/refman-5.5/errors-problems.xml 2010-11-30 16:53:41 UTC (rev 24130)
+++ trunk/refman-5.5/errors-problems.xml 2010-11-30 17:30:57 UTC (rev 24131)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 1152 bytes
@@ -2505,14 +2505,14 @@
<command>CMake</command> with the
<option role="cmake">-DDEFAULT_CHARSET=<replaceable>charset_name</replaceable></option>
or
- <option role="cmake">-DEXTRA_CHARSETS=<replaceable>charset_name</replaceable></option>
+ <option role="cmake">-DWITH_EXTRA_CHARSETS=<replaceable>charset_name</replaceable></option>
option. See
<xref linkend="source-configuration-options"/>.
</para>
<para>
All standard MySQL binaries are compiled with
- <option role="cmake">-DEXTRA_CHARSETS=complex</option>,
+ <option role="cmake">-DWITH_EXTRA_CHARSETS=complex</option>,
which enables support for all multi-byte character sets.
See <xref linkend="source-configuration-options"/>.
</para>
Modified: trunk/refman-5.5/installing-source-core.xml
===================================================================
--- trunk/refman-5.5/installing-source-core.xml 2010-11-30 16:53:41 UTC (rev 24130)
+++ trunk/refman-5.5/installing-source-core.xml 2010-11-30 17:30:57 UTC (rev 24131)
Changed blocks: 2, Lines Added: 43, Lines Deleted: 43; 2754 bytes
@@ -1647,49 +1647,6 @@
</listitem>
<listitem>
- <para id="option_cmake_extra_charsets">
- <indexterm>
- <primary>CMake</primary>
- <secondary>EXTRA_CHARSETS option</secondary>
- </indexterm>
-
- <indexterm>
- <primary>EXTRA_CHARSETS option</primary>
- <secondary>CMake</secondary>
- </indexterm>
-
- <literal>-DEXTRA_CHARSETS=<replaceable>name</replaceable></literal>
- </para>
-
- <para>
- Which extra character sets to include:
- </para>
-
- <itemizedlist>
-
- <listitem>
- <para>
- <literal>all</literal>: All character sets. This is the
- default.
- </para>
- </listitem>
-
- <listitem>
- <para>
- <literal>complex</literal>: Complex character sets.
- </para>
- </listitem>
-
- <listitem>
- <para>
- <literal>none</literal>: No extra character sets.
- </para>
- </listitem>
-
- </itemizedlist>
- </listitem>
-
- <listitem>
<para id="option_cmake_mysql_tcp_port">
<indexterm>
<primary>CMake</primary>
@@ -1771,6 +1728,49 @@
</listitem>
<listitem>
+ <para id="option_cmake_with_extra_charsets">
+ <indexterm>
+ <primary>CMake</primary>
+ <secondary>WITH_EXTRA_CHARSETS option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>WITH_EXTRA_CHARSETS option</primary>
+ <secondary>CMake</secondary>
+ </indexterm>
+
+ <literal>-DWITH_EXTRA_CHARSETS=<replaceable>name</replaceable></literal>
+ </para>
+
+ <para>
+ Which extra character sets to include:
+ </para>
+
+ <itemizedlist>
+
+ <listitem>
+ <para>
+ <literal>all</literal>: All character sets. This is the
+ default.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <literal>complex</literal>: Complex character sets.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <literal>none</literal>: No extra character sets.
+ </para>
+ </listitem>
+
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para id="option_cmake_with_libwrap">
<indexterm>
<primary>CMake</primary>
Modified: trunk/refman-5.6/errors-problems.xml
===================================================================
--- trunk/refman-5.6/errors-problems.xml 2010-11-30 16:53:41 UTC (rev 24130)
+++ trunk/refman-5.6/errors-problems.xml 2010-11-30 17:30:57 UTC (rev 24131)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 1152 bytes
@@ -2505,14 +2505,14 @@
<command>CMake</command> with the
<option role="cmake">-DDEFAULT_CHARSET=<replaceable>charset_name</replaceable></option>
or
- <option role="cmake">-DEXTRA_CHARSETS=<replaceable>charset_name</replaceable></option>
+ <option role="cmake">-DWITH_EXTRA_CHARSETS=<replaceable>charset_name</replaceable></option>
option. See
<xref linkend="source-configuration-options"/>.
</para>
<para>
All standard MySQL binaries are compiled with
- <option role="cmake">-DEXTRA_CHARSETS=complex</option>,
+ <option role="cmake">-DWITH_EXTRA_CHARSETS=complex</option>,
which enables support for all multi-byte character sets.
See <xref linkend="source-configuration-options"/>.
</para>
Modified: trunk/refman-5.6/installing-source-core.xml
===================================================================
--- trunk/refman-5.6/installing-source-core.xml 2010-11-30 16:53:41 UTC (rev 24130)
+++ trunk/refman-5.6/installing-source-core.xml 2010-11-30 17:30:57 UTC (rev 24131)
Changed blocks: 2, Lines Added: 43, Lines Deleted: 43; 2754 bytes
@@ -1647,49 +1647,6 @@
</listitem>
<listitem>
- <para id="option_cmake_extra_charsets">
- <indexterm>
- <primary>CMake</primary>
- <secondary>EXTRA_CHARSETS option</secondary>
- </indexterm>
-
- <indexterm>
- <primary>EXTRA_CHARSETS option</primary>
- <secondary>CMake</secondary>
- </indexterm>
-
- <literal>-DEXTRA_CHARSETS=<replaceable>name</replaceable></literal>
- </para>
-
- <para>
- Which extra character sets to include:
- </para>
-
- <itemizedlist>
-
- <listitem>
- <para>
- <literal>all</literal>: All character sets. This is the
- default.
- </para>
- </listitem>
-
- <listitem>
- <para>
- <literal>complex</literal>: Complex character sets.
- </para>
- </listitem>
-
- <listitem>
- <para>
- <literal>none</literal>: No extra character sets.
- </para>
- </listitem>
-
- </itemizedlist>
- </listitem>
-
- <listitem>
<para id="option_cmake_mysql_tcp_port">
<indexterm>
<primary>CMake</primary>
@@ -1771,6 +1728,49 @@
</listitem>
<listitem>
+ <para id="option_cmake_with_extra_charsets">
+ <indexterm>
+ <primary>CMake</primary>
+ <secondary>WITH_EXTRA_CHARSETS option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>WITH_EXTRA_CHARSETS option</primary>
+ <secondary>CMake</secondary>
+ </indexterm>
+
+ <literal>-DWITH_EXTRA_CHARSETS=<replaceable>name</replaceable></literal>
+ </para>
+
+ <para>
+ Which extra character sets to include:
+ </para>
+
+ <itemizedlist>
+
+ <listitem>
+ <para>
+ <literal>all</literal>: All character sets. This is the
+ default.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <literal>complex</literal>: Complex character sets.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <literal>none</literal>: No extra character sets.
+ </para>
+ </listitem>
+
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para id="option_cmake_with_libwrap">
<indexterm>
<primary>CMake</primary>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r24131 - in trunk: . dynamic-docs/build-configure refman-5.5 refman-5.6 | paul.dubois | 30 Nov |
