List:Commits« Previous MessageNext Message »
From:paul.dubois Date:November 30 2010 4:49am
Subject:svn commit - mysqldoc@docsrva: r24118 - in trunk: . dynamic-docs/build-configure dynamic-docs/changelog refman-5.0 refman-5.1 refman-5.5 refman-5.6 re...
View as plain text  
Author: paul
Date: 2010-11-30 05:49:31 +0100 (Tue, 30 Nov 2010)
New Revision: 24118

Log:
 r66240@frost:  paul | 2010-11-29 22:43:41 -0500
 5.5/5.6: Convert autotools constructs to CMake constructs


Modified:
   trunk/dynamic-docs/build-configure/cmake.xml
   trunk/dynamic-docs/changelog/mysqld-1.xml
   trunk/refman-5.0/programs-installation.xml
   trunk/refman-5.1/programs-installation.xml
   trunk/refman-5.5/dba-mysqld-server-core.xml
   trunk/refman-5.5/extending-mysql.xml
   trunk/refman-5.5/installing-general.xml
   trunk/refman-5.5/installing-postinstall.xml
   trunk/refman-5.5/installing-source-core.xml
   trunk/refman-5.5/partitioning.xml
   trunk/refman-5.5/programs-installation.xml
   trunk/refman-5.5/se-archive-core.xml
   trunk/refman-5.5/se-blackhole.xml
   trunk/refman-5.5/se-csv.xml
   trunk/refman-5.5/se-example.xml
   trunk/refman-5.5/se-federated.xml
   trunk/refman-5.6/dba-mysqld-server-core.xml
   trunk/refman-5.6/extending-mysql.xml
   trunk/refman-5.6/installing-general.xml
   trunk/refman-5.6/installing-postinstall.xml
   trunk/refman-5.6/installing-source-core.xml
   trunk/refman-5.6/partitioning.xml
   trunk/refman-5.6/programs-installation.xml
   trunk/refman-5.6/se-archive-core.xml
   trunk/refman-5.6/se-blackhole.xml
   trunk/refman-5.6/se-csv.xml
   trunk/refman-5.6/se-example.xml
   trunk/refman-5.6/se-federated.xml
   trunk/refman-6.0/programs-installation.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:44841
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:66229
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:44841
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:66240
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 04:46:00 UTC (rev 24117)
+++ trunk/dynamic-docs/build-configure/cmake.xml	2010-11-30 04:49:31 UTC (rev 24118)
Changed blocks: 3, Lines Added: 55, Lines Deleted: 0; 1941 bytes

@@ -265,6 +265,29 @@
 
   </buildoption>
 
+  <buildoption id="install_layout">
+
+    <xrefto id="option_cmake_install_layout"/>
+
+    <formatbase format="INSTALL_LAYOUT">
+      <description>Select predefined installation layout</description>
+    </formatbase>
+
+    <values>
+      <default>STANDALONE</default>
+      <choice>RPM</choice>
+      <choice>SVR4</choice>
+      <choice>DEB</choice>
+    </values>
+
+    <versions>
+      <manual version="5.5"/>
+      <introduced version="5.5.7"/>
+      <manual version="5.6"/>
+    </versions>
+
+  </buildoption>
+
   <buildoption id="install_libdir">
 
     <xrefto id="option_cmake_install_libdir"/>

@@ -529,6 +552,22 @@
 
   </buildoption>
 
+  <buildoption id="with_engine_storage_engine">
+
+    <xrefto id="option_cmake_storage_engine_options"/>
+
+    <formatbase format="WITH_xxx_STORAGE_ENGINE">
+      <description>Compile xxx storage engine statically into server</description>
+    </formatbase>
+
+    <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"/>

@@ -615,6 +654,22 @@
 
   </buildoption>
 
+  <buildoption id="without_engine_storage_engine">
+
+    <xrefto id="option_cmake_storage_engine_options"/>
+
+    <formatbase format="WITHOUT_xxx_STORAGE_ENGINE">
+      <description>Exclude xxx storage engine from build</description>
+    </formatbase>
+
+    <versions>
+      <manual version="5.5"/>
+      <introduced version="5.5.7"/>
+      <manual version="5.6"/>
+    </versions>
+
+  </buildoption>
+
 <!--
   buildoption id="build">
   <buildoption id="cache-file">


Modified: trunk/dynamic-docs/changelog/mysqld-1.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld-1.xml	2010-11-30 04:46:00 UTC (rev 24117)
+++ trunk/dynamic-docs/changelog/mysqld-1.xml	2010-11-30 04:49:31 UTC (rev 24118)
Changed blocks: 4, Lines Added: 7, Lines Deleted: 9; 1919 bytes

@@ -48903,8 +48903,7 @@
 
       <para>
         The server was built even when <command>configure</command> was
-        run with the <option role="configure">--without-server</option>
-        option.
+        run with the <option>--without-server</option> option.
       </para>
 
     </message>

@@ -52255,8 +52254,8 @@
         The server now supports a Debug Sync facility for thread
         synchronization during testing and debugging. To compile in this
         facility, configure MySQL with the
-        <option role="configure">--enable-debug-sync</option> option.
-        The <literal role="sysvar">debug_sync</literal> system variable
+        <option>--enable-debug-sync</option> option. The
+        <literal role="sysvar">debug_sync</literal> system variable
         provides the user interface Debug Sync.
         <command>mysqld</command> and
         <command>mysql-test-run.pl</command> support a

@@ -77174,7 +77173,7 @@
 
       <para>
         The <command>configure</command> option
-        <option role="configure">--without-server</option> did not work.
+        <option>--without-server</option> did not work.
       </para>
 
     </message>

@@ -77906,10 +77905,9 @@
     <message>
 
       <para>
-        A build configured using the
-        <option role="configure">--without-server</option> option did
-        not compile the yaSSL code, so if <option>--with-ssl</option>
-        was also used, the build failed.
+        A build configured using the <option>--without-server</option>
+        option did not compile the yaSSL code, so if
+        <option>--with-ssl</option> was also used, the build failed.
       </para>
 
     </message>


Modified: trunk/refman-5.0/programs-installation.xml
===================================================================
--- trunk/refman-5.0/programs-installation.xml	2010-11-30 04:46:00 UTC (rev 24117)
+++ trunk/refman-5.0/programs-installation.xml	2010-11-30 04:49:31 UTC (rev 24118)
Changed blocks: 1, Lines Added: 9, Lines Deleted: 9; 1648 bytes

@@ -1064,16 +1064,16 @@
         <command>mysql_install_db</command> needs to invoke
         <command>mysqld</command> with the
         <option role="mysqld">--bootstrap</option> and
-        <option role="mysqld">--skip-grant-tables</option> options (see
-        <xref linkend="source-configuration-options"/>). If MySQL was
-        configured with the
-        <option role="configure">--disable-grant-options</option>
-        option, <option role="mysqld">--bootstrap</option> and
+        <option role="mysqld">--skip-grant-tables</option> options. If
+        MySQL was configured with the
+        <option role="cmake">DISABLE_GRANT_OPTIONS</option> compiler
+        flag, <option role="mysqld">--bootstrap</option> and
         <option role="mysqld">--skip-grant-tables</option> will be
-        disabled. To handle this, set the
-        <literal>MYSQLD_BOOTSTRAP</literal> environment variable to the
-        full path name of a server that has all options enabled.
-        <command>mysql_install_db</command> will use that server.
+        disabled (see <xref linkend="source-configuration-options"/>).
+        To handle this, set the <literal>MYSQLD_BOOTSTRAP</literal>
+        environment variable to the full path name of a server that has
+        all options enabled. <command>mysql_install_db</command> will
+        use that server.
       </para>
 
       <para>


Modified: trunk/refman-5.1/programs-installation.xml
===================================================================
--- trunk/refman-5.1/programs-installation.xml	2010-11-30 04:46:00 UTC (rev 24117)
+++ trunk/refman-5.1/programs-installation.xml	2010-11-30 04:49:31 UTC (rev 24118)
Changed blocks: 1, Lines Added: 7, Lines Deleted: 7; 1516 bytes

@@ -851,16 +851,16 @@
         <command>mysql_install_db</command> needs to invoke
         <command>mysqld</command> with the
         <option role="mysqld">--bootstrap</option> and
-        <option role="mysqld">--skip-grant-tables</option> options (see
-        <xref linkend="source-configuration-options"/>). If MySQL was
-        configured with the
+        <option role="mysqld">--skip-grant-tables</option> options. If
+        MySQL was configured with the
         <option role="configure">--disable-grant-options</option>
         option, <option role="mysqld">--bootstrap</option> and
         <option role="mysqld">--skip-grant-tables</option> will be
-        disabled. To handle this, set the
-        <literal>MYSQLD_BOOTSTRAP</literal> environment variable to the
-        full path name of a server that has all options enabled.
-        <command>mysql_install_db</command> will use that server.
+        disabled (see <xref linkend="source-configuration-options"/>).
+        To handle this, set the <literal>MYSQLD_BOOTSTRAP</literal>
+        environment variable to the full path name of a server that has
+        all options enabled. <command>mysql_install_db</command> will
+        use that server.
       </para>
 
       <note>


Modified: trunk/refman-5.5/dba-mysqld-server-core.xml
===================================================================
--- trunk/refman-5.5/dba-mysqld-server-core.xml	2010-11-30 04:46:00 UTC (rev 24117)
+++ trunk/refman-5.5/dba-mysqld-server-core.xml	2010-11-30 04:49:31 UTC (rev 24118)
Changed blocks: 4, Lines Added: 8, Lines Deleted: 8; 2069 bytes

@@ -457,8 +457,8 @@
 
         <para>
           This option is unavailable if MySQL was configured with the
-          <option role="configure">--disable-grant-options</option>
-          option. See <xref linkend="source-configuration-options"/>.
+          <option role="cmake">DISABLE_GRANT_OPTIONS</option> compiler
+          flag. See <xref linkend="source-configuration-options"/>.
         </para>
       </listitem>
 

@@ -1227,8 +1227,8 @@
 
         <para>
           This option is unavailable if MySQL was configured with the
-          <option role="configure">--disable-grant-options</option>
-          option. See <xref linkend="source-configuration-options"/>.
+          <option role="cmake">DISABLE_GRANT_OPTIONS</option> compiler
+          flag. See <xref linkend="source-configuration-options"/>.
         </para>
       </listitem>
 

@@ -2725,8 +2725,8 @@
         <para>
           <option role="mysqld">--skip-grant-tables</option> is
           unavailable if MySQL was configured with the
-          <option role="configure">--disable-grant-options</option>
-          option. See <xref linkend="source-configuration-options"/>.
+          <option role="cmake">DISABLE_GRANT_OPTIONS</option> compiler
+          flag. See <xref linkend="source-configuration-options"/>.
         </para>
       </listitem>
 

@@ -5923,8 +5923,8 @@
         <para>
           Note that the <option role="mysqld">--init-file</option>
           option is unavailable if MySQL was configured with the
-          <option role="configure">--disable-grant-options</option>
-          option. See <xref linkend="source-configuration-options"/>.
+          <option role="cmake">DISABLE_GRANT_OPTIONS</option> compiler
+          flag. See <xref linkend="source-configuration-options"/>.
         </para>
       </listitem>
 


Modified: trunk/refman-5.5/extending-mysql.xml
===================================================================
--- trunk/refman-5.5/extending-mysql.xml	2010-11-30 04:46:00 UTC (rev 24117)
+++ trunk/refman-5.5/extending-mysql.xml	2010-11-30 04:49:31 UTC (rev 24118)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 32; 1756 bytes

@@ -6386,12 +6386,8 @@
     </para>
 
     <para>
-      Both the server and the client need a working C++ compiler. We use
-      <command>gcc</command> on many platforms. Other compilers that are
-      known to work are Sun Studio, HP-UX <command>aCC</command>, IBM
-      AIX <command>xlC_r</command>), Intel <command>ecc/icc</command>.
-      With previous versions on the respective platforms, we also used
-      Irix <literal>cc</literal> and Compaq <literal>cxx</literal>.
+      To build MySQL from source, your system must satisfy the the tool
+      requirements listed at <xref linkend="source-installation"/>.
     </para>
 
     <indexterm>

@@ -6415,32 +6411,6 @@
     </important>
 
     <para>
-      If you want or need to change any <filename>Makefile</filename> or
-      the <command>configure</command> script, you also need GNU
-      Automake and Autoconf. See
-      <xref linkend="installing-development-tree"/>.
-    </para>
-
-    <para>
-      All steps needed to remake everything from the most basic files.
-    </para>
-
-<programlisting>
-/bin/rm */.deps/*.P
-/bin/rm -f config.cache
-aclocal
-autoheader
-aclocal
-automake
-autoconf
-./configure --with-debug --prefix='your installation directory'
-
-# The makefiles generated above need GNU make 3.75 or newer.
-# (called gmake below)
-gmake clean all install init-db
-</programlisting>
-
-    <para>
       If you run into problems with a new port, you may have to do some
       debugging of MySQL! See <xref linkend="debugging-server"/>.
     </para>


Modified: trunk/refman-5.5/installing-general.xml
===================================================================
--- trunk/refman-5.5/installing-general.xml	2010-11-30 04:46:00 UTC (rev 24117)
+++ trunk/refman-5.5/installing-general.xml	2010-11-30 04:49:31 UTC (rev 24118)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 5; 944 bytes

@@ -62,11 +62,11 @@
     </important>
 
     <para>
-      We use GNU Autoconf, so it is possible to port MySQL to all modern
-      systems that have a C++ compiler and a working implementation of
-      POSIX threads. (Thread support is needed for the server. To
-      compile only the client code, the only requirement is a C++
-      compiler.)
+      We use <command>CMake</command>, so it is possible to port MySQL
+      to all modern systems that have a C++ compiler and a working
+      implementation of POSIX threads. (Thread support is needed for the
+      server. To compile only the client code, the only requirement is a
+      C++ compiler.)
     </para>
 
     <para>


Modified: trunk/refman-5.5/installing-postinstall.xml
===================================================================
--- trunk/refman-5.5/installing-postinstall.xml	2010-11-30 04:46:00 UTC (rev 24117)
+++ trunk/refman-5.5/installing-postinstall.xml	2010-11-30 04:49:31 UTC (rev 24118)
Changed blocks: 6, Lines Added: 8, Lines Deleted: 19; 2639 bytes

@@ -177,6 +177,10 @@
           not run the program for you.
         </para>
 
+<programlisting>
+shell&gt; <userinput>scripts/mysql_install_db --user=mysql</userinput>
+</programlisting>
+
         <para>
           Typically, <command>mysql_install_db</command> needs to be run
           only the first time you install MySQL, so you can skip this

@@ -187,21 +191,6 @@
         </para>
 
         <para>
-          The exact location of <command>mysql_install_db</command> will
-          depend on the layout for your given installation. To
-          initialize the grant tables, use one of the following
-          commands, depending on whether
-          <command>mysql_install_db</command> is located in the
-          <literal>bin</literal> or <literal>scripts</literal>
-          directory:
-        </para>
-
-<programlisting>
-shell&gt; <userinput>bin/mysql_install_db --user=mysql</userinput>
-shell&gt; <userinput>scripts/mysql_install_db --user=mysql</userinput>
-</programlisting>
-
-        <para>
           It might be necessary to specify other options such as
           <option role="mysql_install_db">--basedir</option> or
           <option role="mysql_install_db">--datadir</option> if

@@ -211,7 +200,7 @@
         </para>
 
 <programlisting>
-shell&gt; <userinput>bin/mysql_install_db --user=mysql \</userinput>
+shell&gt; <userinput>scripts/mysql_install_db --user=mysql \</userinput>
          <userinput>--basedir=/opt/mysql/mysql \</userinput>
          <userinput>--datadir=/opt/mysql/mysql/data</userinput>
 </programlisting>

@@ -590,7 +579,7 @@
 
 <programlisting>
 shell&gt; <userinput>mv data/mysql data/mysql.old</userinput>
-shell&gt; <userinput>bin/mysql_install_db --user=mysql</userinput>
+shell&gt; <userinput>scripts/mysql_install_db --user=mysql</userinput>
 </programlisting>
 
       <para>

@@ -744,7 +733,7 @@
           </para>
 
 <programlisting>
-shell&gt; <userinput>bin/mysql_install_db --user=mysql</userinput>
+shell&gt; <userinput>scripts/mysql_install_db --user=mysql</userinput>
 shell&gt; <userinput>bin/mysqld_safe --user=mysql &amp;</userinput>
 </programlisting>
 

@@ -808,7 +797,7 @@
           </para>
 
 <programlisting>
-shell&gt; <userinput>bin/mysql_install_db --user=mysql</userinput>
+shell&gt; <userinput>scripts/mysql_install_db --user=mysql</userinput>
 shell&gt; <userinput>bin/mysql -u root &lt; your_script_file</userinput>
 </programlisting>
 


Modified: trunk/refman-5.5/installing-source-core.xml
===================================================================
--- trunk/refman-5.5/installing-source-core.xml	2010-11-30 04:46:00 UTC (rev 24117)
+++ trunk/refman-5.5/installing-source-core.xml	2010-11-30 04:49:31 UTC (rev 24118)
Changed blocks: 3, Lines Added: 139, Lines Deleted: 3; 5034 bytes

@@ -1185,6 +1185,56 @@
       </listitem>
 
       <listitem>
+        <para id="option_cmake_install_layout">
+          <indexterm>
+            <primary>CMake</primary>
+            <secondary>INSTALL_LAYOUT option</secondary>
+          </indexterm>
+
+          <indexterm>
+            <primary>INSTALL_LAYOUT option</primary>
+            <secondary>CMake</secondary>
+          </indexterm>
+
+          <literal>-DINSTALL_LAYOUT=<replaceable>name</replaceable></literal>
+        </para>
+
+        <para>
+          Select a predefined installation layout:
+        </para>
+
+        <itemizedlist>
+
+          <listitem>
+            <para>
+              <literal>STANDALONE</literal>: Same layout as used for
+              <filename>.tar.gz</filename>/<filename>.zip</filename>
+              packages. This is the default.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <literal>RPM</literal>: Layout similar to RPM packages.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <literal>SVR4</literal>: Solaris package layout.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <literal>DEB</literal>: DEB package layout (experimental).
+            </para>
+          </listitem>
+
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
         <para id="option_cmake_install_libdir">
           <indexterm>
             <primary>CMake</primary>

@@ -1429,12 +1479,60 @@
 
     </itemizedlist>
 
-<!--
-    <bridgehead>
+    <bridgehead id="option_cmake_storage_engine_options">
       Storage Engine Options
     </bridgehead>
--->
 
+    <para>
+      The <literal role="se">MyISAM</literal>,
+      <literal role="se">MERGE</literal>,
+      <literal role="se">MEMORY</literal>, and
+      <literal role="se">CSV</literal> engines are mandatory (always
+      compiled into the server) and need not be installed explicitly..
+    </para>
+
+    <para>
+      To compile a storage engine statically into the server, use
+      <literal>-DWITH_<replaceable>engine</replaceable>_STORAGE_ENGINE=1</literal>.
+      Some allowable <replaceable>engine</replaceable> values are
+      <literal>ARCHIVE</literal>, <literal>BLACKHOLE</literal>,
+      <literal>EXAMPLE</literal>, <literal>FEDERATED</literal>,
+      <literal>INNOBASE</literal> (<literal role="se">InnoDB</literal>),
+      <literal>PARTITION</literal> (partitioning support), and
+      <literal>PERFSCHEMA</literal> (Performance Schema). Examples:
+    </para>
+
+<programlisting>
+-DWITH_INNOBASE_STORAGE_ENGINE=1
+-DWITH_ARCHIVE_STORAGE_ENGINE=1
+-DWITH_BLACKHOLE_STORAGE_ENGINE=1
+</programlisting>
+
+    <para>
+      To exclude a storage engine from the build, use
+      <literal>-DWITHOUT_<replaceable>engine</replaceable>_STORAGE_ENGINE=1</literal>.
+      Examples:
+    </para>
+
+<programlisting>
+-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1
+-DWITHOUT_FEDERATED_STORAGE_ENGINE=1
+-DWITHOUT_PARTITION_STORAGE_ENGINE=1
+</programlisting>
+
+    <para>
+      If neither
+      <literal>-DWITH_<replaceable>engine</replaceable>_STORAGE_ENGINE</literal>
+      nor
+      <literal>-DWITHOUT_<replaceable>engine</replaceable>_STORAGE_ENGINE</literal>
+      are specified for a given storage engine, the engine is built as a
+      shared module, or excluded if it cannot be built as a shared
+      module. A shared module must be installed using the
+      <literal role="stmt">INSTALL PLUGIN</literal> statement or the
+      <option role="mysqld">--plugin-load</option> option before it can
+      be used.
+    </para>
+
     <bridgehead>
       Feature Options
     </bridgehead>

@@ -1804,6 +1902,44 @@
 
     </itemizedlist>
 
+    <bridgehead>
+      Compiler Flags
+    </bridgehead>
+
+    <para>
+      To set compiler flags, set the <literal>CFLAGS</literal> and
+      <literal>CXXFLAGS</literal> environment variables. Here are some
+      examples:
+    </para>
+
+    <itemizedlist>
+
+      <listitem>
+        <para id="option_cmake_disable_grant_options">
+          <indexterm>
+            <primary>CMake</primary>
+            <secondary>DISABLE_GRANT_OPTIONS option</secondary>
+          </indexterm>
+
+          <indexterm>
+            <primary>DISABLE_GRANT_OPTIONS option</primary>
+            <secondary>CMake</secondary>
+          </indexterm>
+
+          <literal>CXXFLAGS=-DDISABLE_GRANT_OPTIONS</literal>
+        </para>
+
+        <para>
+          This flag causes the
+          <option role="mysqld">--bootstrap</option>,
+          <option role="mysqld">--skip-grant-tables</option>, and
+          <option role="mysqld">--init-file</option> options for
+          <command>mysqld</command> to be disabled.
+        </para>
+      </listitem>
+
+    </itemizedlist>
+
   </section>
 
   <section id="compilation-problems">


Modified: trunk/refman-5.5/partitioning.xml
===================================================================
--- trunk/refman-5.5/partitioning.xml	2010-11-30 04:46:00 UTC (rev 24117)
+++ trunk/refman-5.5/partitioning.xml	2010-11-30 04:49:31 UTC (rev 24118)
Changed blocks: 2, Lines Added: 11, Lines Deleted: 10; 2042 bytes

@@ -90,10 +90,11 @@
   </para>
 
   <para>
-    If you are compiling MySQL &current-series; from source, the build
-    must be configured using <option>--with-partition</option> to enable
-    partitioning. Using <option>--with-plugins=max</option> to configure
-    the build includes this option automatically.
+    To enable partitioning if you are compiling MySQL &current-series;
+    from source, the build must be configured with the
+    <option role="cmake" condition="storage_engine_options">-DWITH_PARTITION_STORAGE_ENGINE</option>
+    option. For more information about building MySQL, see
+    <xref linkend="source-installation"/>.
   </para>
 
   <para>

@@ -222,12 +223,12 @@
     <ulink url="&base-url-downloads;mysql/&current-series;.html"/>.
     However, for the latest partitioning bugfixes and feature additions,
     you can obtain the source from our Bazaar repository. To enable
-    partitioning, you need to compile the server using the
-    <option>--with-partition</option> option. For more information about
-    building MySQL, see <xref linkend="source-installation"/>. If you
-    have problems compiling a partitioning-enabled MySQL
-    &current-series; build, check the
-    <ulink url="&base-url-forum-list;?106">MySQL Partitioning
+    partitioning, the build must be configured with the
+    <option role="cmake" condition="storage_engine_options">-DWITH_PARTITION_STORAGE_ENGINE</option>
+    option. For more information about building MySQL, see
+    <xref linkend="source-installation"/>. If you have problems
+    compiling a partitioning-enabled MySQL &current-series; build, check
+    the <ulink url="&base-url-forum-list;?106">MySQL Partitioning
     Forum</ulink> and ask for assistance there if you do not find a
     solution to your problem already posted.
   </para>


Modified: trunk/refman-5.5/programs-installation.xml
===================================================================
--- trunk/refman-5.5/programs-installation.xml	2010-11-30 04:46:00 UTC (rev 24117)
+++ trunk/refman-5.5/programs-installation.xml	2010-11-30 04:49:31 UTC (rev 24118)
Changed blocks: 2, Lines Added: 10, Lines Deleted: 10; 1982 bytes

@@ -689,7 +689,7 @@
       </para>
 
 <programlisting>
-shell&gt; <userinput>bin/mysql_install_db --user=mysql \</userinput>
+shell&gt; <userinput>scripts/mysql_install_db --user=mysql \</userinput>
          <userinput>--basedir=/opt/mysql/mysql \</userinput>
          <userinput>--datadir=/opt/mysql/mysql/data</userinput>
 </programlisting>

@@ -698,16 +698,16 @@
         <command>mysql_install_db</command> needs to invoke
         <command>mysqld</command> with the
         <option role="mysqld">--bootstrap</option> and
-        <option role="mysqld">--skip-grant-tables</option> options (see
-        <xref linkend="source-configuration-options"/>). If MySQL was
-        configured with the
-        <option role="configure">--disable-grant-options</option>
-        option, <option role="mysqld">--bootstrap</option> and
+        <option role="mysqld">--skip-grant-tables</option> options. If
+        MySQL was configured with the
+        <option role="cmake">DISABLE_GRANT_OPTIONS</option> compiler
+        flag, <option role="mysqld">--bootstrap</option> and
         <option role="mysqld">--skip-grant-tables</option> will be
-        disabled. To handle this, set the
-        <literal>MYSQLD_BOOTSTRAP</literal> environment variable to the
-        full path name of a server that has all options enabled.
-        <command>mysql_install_db</command> will use that server.
+        disabled (see <xref linkend="source-configuration-options"/>).
+        To handle this, set the <literal>MYSQLD_BOOTSTRAP</literal>
+        environment variable to the full path name of a server that has
+        all options enabled. <command>mysql_install_db</command> will
+        use that server.
       </para>
 
       <note>


Modified: trunk/refman-5.5/se-archive-core.xml
===================================================================
--- trunk/refman-5.5/se-archive-core.xml	2010-11-30 04:46:00 UTC (rev 24117)
+++ trunk/refman-5.5/se-archive-core.xml	2010-11-30 04:49:31 UTC (rev 24118)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 2; 753 bytes

@@ -31,8 +31,9 @@
   <para>
     The <literal>ARCHIVE</literal> storage engine is included in MySQL
     binary distributions. To enable this storage engine if you build
-    MySQL from source, invoke <command>configure</command> with the
-    <option>--with-archive-storage-engine</option> option.
+    MySQL from source, invoke <command>CMake</command> with the
+    <option role="cmake" condition="storage_engine_options">-DWITH_ARCHIVE_STORAGE_ENGINE</option>
+    option.
   </para>
 
   <para>


Modified: trunk/refman-5.5/se-blackhole.xml
===================================================================
--- trunk/refman-5.5/se-blackhole.xml	2010-11-30 04:46:00 UTC (rev 24117)
+++ trunk/refman-5.5/se-blackhole.xml	2010-11-30 04:49:31 UTC (rev 24118)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 2; 690 bytes

@@ -36,8 +36,9 @@
 
   <para>
     To enable the <literal>BLACKHOLE</literal> storage engine if you
-    build MySQL from source, invoke <command>configure</command> with
-    the <option>--with-blackhole-storage-engine</option> option.
+    build MySQL from source, invoke <command>CMake</command> with the
+    <option role="cmake" condition="storage_engine_options">-DWITH_BLACKHOLE_STORAGE_ENGINE</option>
+    option.
   </para>
 
   <para>


Modified: trunk/refman-5.5/se-csv.xml
===================================================================
--- trunk/refman-5.5/se-csv.xml	2010-11-30 04:46:00 UTC (rev 24117)
+++ trunk/refman-5.5/se-csv.xml	2010-11-30 04:49:31 UTC (rev 24118)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 3; 579 bytes

@@ -22,9 +22,8 @@
   </para>
 
   <para>
-    To enable the <literal>CSV</literal> storage engine if you build
-    MySQL from source, invoke <command>configure</command> with the
-    <option>--with-csv-storage-engine</option> option.
+    The <literal>CSV</literal> storage engine is always compiled into
+    the MySQL server.
   </para>
 
   <para>


Modified: trunk/refman-5.5/se-example.xml
===================================================================
--- trunk/refman-5.5/se-example.xml	2010-11-30 04:46:00 UTC (rev 24117)
+++ trunk/refman-5.5/se-example.xml	2010-11-30 04:49:31 UTC (rev 24118)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 2; 672 bytes

@@ -25,8 +25,9 @@
 
   <para>
     To enable the <literal>EXAMPLE</literal> storage engine if you build
-    MySQL from source, invoke <command>configure</command> with the
-    <option>--with-example-storage-engine</option> option.
+    MySQL from source, invoke <command>CMake</command> with the
+    <option role="cmake" condition="storage_engine_options">-DWITH_EXAMPLE_STORAGE_ENGINE</option>
+    option.
   </para>
 
   <para>


Modified: trunk/refman-5.5/se-federated.xml
===================================================================
--- trunk/refman-5.5/se-federated.xml	2010-11-30 04:46:00 UTC (rev 24117)
+++ trunk/refman-5.5/se-federated.xml	2010-11-30 04:49:31 UTC (rev 24118)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 2; 692 bytes

@@ -27,8 +27,10 @@
 
   <para>
     To include the <literal>FEDERATED</literal> storage engine if you
-    build MySQL from source, invoke <command>configure</command> with
-    the <option>--with-federated-storage-engine</option> option.
+    build MySQL from source, invoke <command>CMake</command> with the
+    <option role="cmake"
+condition="storage_engine_options">-DWITH_FEDERATED_STORAGE_ENGINE</option>
+    option.
   </para>
 
   <para>


Modified: trunk/refman-5.6/dba-mysqld-server-core.xml
===================================================================
--- trunk/refman-5.6/dba-mysqld-server-core.xml	2010-11-30 04:46:00 UTC (rev 24117)
+++ trunk/refman-5.6/dba-mysqld-server-core.xml	2010-11-30 04:49:31 UTC (rev 24118)
Changed blocks: 4, Lines Added: 8, Lines Deleted: 8; 2069 bytes

@@ -455,8 +455,8 @@
 
         <para>
           This option is unavailable if MySQL was configured with the
-          <option role="configure">--disable-grant-options</option>
-          option. See <xref linkend="source-configuration-options"/>.
+          <option role="cmake">DISABLE_GRANT_OPTIONS</option> compiler
+          flag. See <xref linkend="source-configuration-options"/>.
         </para>
       </listitem>
 

@@ -1148,8 +1148,8 @@
 
         <para>
           This option is unavailable if MySQL was configured with the
-          <option role="configure">--disable-grant-options</option>
-          option. See <xref linkend="source-configuration-options"/>.
+          <option role="cmake">DISABLE_GRANT_OPTIONS</option> compiler
+          flag. See <xref linkend="source-configuration-options"/>.
         </para>
       </listitem>
 

@@ -2546,8 +2546,8 @@
         <para>
           <option role="mysqld">--skip-grant-tables</option> is
           unavailable if MySQL was configured with the
-          <option role="configure">--disable-grant-options</option>
-          option. See <xref linkend="source-configuration-options"/>.
+          <option role="cmake">DISABLE_GRANT_OPTIONS</option> compiler
+          flag. See <xref linkend="source-configuration-options"/>.
         </para>
       </listitem>
 

@@ -5706,8 +5706,8 @@
         <para>
           Note that the <option role="mysqld">--init-file</option>
           option is unavailable if MySQL was configured with the
-          <option role="configure">--disable-grant-options</option>
-          option. See <xref linkend="source-configuration-options"/>.
+          <option role="cmake">DISABLE_GRANT_OPTIONS</option> compiler
+          flag. See <xref linkend="source-configuration-options"/>.
         </para>
       </listitem>
 


Modified: trunk/refman-5.6/extending-mysql.xml
===================================================================
--- trunk/refman-5.6/extending-mysql.xml	2010-11-30 04:46:00 UTC (rev 24117)
+++ trunk/refman-5.6/extending-mysql.xml	2010-11-30 04:49:31 UTC (rev 24118)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 32; 1756 bytes

@@ -6363,12 +6363,8 @@
     </para>
 
     <para>
-      Both the server and the client need a working C++ compiler. We use
-      <command>gcc</command> on many platforms. Other compilers that are
-      known to work are Sun Studio, HP-UX <command>aCC</command>, IBM
-      AIX <command>xlC_r</command>), Intel <command>ecc/icc</command>.
-      With previous versions on the respective platforms, we also used
-      Irix <literal>cc</literal> and Compaq <literal>cxx</literal>.
+      To build MySQL from source, your system must satisfy the the tool
+      requirements listed at <xref linkend="source-installation"/>.
     </para>
 
     <indexterm>

@@ -6392,32 +6388,6 @@
     </important>
 
     <para>
-      If you want or need to change any <filename>Makefile</filename> or
-      the <command>configure</command> script, you also need GNU
-      Automake and Autoconf. See
-      <xref linkend="installing-development-tree"/>.
-    </para>
-
-    <para>
-      All steps needed to remake everything from the most basic files.
-    </para>
-
-<programlisting>
-/bin/rm */.deps/*.P
-/bin/rm -f config.cache
-aclocal
-autoheader
-aclocal
-automake
-autoconf
-./configure --with-debug --prefix='your installation directory'
-
-# The makefiles generated above need GNU make 3.75 or newer.
-# (called gmake below)
-gmake clean all install init-db
-</programlisting>
-
-    <para>
       If you run into problems with a new port, you may have to do some
       debugging of MySQL! See <xref linkend="debugging-server"/>.
     </para>


Modified: trunk/refman-5.6/installing-general.xml
===================================================================
--- trunk/refman-5.6/installing-general.xml	2010-11-30 04:46:00 UTC (rev 24117)
+++ trunk/refman-5.6/installing-general.xml	2010-11-30 04:49:31 UTC (rev 24118)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 5; 944 bytes

@@ -62,11 +62,11 @@
     </important>
 
     <para>
-      We use GNU Autoconf, so it is possible to port MySQL to all modern
-      systems that have a C++ compiler and a working implementation of
-      POSIX threads. (Thread support is needed for the server. To
-      compile only the client code, the only requirement is a C++
-      compiler.)
+      We use <command>CMake</command>, so it is possible to port MySQL
+      to all modern systems that have a C++ compiler and a working
+      implementation of POSIX threads. (Thread support is needed for the
+      server. To compile only the client code, the only requirement is a
+      C++ compiler.)
     </para>
 
     <para>


Modified: trunk/refman-5.6/installing-postinstall.xml
===================================================================
--- trunk/refman-5.6/installing-postinstall.xml	2010-11-30 04:46:00 UTC (rev 24117)
+++ trunk/refman-5.6/installing-postinstall.xml	2010-11-30 04:49:31 UTC (rev 24118)
Changed blocks: 6, Lines Added: 8, Lines Deleted: 19; 2639 bytes

@@ -177,6 +177,10 @@
           not run the program for you.
         </para>
 
+<programlisting>
+shell&gt; <userinput>scripts/mysql_install_db --user=mysql</userinput>
+</programlisting>
+
         <para>
           Typically, <command>mysql_install_db</command> needs to be run
           only the first time you install MySQL, so you can skip this

@@ -187,21 +191,6 @@
         </para>
 
         <para>
-          The exact location of <command>mysql_install_db</command> will
-          depend on the layout for your given installation. To
-          initialize the grant tables, use one of the following
-          commands, depending on whether
-          <command>mysql_install_db</command> is located in the
-          <literal>bin</literal> or <literal>scripts</literal>
-          directory:
-        </para>
-
-<programlisting>
-shell&gt; <userinput>bin/mysql_install_db --user=mysql</userinput>
-shell&gt; <userinput>scripts/mysql_install_db --user=mysql</userinput>
-</programlisting>
-
-        <para>
           It might be necessary to specify other options such as
           <option role="mysql_install_db">--basedir</option> or
           <option role="mysql_install_db">--datadir</option> if

@@ -211,7 +200,7 @@
         </para>
 
 <programlisting>
-shell&gt; <userinput>bin/mysql_install_db --user=mysql \</userinput>
+shell&gt; <userinput>scripts/mysql_install_db --user=mysql \</userinput>
          <userinput>--basedir=/opt/mysql/mysql \</userinput>
          <userinput>--datadir=/opt/mysql/mysql/data</userinput>
 </programlisting>

@@ -590,7 +579,7 @@
 
 <programlisting>
 shell&gt; <userinput>mv data/mysql data/mysql.old</userinput>
-shell&gt; <userinput>bin/mysql_install_db --user=mysql</userinput>
+shell&gt; <userinput>scripts/mysql_install_db --user=mysql</userinput>
 </programlisting>
 
       <para>

@@ -744,7 +733,7 @@
           </para>
 
 <programlisting>
-shell&gt; <userinput>bin/mysql_install_db --user=mysql</userinput>
+shell&gt; <userinput>scripts/mysql_install_db --user=mysql</userinput>
 shell&gt; <userinput>bin/mysqld_safe --user=mysql &amp;</userinput>
 </programlisting>
 

@@ -808,7 +797,7 @@
           </para>
 
 <programlisting>
-shell&gt; <userinput>bin/mysql_install_db --user=mysql</userinput>
+shell&gt; <userinput>scripts/mysql_install_db --user=mysql</userinput>
 shell&gt; <userinput>bin/mysql -u root &lt; your_script_file</userinput>
 </programlisting>
 


Modified: trunk/refman-5.6/installing-source-core.xml
===================================================================
--- trunk/refman-5.6/installing-source-core.xml	2010-11-30 04:46:00 UTC (rev 24117)
+++ trunk/refman-5.6/installing-source-core.xml	2010-11-30 04:49:31 UTC (rev 24118)
Changed blocks: 3, Lines Added: 139, Lines Deleted: 3; 5034 bytes

@@ -1185,6 +1185,56 @@
       </listitem>
 
       <listitem>
+        <para id="option_cmake_install_layout">
+          <indexterm>
+            <primary>CMake</primary>
+            <secondary>INSTALL_LAYOUT option</secondary>
+          </indexterm>
+
+          <indexterm>
+            <primary>INSTALL_LAYOUT option</primary>
+            <secondary>CMake</secondary>
+          </indexterm>
+
+          <literal>-DINSTALL_LAYOUT=<replaceable>name</replaceable></literal>
+        </para>
+
+        <para>
+          Select a predefined installation layout:
+        </para>
+
+        <itemizedlist>
+
+          <listitem>
+            <para>
+              <literal>STANDALONE</literal>: Same layout as used for
+              <filename>.tar.gz</filename>/<filename>.zip</filename>
+              packages. This is the default.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <literal>RPM</literal>: Layout similar to RPM packages.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <literal>SVR4</literal>: Solaris package layout.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <literal>DEB</literal>: DEB package layout (experimental).
+            </para>
+          </listitem>
+
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
         <para id="option_cmake_install_libdir">
           <indexterm>
             <primary>CMake</primary>

@@ -1429,12 +1479,60 @@
 
     </itemizedlist>
 
-<!--
-    <bridgehead>
+    <bridgehead id="option_cmake_storage_engine_options">
       Storage Engine Options
     </bridgehead>
--->
 
+    <para>
+      The <literal role="se">MyISAM</literal>,
+      <literal role="se">MERGE</literal>,
+      <literal role="se">MEMORY</literal>, and
+      <literal role="se">CSV</literal> engines are mandatory (always
+      compiled into the server) and need not be installed explicitly..
+    </para>
+
+    <para>
+      To compile a storage engine statically into the server, use
+      <literal>-DWITH_<replaceable>engine</replaceable>_STORAGE_ENGINE=1</literal>.
+      Some allowable <replaceable>engine</replaceable> values are
+      <literal>ARCHIVE</literal>, <literal>BLACKHOLE</literal>,
+      <literal>EXAMPLE</literal>, <literal>FEDERATED</literal>,
+      <literal>INNOBASE</literal> (<literal role="se">InnoDB</literal>),
+      <literal>PARTITION</literal> (partitioning support), and
+      <literal>PERFSCHEMA</literal> (Performance Schema). Examples:
+    </para>
+
+<programlisting>
+-DWITH_INNOBASE_STORAGE_ENGINE=1
+-DWITH_ARCHIVE_STORAGE_ENGINE=1
+-DWITH_BLACKHOLE_STORAGE_ENGINE=1
+</programlisting>
+
+    <para>
+      To exclude a storage engine from the build, use
+      <literal>-DWITHOUT_<replaceable>engine</replaceable>_STORAGE_ENGINE=1</literal>.
+      Examples:
+    </para>
+
+<programlisting>
+-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1
+-DWITHOUT_FEDERATED_STORAGE_ENGINE=1
+-DWITHOUT_PARTITION_STORAGE_ENGINE=1
+</programlisting>
+
+    <para>
+      If neither
+      <literal>-DWITH_<replaceable>engine</replaceable>_STORAGE_ENGINE</literal>
+      nor
+      <literal>-DWITHOUT_<replaceable>engine</replaceable>_STORAGE_ENGINE</literal>
+      are specified for a given storage engine, the engine is built as a
+      shared module, or excluded if it cannot be built as a shared
+      module. A shared module must be installed using the
+      <literal role="stmt">INSTALL PLUGIN</literal> statement or the
+      <option role="mysqld">--plugin-load</option> option before it can
+      be used.
+    </para>
+
     <bridgehead>
       Feature Options
     </bridgehead>

@@ -1804,6 +1902,44 @@
 
     </itemizedlist>
 
+    <bridgehead>
+      Compiler Flags
+    </bridgehead>
+
+    <para>
+      To set compiler flags, set the <literal>CFLAGS</literal> and
+      <literal>CXXFLAGS</literal> environment variables. Here are some
+      examples:
+    </para>
+
+    <itemizedlist>
+
+      <listitem>
+        <para id="option_cmake_disable_grant_options">
+          <indexterm>
+            <primary>CMake</primary>
+            <secondary>DISABLE_GRANT_OPTIONS option</secondary>
+          </indexterm>
+
+          <indexterm>
+            <primary>DISABLE_GRANT_OPTIONS option</primary>
+            <secondary>CMake</secondary>
+          </indexterm>
+
+          <literal>CXXFLAGS=-DDISABLE_GRANT_OPTIONS</literal>
+        </para>
+
+        <para>
+          This flag causes the
+          <option role="mysqld">--bootstrap</option>,
+          <option role="mysqld">--skip-grant-tables</option>, and
+          <option role="mysqld">--init-file</option> options for
+          <command>mysqld</command> to be disabled.
+        </para>
+      </listitem>
+
+    </itemizedlist>
+
   </section>
 
   <section id="compilation-problems">


Modified: trunk/refman-5.6/partitioning.xml
===================================================================
--- trunk/refman-5.6/partitioning.xml	2010-11-30 04:46:00 UTC (rev 24117)
+++ trunk/refman-5.6/partitioning.xml	2010-11-30 04:49:31 UTC (rev 24118)
Changed blocks: 2, Lines Added: 11, Lines Deleted: 10; 2042 bytes

@@ -90,10 +90,11 @@
   </para>
 
   <para>
-    If you are compiling MySQL &current-series; from source, the build
-    must be configured using <option>--with-partition</option> to enable
-    partitioning. Using <option>--with-plugins=max</option> to configure
-    the build includes this option automatically.
+    To enable partitioning if you are compiling MySQL &current-series;
+    from source, the build must be configured with the
+    <option role="cmake" condition="storage_engine_options">-DWITH_PARTITION_STORAGE_ENGINE</option>
+    option. For more information about building MySQL, see
+    <xref linkend="source-installation"/>.
   </para>
 
   <para>

@@ -222,12 +223,12 @@
     <ulink url="&base-url-downloads;mysql/&current-series;.html"/>.
     However, for the latest partitioning bugfixes and feature additions,
     you can obtain the source from our Bazaar repository. To enable
-    partitioning, you need to compile the server using the
-    <option>--with-partition</option> option. For more information about
-    building MySQL, see <xref linkend="source-installation"/>. If you
-    have problems compiling a partitioning-enabled MySQL
-    &current-series; build, check the
-    <ulink url="&base-url-forum-list;?106">MySQL Partitioning
+    partitioning, the build must be configured with the
+    <option role="cmake" condition="storage_engine_options">-DWITH_PARTITION_STORAGE_ENGINE</option>
+    option. For more information about building MySQL, see
+    <xref linkend="source-installation"/>. If you have problems
+    compiling a partitioning-enabled MySQL &current-series; build, check
+    the <ulink url="&base-url-forum-list;?106">MySQL Partitioning
     Forum</ulink> and ask for assistance there if you do not find a
     solution to your problem already posted.
   </para>


Modified: trunk/refman-5.6/programs-installation.xml
===================================================================
--- trunk/refman-5.6/programs-installation.xml	2010-11-30 04:46:00 UTC (rev 24117)
+++ trunk/refman-5.6/programs-installation.xml	2010-11-30 04:49:31 UTC (rev 24118)
Changed blocks: 2, Lines Added: 10, Lines Deleted: 10; 1982 bytes

@@ -689,7 +689,7 @@
       </para>
 
 <programlisting>
-shell&gt; <userinput>bin/mysql_install_db --user=mysql \</userinput>
+shell&gt; <userinput>scripts/mysql_install_db --user=mysql \</userinput>
          <userinput>--basedir=/opt/mysql/mysql \</userinput>
          <userinput>--datadir=/opt/mysql/mysql/data</userinput>
 </programlisting>

@@ -698,16 +698,16 @@
         <command>mysql_install_db</command> needs to invoke
         <command>mysqld</command> with the
         <option role="mysqld">--bootstrap</option> and
-        <option role="mysqld">--skip-grant-tables</option> options (see
-        <xref linkend="source-configuration-options"/>). If MySQL was
-        configured with the
-        <option role="configure">--disable-grant-options</option>
-        option, <option role="mysqld">--bootstrap</option> and
+        <option role="mysqld">--skip-grant-tables</option> options. If
+        MySQL was configured with the
+        <option role="cmake">DISABLE_GRANT_OPTIONS</option> compiler
+        flag, <option role="mysqld">--bootstrap</option> and
         <option role="mysqld">--skip-grant-tables</option> will be
-        disabled. To handle this, set the
-        <literal>MYSQLD_BOOTSTRAP</literal> environment variable to the
-        full path name of a server that has all options enabled.
-        <command>mysql_install_db</command> will use that server.
+        disabled (see <xref linkend="source-configuration-options"/>).
+        To handle this, set the <literal>MYSQLD_BOOTSTRAP</literal>
+        environment variable to the full path name of a server that has
+        all options enabled. <command>mysql_install_db</command> will
+        use that server.
       </para>
 
       <note>


Modified: trunk/refman-5.6/se-archive-core.xml
===================================================================
--- trunk/refman-5.6/se-archive-core.xml	2010-11-30 04:46:00 UTC (rev 24117)
+++ trunk/refman-5.6/se-archive-core.xml	2010-11-30 04:49:31 UTC (rev 24118)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 2; 753 bytes

@@ -31,8 +31,9 @@
   <para>
     The <literal>ARCHIVE</literal> storage engine is included in MySQL
     binary distributions. To enable this storage engine if you build
-    MySQL from source, invoke <command>configure</command> with the
-    <option>--with-archive-storage-engine</option> option.
+    MySQL from source, invoke <command>CMake</command> with the
+    <option role="cmake" condition="storage_engine_options">-DWITH_ARCHIVE_STORAGE_ENGINE</option>
+    option.
   </para>
 
   <para>


Modified: trunk/refman-5.6/se-blackhole.xml
===================================================================
--- trunk/refman-5.6/se-blackhole.xml	2010-11-30 04:46:00 UTC (rev 24117)
+++ trunk/refman-5.6/se-blackhole.xml	2010-11-30 04:49:31 UTC (rev 24118)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 2; 690 bytes

@@ -36,8 +36,9 @@
 
   <para>
     To enable the <literal>BLACKHOLE</literal> storage engine if you
-    build MySQL from source, invoke <command>configure</command> with
-    the <option>--with-blackhole-storage-engine</option> option.
+    build MySQL from source, invoke <command>CMake</command> with the
+    <option role="cmake" condition="storage_engine_options">-DWITH_BLACKHOLE_STORAGE_ENGINE</option>
+    option.
   </para>
 
   <para>


Modified: trunk/refman-5.6/se-csv.xml
===================================================================
--- trunk/refman-5.6/se-csv.xml	2010-11-30 04:46:00 UTC (rev 24117)
+++ trunk/refman-5.6/se-csv.xml	2010-11-30 04:49:31 UTC (rev 24118)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 3; 579 bytes

@@ -22,9 +22,8 @@
   </para>
 
   <para>
-    To enable the <literal>CSV</literal> storage engine if you build
-    MySQL from source, invoke <command>configure</command> with the
-    <option>--with-csv-storage-engine</option> option.
+    The <literal>CSV</literal> storage engine is always compiled into
+    the MySQL server.
   </para>
 
   <para>


Modified: trunk/refman-5.6/se-example.xml
===================================================================
--- trunk/refman-5.6/se-example.xml	2010-11-30 04:46:00 UTC (rev 24117)
+++ trunk/refman-5.6/se-example.xml	2010-11-30 04:49:31 UTC (rev 24118)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 2; 672 bytes

@@ -25,8 +25,9 @@
 
   <para>
     To enable the <literal>EXAMPLE</literal> storage engine if you build
-    MySQL from source, invoke <command>configure</command> with the
-    <option>--with-example-storage-engine</option> option.
+    MySQL from source, invoke <command>CMake</command> with the
+    <option role="cmake" condition="storage_engine_options">-DWITH_EXAMPLE_STORAGE_ENGINE</option>
+    option.
   </para>
 
   <para>


Modified: trunk/refman-5.6/se-federated.xml
===================================================================
--- trunk/refman-5.6/se-federated.xml	2010-11-30 04:46:00 UTC (rev 24117)
+++ trunk/refman-5.6/se-federated.xml	2010-11-30 04:49:31 UTC (rev 24118)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 2; 692 bytes

@@ -27,8 +27,10 @@
 
   <para>
     To include the <literal>FEDERATED</literal> storage engine if you
-    build MySQL from source, invoke <command>configure</command> with
-    the <option>--with-federated-storage-engine</option> option.
+    build MySQL from source, invoke <command>CMake</command> with the
+    <option role="cmake"
+condition="storage_engine_options">-DWITH_FEDERATED_STORAGE_ENGINE</option>
+    option.
   </para>
 
   <para>


Modified: trunk/refman-6.0/programs-installation.xml
===================================================================
--- trunk/refman-6.0/programs-installation.xml	2010-11-30 04:46:00 UTC (rev 24117)
+++ trunk/refman-6.0/programs-installation.xml	2010-11-30 04:49:31 UTC (rev 24118)
Changed blocks: 1, Lines Added: 7, Lines Deleted: 7; 1516 bytes

@@ -845,16 +845,16 @@
         <command>mysql_install_db</command> needs to invoke
         <command>mysqld</command> with the
         <option role="mysqld">--bootstrap</option> and
-        <option role="mysqld">--skip-grant-tables</option> options (see
-        <xref linkend="source-configuration-options"/>). If MySQL was
-        configured with the
+        <option role="mysqld">--skip-grant-tables</option> options. If
+        MySQL was configured with the
         <option role="configure">--disable-grant-options</option>
         option, <option role="mysqld">--bootstrap</option> and
         <option role="mysqld">--skip-grant-tables</option> will be
-        disabled. To handle this, set the
-        <literal>MYSQLD_BOOTSTRAP</literal> environment variable to the
-        full path name of a server that has all options enabled.
-        <command>mysql_install_db</command> will use that server.
+        disabled (see <xref linkend="source-configuration-options"/>).
+        To handle this, set the <literal>MYSQLD_BOOTSTRAP</literal>
+        environment variable to the full path name of a server that has
+        all options enabled. <command>mysql_install_db</command> will
+        use that server.
       </para>
 
       <para>


Thread
svn commit - mysqldoc@docsrva: r24118 - in trunk: . dynamic-docs/build-configure dynamic-docs/changelog refman-5.0 refman-5.1 refman-5.5 refman-5.6 re...paul.dubois30 Nov