Author: paul
Date: 2010-11-30 18:31:05 +0100 (Tue, 30 Nov 2010)
New Revision: 24132
Log:
r66266@frost: paul | 2010-11-30 10:46:21 -0500
Add a couple more CMake options
Modified:
trunk/dynamic-docs/build-configure/cmake.xml
trunk/refman-5.5/installing-source-core.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: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
+ 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:66266
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 17:30:57 UTC (rev 24131)
+++ trunk/dynamic-docs/build-configure/cmake.xml 2010-11-30 17:31:05 UTC (rev 24132)
Changed blocks: 1, Lines Added: 32, Lines Deleted: 0; 1167 bytes
@@ -163,6 +163,38 @@
</buildoption>
+ <buildoption id="enabled_local_infile">
+
+ <xrefto id="option_cmake_enabled_local_infile"/>
+
+ <formatbase format="ENABLED_LOCAL_INFILE">
+ <description>Whether to enable LOAD DATA LOCAL INFILE</description>
+ </formatbase>
+
+ <versions>
+ <manual version="5.5"/>
+ <introduced version="5.5.7"/>
+ <manual version="5.6"/>
+ </versions>
+
+ </buildoption>
+
+ <buildoption id="enabled_profiling">
+
+ <xrefto id="option_cmake_enabled_profiling"/>
+
+ <formatbase format="ENABLED_PROFILING">
+ <description>Whether to enable query profiling code</description>
+ </formatbase>
+
+ <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"/>
Modified: trunk/refman-5.5/installing-source-core.xml
===================================================================
--- trunk/refman-5.5/installing-source-core.xml 2010-11-30 17:30:57 UTC (rev 24131)
+++ trunk/refman-5.5/installing-source-core.xml 2010-11-30 17:31:05 UTC (rev 24132)
Changed blocks: 1, Lines Added: 44, Lines Deleted: 0; 1754 bytes
@@ -1647,6 +1647,50 @@
</listitem>
<listitem>
+ <para id="option_cmake_enabled_local_infile">
+ <indexterm>
+ <primary>CMake</primary>
+ <secondary>ENABLED_LOCAL_INFILE option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>ENABLED_LOCAL_INFILE option</primary>
+ <secondary>CMake</secondary>
+ </indexterm>
+
+ <literal>-DENABLED_LOCAL_INFILE=<replaceable>bool</replaceable></literal>
+ </para>
+
+ <para>
+ Whether to enable
+ <literal role="stmt" condition="load-data">LOAD DATA LOCAL
+ INFILE</literal>.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para id="option_cmake_enabled_profiling">
+ <indexterm>
+ <primary>CMake</primary>
+ <secondary>ENABLED_PROFILING option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>ENABLED_PROFILING option</primary>
+ <secondary>CMake</secondary>
+ </indexterm>
+
+ <literal>-DENABLED_PROFILING=<replaceable>bool</replaceable></literal>
+ </para>
+
+ <para>
+ Whether to enable query profiling code
+ (<literal role="stmt">SHOW PROFILE</literal>,
+ <literal role="stmt">SHOW PROFILES</literal>).
+ </para>
+ </listitem>
+
+ <listitem>
<para id="option_cmake_mysql_tcp_port">
<indexterm>
<primary>CMake</primary>
Modified: trunk/refman-5.6/installing-source-core.xml
===================================================================
--- trunk/refman-5.6/installing-source-core.xml 2010-11-30 17:30:57 UTC (rev 24131)
+++ trunk/refman-5.6/installing-source-core.xml 2010-11-30 17:31:05 UTC (rev 24132)
Changed blocks: 1, Lines Added: 44, Lines Deleted: 0; 1754 bytes
@@ -1647,6 +1647,50 @@
</listitem>
<listitem>
+ <para id="option_cmake_enabled_local_infile">
+ <indexterm>
+ <primary>CMake</primary>
+ <secondary>ENABLED_LOCAL_INFILE option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>ENABLED_LOCAL_INFILE option</primary>
+ <secondary>CMake</secondary>
+ </indexterm>
+
+ <literal>-DENABLED_LOCAL_INFILE=<replaceable>bool</replaceable></literal>
+ </para>
+
+ <para>
+ Whether to enable
+ <literal role="stmt" condition="load-data">LOAD DATA LOCAL
+ INFILE</literal>.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para id="option_cmake_enabled_profiling">
+ <indexterm>
+ <primary>CMake</primary>
+ <secondary>ENABLED_PROFILING option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>ENABLED_PROFILING option</primary>
+ <secondary>CMake</secondary>
+ </indexterm>
+
+ <literal>-DENABLED_PROFILING=<replaceable>bool</replaceable></literal>
+ </para>
+
+ <para>
+ Whether to enable query profiling code
+ (<literal role="stmt">SHOW PROFILE</literal>,
+ <literal role="stmt">SHOW PROFILES</literal>).
+ </para>
+ </listitem>
+
+ <listitem>
<para id="option_cmake_mysql_tcp_port">
<indexterm>
<primary>CMake</primary>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r24132 - in trunk: . dynamic-docs/build-configure refman-5.5 refman-5.6 | paul.dubois | 30 Nov |
