List:Commits« Previous MessageNext Message »
From:mc.brown Date:August 10 2010 11:21am
Subject:svn commit - mysqldoc@docsrva: r22167 - trunk/refman-5.1
View as plain text  
Author: mcbrown
Date: 2010-08-10 13:21:24 +0200 (Tue, 10 Aug 2010)
New Revision: 22167

Log:
Removing some more outdated material; some reorganization and retstructuring

Adding consistent headings and layouts
Simplifying the intro material



Modified:
   trunk/refman-5.1/errors-problems-core.xml
   trunk/refman-5.1/extending-mysql.xml
   trunk/refman-5.1/installing-aix.xml
   trunk/refman-5.1/installing-general.xml
   trunk/refman-5.1/installing-hpux.xml
   trunk/refman-5.1/installing-macosx.xml
   trunk/refman-5.1/installing-solaris.xml
   trunk/refman-5.1/installing-source-core.xml
   trunk/refman-5.1/installing-windows.xml
   trunk/refman-5.1/installing.xml
   trunk/refman-5.1/renamed-nodes.txt


Modified: trunk/refman-5.1/errors-problems-core.xml
===================================================================
--- trunk/refman-5.1/errors-problems-core.xml	2010-08-10 10:18:24 UTC (rev 22166)
+++ trunk/refman-5.1/errors-problems-core.xml	2010-08-10 11:21:24 UTC (rev 22167)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 9; 865 bytes

@@ -5849,15 +5849,6 @@
 
           <listitem>
             <para>
-              You cannot build the server in another directory when
-              using MIT-pthreads. Because this requires changes to
-              MIT-pthreads, we are not likely to fix this. See
-              <xref linkend="mit-pthreads"/>.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
               <literal role="type">BLOB</literal> and
               <literal role="type">TEXT</literal> values can't reliably
               be used in <literal>GROUP BY</literal>, <literal>ORDER


Modified: trunk/refman-5.1/extending-mysql.xml
===================================================================
--- trunk/refman-5.1/extending-mysql.xml	2010-08-10 10:18:24 UTC (rev 22166)
+++ trunk/refman-5.1/extending-mysql.xml	2010-08-10 11:21:24 UTC (rev 22167)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 562 bytes

@@ -5102,7 +5102,7 @@
       programming introduction at
       <ulink url="http://www.mit.edu:8001/people/proven/IAP_2000/"/>).
       These can be used for some operating systems that do not have
-      POSIX threads. See <xref linkend="mit-pthreads"/>.
+      POSIX threads. 
     </para>
 
     <para>


Modified: trunk/refman-5.1/installing-aix.xml
===================================================================
--- trunk/refman-5.1/installing-aix.xml	2010-08-10 10:18:24 UTC (rev 22166)
+++ trunk/refman-5.1/installing-aix.xml	2010-08-10 11:21:24 UTC (rev 22167)
Changed blocks: 4, Lines Added: 85, Lines Deleted: 70; 6408 bytes

@@ -20,7 +20,7 @@
   </indexterm>
 
   <para>
-    There are two ways you can install MySQL on AIX:
+    MySQL for IBM AIX is available in a number of different forms:
   </para>
 
   <itemizedlist>

@@ -50,35 +50,45 @@
 
   </itemizedlist>
 
-  <para id="mysql-installation-aix-general">
-    Some general notes on using MySQL on IBM AIX:
-  </para>
+  <section id="mysql-installation-aix-general">
 
-  <itemizedlist>
+    <title>Installing MySQL on AIX General Notes</title>
 
-    <listitem>
-      <para>
-        If you have problems with threads on AIX 5.3, you should upgrade
-        AIX 5.3 to technology level 7 (5300-07).
-      </para>
-    </listitem>
+    <para>
+      General notes on using MySQL on IBM AIX:
+    </para>
 
-  </itemizedlist>
+    <itemizedlist>
 
-  <para id="mysql-installation-aix-source">
-    Some general notes on building MySQL from source on IBM AIX:
-  </para>
+      <listitem>
+        <para>
+          If you have problems with threads on AIX 5.3, you should
+          upgrade AIX 5.3 to technology level 7 (5300-07).
+        </para>
+      </listitem>
 
-  <itemizedlist>
+    </itemizedlist>
 
-    <listitem>
-      <para>
-        Automatic detection of <literal>xlC</literal> is missing from
-        Autoconf, so a number of variables need to be set before running
-        <command>configure</command>. The following example uses the IBM
-        compiler:
-      </para>
+  </section>
 
+  <section id="mysql-installation-aix-source">
+
+    <title>Installing MySQL on AIX from Source Notes</title>
+
+    <para>
+      General notes on building MySQL from source on IBM AIX:
+    </para>
+
+    <itemizedlist>
+
+      <listitem>
+        <para>
+          Automatic detection of <literal>xlC</literal> is missing from
+          Autoconf, so a number of variables need to be set before
+          running <command>configure</command>. The following example
+          uses the IBM compiler:
+        </para>
+
 <programlisting>
 export CC="xlc_r -ma -O3 -qstrict -qoptimize=3 -qmaxmem=8192 "
 export CXX="xlC_r -ma -O3 -qstrict -qoptimize=3 -qmaxmem=8192"

@@ -95,39 +105,41 @@
                 --enable-large-files
 </programlisting>
 
-      <para>
-        The preceding options are used to compile the MySQL distribution
-        that can be found at <ulink url="http://www-frec.bull.com/"/>.
-      </para>
-    </listitem>
+        <para>
+          The preceding options are used to compile the MySQL
+          distribution that can be found at
+          <ulink url="http://www-frec.bull.com/"/>.
+        </para>
+      </listitem>
 
-    <listitem>
-      <para>
-        If you change the <option>-O3</option> to <option>-O2</option>
-        in the preceding <command>configure</command> line, you must
-        also remove the <option>-qstrict</option> option. This is a
-        limitation in the IBM C compiler.
-      </para>
-    </listitem>
+      <listitem>
+        <para>
+          If you change the <option>-O3</option> to <option>-O2</option>
+          in the preceding <command>configure</command> line, you must
+          also remove the <option>-qstrict</option> option. This is a
+          limitation in the IBM C compiler.
+        </para>
+      </listitem>
 
-    <listitem>
-      <para>
-        If you are using <command>gcc</command> to compile MySQL, you
-        <emphasis>must</emphasis> use the
-        <option>-fno-exceptions</option> flag, because the exception
-        handling in <command>gcc</command> is not thread-safe. There are
-        also some known problems with IBM's assembler that may cause it
-        to generate bad code when used with <command>gcc</command>.
-      </para>
-    </listitem>
+      <listitem>
+        <para>
+          If you are using <command>gcc</command> to compile MySQL, you
+          <emphasis>must</emphasis> use the
+          <option>-fno-exceptions</option> flag, because the exception
+          handling in <command>gcc</command> is not thread-safe. There
+          are also some known problems with IBM's assembler that may
+          cause it to generate bad code when used with
+          <command>gcc</command>.
+        </para>
+      </listitem>
 
-    <listitem>
-      <para>
-        If you have problems with signals (MySQL dies unexpectedly under
-        high load), you may have found an OS bug with threads and
-        signals. In this case, you can tell MySQL not to use signals by
-        configuring as follows:
-      </para>
+      <listitem>
+        <para>
+          If you have problems with signals (MySQL dies unexpectedly
+          under high load), you may have found an OS bug with threads
+          and signals. In this case, you can tell MySQL not to use
+          signals by configuring as follows:
+        </para>
 
 <programlisting>
 CFLAGS=-DDONT_USE_THR_ALARM CXX=gcc \

@@ -137,24 +149,27 @@
     --with-low-memory
 </programlisting>
 
-      <para>
-        This doesn't affect the performance of MySQL, but has the side
-        effect that you can't kill clients that are
-        <quote>sleeping</quote> on a connection with <command>mysqladmin
-        kill</command> or <command>mysqladmin shutdown</command>.
-        Instead, the client dies when it issues its next command.
-      </para>
-    </listitem>
+        <para>
+          This doesn't affect the performance of MySQL, but has the side
+          effect that you can't kill clients that are
+          <quote>sleeping</quote> on a connection with
+          <command>mysqladmin kill</command> or <command>mysqladmin
+          shutdown</command>. Instead, the client dies when it issues
+          its next command.
+        </para>
+      </listitem>
 
-    <listitem>
-      <para>
-        On some versions of AIX, linking with
-        <literal>libbind.a</literal> makes
-        <literal>getservbyname()</literal> dump core. This is an AIX bug
-        and should be reported to IBM.
-      </para>
-    </listitem>
+      <listitem>
+        <para>
+          On some versions of AIX, linking with
+          <literal>libbind.a</literal> makes
+          <literal>getservbyname()</literal> dump core. This is an AIX
+          bug and should be reported to IBM.
+        </para>
+      </listitem>
 
-  </itemizedlist>
+    </itemizedlist>
 
+  </section>
+
 </section>


Modified: trunk/refman-5.1/installing-general.xml
===================================================================
--- trunk/refman-5.1/installing-general.xml	2010-08-10 10:18:24 UTC (rev 22166)
+++ trunk/refman-5.1/installing-general.xml	2010-08-10 11:21:24 UTC (rev 22167)
Changed blocks: 1, Lines Added: 9, Lines Deleted: 6; 1367 bytes

@@ -1350,18 +1350,21 @@
     </indexterm>
 
     <para>
-      This section describes the default layout of the directories
-      created by installing binary or source distributions provided by
-      Oracle Corporation. A distribution provided by another vendor
-      might use a layout different from those shown here.
+      The installation layout for different installation types (for
+      example native packages, binary tarballs, and source tarballs)
+      differs, which can lead to confusion when managing different
+      systems or using different installation sources. Layouts for
+      different installation types are provided below. Note that the
+      layout of installations from vendors other than Oracle may differ
+      from these layouts.
     </para>
 
-    <para>
+    <para id="installation-layouts-linuxrpm">
       Installations created from our Linux RPM distributions result in
       files under the following system directories.
     </para>
 
-    <informaltable>
+    <informaltable >
       <tgroup cols="2">
         <colspec colwidth="35*"/>
         <colspec colwidth="65*"/>


Modified: trunk/refman-5.1/installing-hpux.xml
===================================================================
--- trunk/refman-5.1/installing-hpux.xml	2010-08-10 10:18:24 UTC (rev 22166)
+++ trunk/refman-5.1/installing-hpux.xml	2010-08-10 11:21:24 UTC (rev 22167)
Changed blocks: 3, Lines Added: 75, Lines Deleted: 62; 5952 bytes

@@ -15,7 +15,7 @@
   </indexterm>
 
   <para>
-    There are three ways you can install MySQL on HP-UX:
+    MySQL for HP-UX is available in a number of different forms:
   </para>
 
   <itemizedlist>

@@ -44,7 +44,7 @@
 
     <listitem>
       <para>
-        Using a source tarbal and compiling MySQL. Please read the
+        Using a source tarball and compiling MySQL. Please read the
         <link linkend="mysql-installation-hpux-general">general notes on
         HP-UX installation</link> before continuing. You should also
         check the instructions on

@@ -56,101 +56,114 @@
 
   </itemizedlist>
 
-  <para id="mysql-installation-hpux-general">
-    Some additional notes on installing and using MySQL on HP-UX:
-  </para>
+  <section id="mysql-installation-hpux-general">
 
-  <itemizedlist>
+    <title>Installing MySQL on HP-UX General Notes</title>
 
-    <listitem>
-      <para>
-        If you install MySQL using a binary tarball distribution on
-        HP-UX, you may run into trouble even before you get the MySQL
-        distribution unpacked, as the HP-UX <command>tar</command>
-        cannot handle long file names. This means that you may see
-        errors when you try to unpack MySQL.
-      </para>
+    <para>
+      Some additional notes on installing and using MySQL on HP-UX:
+    </para>
 
-      <para>
-        If this occurs, you must use GNU <command>tar</command>
-        (<command>gtar</command>) to unpack the distribution.
-      </para>
-    </listitem>
+    <itemizedlist>
 
-    <listitem>
-      <para>
-        Because of some critical bugs in the standard HP-UX libraries,
-        you should install the following patches before trying to run
-        MySQL on HP-UX 11.0:
-      </para>
+      <listitem>
+        <para>
+          If you install MySQL using a binary tarball distribution on
+          HP-UX, you may run into trouble even before you get the MySQL
+          distribution unpacked, as the HP-UX <command>tar</command>
+          cannot handle long file names. This means that you may see
+          errors when you try to unpack MySQL.
+        </para>
 
+        <para>
+          If this occurs, you must use GNU <command>tar</command>
+          (<command>gtar</command>) to unpack the distribution.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          Because of some critical bugs in the standard HP-UX libraries,
+          you should install the following patches before trying to run
+          MySQL on HP-UX 11.0:
+        </para>
+
 <programlisting>
 PHKL_22840 Streams cumulative
 PHNE_22397 ARPA cumulative
 </programlisting>
 
-      <para>
-        This solves the problem of getting
-        <literal>EWOULDBLOCK</literal> from <literal>recv()</literal>
-        and <literal>EBADF</literal> from <literal>accept()</literal> in
-        threaded applications.
-      </para>
-    </listitem>
+        <para>
+          This solves the problem of getting
+          <literal>EWOULDBLOCK</literal> from <literal>recv()</literal>
+          and <literal>EBADF</literal> from <literal>accept()</literal>
+          in threaded applications.
+        </para>
+      </listitem>
 
-  </itemizedlist>
+    </itemizedlist>
 
-  <para id="mysql-installation-hpux-source">
-    Additional notes on compiling MySQL on HP-UX.
-  </para>
+  </section>
 
-  <itemizedlist>
+  <section id="mysql-installation-hpux-source">
 
-    <listitem>
-      <para>
-        If you are using HP-UX compiler, you can use the following
-        command (which has been tested with <command>cc</command>
-        B.11.11.04):
-      </para>
+    <title>Installing MySQL on HP-UX from Source Notes</title>
 
+    <para>
+      Additional notes on compiling MySQL on HP-UX.
+    </para>
+
+    <itemizedlist>
+
+      <listitem>
+        <para>
+          If you are using HP-UX compiler, you can use the following
+          command (which has been tested with <command>cc</command>
+          B.11.11.04):
+        </para>
+
 <programlisting>
 CC=cc CXX=aCC CFLAGS=+DD64 CXXFLAGS=+DD64 ./configure \
     --with-extra-character-set=complex
 </programlisting>
 
-      <para>
-        You can ignore any errors of the following type:
-      </para>
+        <para>
+          You can ignore any errors of the following type:
+        </para>
 
 <programlisting>
 aCC: warning 901: unknown option: `-3': use +help for online
 documentation
 </programlisting>
-    </listitem>
+      </listitem>
 
-    <listitem>
-      <para>
-        If you get the following error from
-        <command>configure</command>, verify that you do not have the
-        path to the K&amp;R compiler before the path to the HP-UX C and
-        C++ compiler:
-      </para>
+      <listitem>
+        <para>
+          If you get the following error from
+          <command>configure</command>, verify that you do not have the
+          path to the K&amp;R compiler before the path to the HP-UX C
+          and C++ compiler:
+        </para>
 
 <programlisting>
 checking for cc option to accept ANSI C... no
 configure: error: MySQL requires an ANSI C compiler (and a C++ compiler).
 Try gcc. See the Installation chapter in the Reference Manual.
 </programlisting>
-    </listitem>
+      </listitem>
 
-    <listitem>
-      <para>
-        Another reason for not being able to compile is that you didn't
-        define the <literal>+DD64</literal> flags as just described.
-      </para>
-    </listitem>
+      <listitem>
+        <para>
+          Another reason for not being able to compile is that you
+          didn't define the <literal>+DD64</literal> flags as just
+          described.
+        </para>
+      </listitem>
 
-  </itemizedlist>
+    </itemizedlist>
 
+  </section>
+
   <section id="mysql-installation-hpux-depot">
 
     <title>Installing MySQL using DEPOT on HP-UX</title>


Modified: trunk/refman-5.1/installing-macosx.xml
===================================================================
--- trunk/refman-5.1/installing-macosx.xml	2010-08-10 10:18:24 UTC (rev 22166)
+++ trunk/refman-5.1/installing-macosx.xml	2010-08-10 11:21:24 UTC (rev 22167)
Changed blocks: 4, Lines Added: 154, Lines Deleted: 153; 12689 bytes

@@ -31,11 +31,12 @@
         installer to walk you through the installation of MySQL. For
         more information, see
         <xref linkend="mysql-installation-macosx-pkg"/>. You can use the
-        package installer with Mac OS X 10.3 and later, and available
-        for both PowerPC and Intel architectures, and both 32-bit and
-        64-bit architectures. There is no Universal Binary available
-        using the package installation method. The user you use to
-        perform the installation must have administrator privileges.
+        package installer with Mac OS X 10.3 and later, and the package
+        is available for both PowerPC and Intel architectures, and
+        32-bit and 64-bit architectures. There is no Universal Binary
+        available using the package installation method. The user you
+        use to perform the installation must have administrator
+        privileges.
       </para>
     </listitem>
 

@@ -83,9 +84,155 @@
     <xref linkend="mysql-installation-macosx-notes"/>.
   </para>
 
+  <section id="mysql-installation-macosx-notes">
+
+    <title>Installing MySQL on Mac OS X General Notes</title>
+
+    <para>
+      You should keep the following issues and notes in mind:
+    </para>
+
+    <itemizedlist>
+
+      <listitem>
+        <para>
+          The default location for the MySQL Unix socket is different on
+          Mac OS X and Mac OS X Server depending on the installation
+          type you chose. The default locations by installation are as
+          follows:
+        </para>
+
+        <informaltable>
+          <tgroup cols="2">
+            <colspec colwidth="30*"/>
+            <colspec colwidth="30*"/>
+            <tbody>
+              <row>
+                <entry>Package Installer from MySQL</entry>
+                <entry><filename>/tmp/mysql.sock</filename></entry>
+              </row>
+              <row>
+                <entry>Tarball from MySQL</entry>
+                <entry><filename>/tmp/mysql.sock</filename></entry>
+              </row>
+              <row>
+                <entry>MySQL Bundled with Mac OS X Server</entry>
+                <entry><filename>/var/mysql/mysql.sock</filename></entry>
+              </row>
+            </tbody>
+          </tgroup>
+        </informaltable>
+
+        <para>
+          To prevent issues, you should either change the configuration
+          of the socket used within your application (for example,
+          changing <filename>php.ini</filename>), or you should
+          configure the socket location using a MySQL configuration file
+          and the <option role="mysqld">socket</option> option. For more
+          information, see <xref linkend="server-options"/>.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          You may need (or want) to create a specific
+          <literal>mysql</literal> user to own the MySQL directory and
+          data. On Mac OS X 10.4 and lower you can do this by using the
+          <command>Netinfo Manager</command> application, located within
+          the <filename>Utilities</filename> folder within the
+          <filename>Applications</filename> folder. On Mac OS X 10.5 and
+          later you can do this through the <command>Directory
+          Utility</command>. From Mac OS X 10.5 and later (including Mac
+          OS X Server 10.5) the <literal>mysql</literal> should already
+          exist. For use in single user mode, an entry for
+          <literal>_mysql</literal> (note the underscore prefix) should
+          already exist within the system
+          <filename>/etc/passwd</filename> file.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          Due to a bug in the Mac OS X package installer, you may see
+          this error message in the destination disk selection dialog:
+        </para>
+
+<programlisting>
+You cannot install this software on this disk. (null)
+</programlisting>
+
+        <para>
+          If this error occurs, click the <literal>Go Back</literal>
+          button once to return to the previous screen. Then click
+          <literal>Continue</literal> to advance to the destination disk
+          selection again, and you should be able to choose the
+          destination disk correctly. We have reported this bug to Apple
+          and it is investigating this problem.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          Because the MySQL package installer installs the MySQL
+          contents into a version and platform specific directory, you
+          can use this to upgrade and migrate your database between
+          versions. You will need to either copy the
+          <filename>data</filename> directory from the old version to
+          the new version, or alternatively specify an alternative
+          <option>datadir</option> value to set location of the data
+          directory.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          You might want to add aliases to your shell's resource file to
+          make it easier to access commonly used programs such as
+          <command>mysql</command> and <command>mysqladmin</command>
+          from the command line. The syntax for <command>bash</command>
+          is:
+        </para>
+
+<programlisting>
+alias mysql=/usr/local/mysql/bin/mysql
+alias mysqladmin=/usr/local/mysql/bin/mysqladmin
+</programlisting>
+
+        <para>
+          For <command>tcsh</command>, use:
+        </para>
+
+<programlisting>
+alias mysql /usr/local/mysql/bin/mysql
+alias mysqladmin /usr/local/mysql/bin/mysqladmin
+</programlisting>
+
+        <para>
+          Even better, add <literal>/usr/local/mysql/bin</literal> to
+          your <literal>PATH</literal> environment variable. You can do
+          this by modifying the appropriate startup file for your shell.
+          For more information, see <xref linkend="invoking-programs"/>.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          After you have copied over the MySQL database files from the
+          previous installation and have successfully started the new
+          server, you should consider removing the old installation
+          files to save disk space. Additionally, you should also remove
+          older versions of the Package Receipt directories located in
+          <filename>/Library/Receipts/mysql-<replaceable>VERSION</replaceable>.pkg</filename>.
+        </para>
+      </listitem>
+
+    </itemizedlist>
+
+  </section>
+
   <section id="mysql-installation-macosx-pkg">
 
-    <title>Installing MySQL Using the Installation Package</title>
+    <title>Installing MySQL on Mac OS X Using Native Packages</title>
 
     <para>
       You can install MySQL on Mac OS X 10.3.x (<quote>Panther</quote>)

@@ -609,7 +756,7 @@
 
   <section id="mysql-installation-macosx-server">
 
-    <title>Using MySQL on Mac OS X Server</title>
+    <title>Using Bundled MySQL on Mac OS X Server</title>
 
     <para>
       If you are running Mac OS X Server, a version of MySQL should

@@ -732,150 +879,4 @@
 
   </section>
 
-  <section id="mysql-installation-macosx-notes">
-
-    <title>MySQL Installation on Mac OS X Notes</title>
-
-    <para>
-      You should keep the following issues and notes in mind:
-    </para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>
-          The default location for the MySQL Unix socket is different on
-          Mac OS X and Mac OS X Server depending on the installation
-          type you chose. The default locations by installation are as
-          follows:
-        </para>
-
-        <informaltable>
-          <tgroup cols="2">
-            <colspec colwidth="30*"/>
-            <colspec colwidth="30*"/>
-            <tbody>
-              <row>
-                <entry>Package Installer from MySQL</entry>
-                <entry><filename>/tmp/mysql.sock</filename></entry>
-              </row>
-              <row>
-                <entry>Tarball from MySQL</entry>
-                <entry><filename>/tmp/mysql.sock</filename></entry>
-              </row>
-              <row>
-                <entry>MySQL Bundled with Mac OS X Server</entry>
-                <entry><filename>/var/mysql/mysql.sock</filename></entry>
-              </row>
-            </tbody>
-          </tgroup>
-        </informaltable>
-
-        <para>
-          To prevent issues, you should either change the configuration
-          of the socket used within your application (for example,
-          changing <filename>php.ini</filename>), or you should
-          configure the socket location using a MySQL configuration file
-          and the <option role="mysqld">socket</option> option. For more
-          information, see <xref linkend="server-options"/>.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          You may need (or want) to create a specific
-          <literal>mysql</literal> user to own the MySQL directory and
-          data. On Mac OS X 10.4 and lower you can do this by using the
-          <command>Netinfo Manager</command> application, located within
-          the <filename>Utilities</filename> folder within the
-          <filename>Applications</filename> folder. On Mac OS X 10.5 and
-          later you can do this through the <command>Directory
-          Utility</command>. From Mac OS X 10.5 and later (including Mac
-          OS X Server 10.5) the <literal>mysql</literal> should already
-          exist. For use in single user mode, an entry for
-          <literal>_mysql</literal> (note the underscore prefix) should
-          already exist within the system
-          <filename>/etc/passwd</filename> file.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          Due to a bug in the Mac OS X package installer, you may see
-          this error message in the destination disk selection dialog:
-        </para>
-
-<programlisting>
-You cannot install this software on this disk. (null)
-</programlisting>
-
-        <para>
-          If this error occurs, click the <literal>Go Back</literal>
-          button once to return to the previous screen. Then click
-          <literal>Continue</literal> to advance to the destination disk
-          selection again, and you should be able to choose the
-          destination disk correctly. We have reported this bug to Apple
-          and it is investigating this problem.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          Because the MySQL package installer installs the MySQL
-          contents into a version and platform specific directory, you
-          can use this to upgrade and migrate your database between
-          versions. You will need to either copy the
-          <filename>data</filename> directory from the old version to
-          the new version, or alternatively specify an alternative
-          <option>datadir</option> value to set location of the data
-          directory.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          You might want to add aliases to your shell's resource file to
-          make it easier to access commonly used programs such as
-          <command>mysql</command> and <command>mysqladmin</command>
-          from the command line. The syntax for <command>bash</command>
-          is:
-        </para>
-
-<programlisting>
-alias mysql=/usr/local/mysql/bin/mysql
-alias mysqladmin=/usr/local/mysql/bin/mysqladmin
-</programlisting>
-
-        <para>
-          For <command>tcsh</command>, use:
-        </para>
-
-<programlisting>
-alias mysql /usr/local/mysql/bin/mysql
-alias mysqladmin /usr/local/mysql/bin/mysqladmin
-</programlisting>
-
-        <para>
-          Even better, add <literal>/usr/local/mysql/bin</literal> to
-          your <literal>PATH</literal> environment variable. You can do
-          this by modifying the appropriate startup file for your shell.
-          For more information, see <xref linkend="invoking-programs"/>.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          After you have copied over the MySQL database files from the
-          previous installation and have successfully started the new
-          server, you should consider removing the old installation
-          files to save disk space. Additionally, you should also remove
-          older versions of the Package Receipt directories located in
-          <filename>/Library/Receipts/mysql-<replaceable>VERSION</replaceable>.pkg</filename>.
-        </para>
-      </listitem>
-
-    </itemizedlist>
-
-  </section>
-
 </section>


Modified: trunk/refman-5.1/installing-solaris.xml
===================================================================
--- trunk/refman-5.1/installing-solaris.xml	2010-08-10 10:18:24 UTC (rev 22166)
+++ trunk/refman-5.1/installing-solaris.xml	2010-08-10 11:21:24 UTC (rev 22167)
Changed blocks: 3, Lines Added: 4, Lines Deleted: 4; 1137 bytes

@@ -5,9 +5,9 @@
   <!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
 ]>
-<section id="solaris-installation">
+<section id="mysql-installation-solaris">
 
-  <title>Installing MySQL on Solaris</title>
+  <title>Installing MySQL on Solaris and OpenSolaris</title>
 
   <indexterm>
     <primary>Solaris</primary>

@@ -278,7 +278,7 @@
 
   <section id="solaris-installation-opensolaris">
 
-    <title>Installing MySQL on OpenSolaris using native packages</title>
+    <title>Installing MySQL on OpenSolaris using IPS</title>
 
     <para>
       OpenSolaris includes standard packages for MySQL in the core

@@ -386,7 +386,7 @@
 
   <section id="solaris-installation-source">
 
-    <title>Solaris Source Build Notes</title>
+    <title>Installing MySQL On Solaris from Source Notes</title>
 
     <para>
       When building MySQL on Solaris you can use either the Sun Studio


Modified: trunk/refman-5.1/installing-source-core.xml
===================================================================
--- trunk/refman-5.1/installing-source-core.xml	2010-08-10 10:18:24 UTC (rev 22166)
+++ trunk/refman-5.1/installing-source-core.xml	2010-08-10 11:21:24 UTC (rev 22167)
Changed blocks: 5, Lines Added: 6, Lines Deleted: 212; 8452 bytes

@@ -7,7 +7,7 @@
 ]>
 <section id="installing-source">
 
-  <title>MySQL Installation Using a Source Distribution</title>
+  <title>Installing MySQL Using a Source Distribution</title>
 
   <remark role="dynamic-dependency-list"/>
 

@@ -87,9 +87,7 @@
       <para>
         A good <command>make</command> program. GNU
         <command>make</command> is always recommended and is sometimes
-        required. (BSD <command>make</command> fails, and
-        vendor-provided <command>make</command> implementations may fail
-        as well.) If you have problems, use GNU <command>make</command>
+        required. If you have problems, use GNU <command>make</command>
         3.75 or newer.
       </para>
     </listitem>

@@ -901,47 +899,10 @@
           <secondary>CXXFLAGS</secondary>
         </indexterm>
 
-        <itemizedlist>
-
-          <listitem>
-            <para>
-              <command>gcc</command> 2.7.2:
-            </para>
-
-<programlisting>
-CC=gcc CXX=gcc CXXFLAGS="-O3 -felide-constructors"
-</programlisting>
-          </listitem>
-
-          <listitem>
-            <para>
-              <command>gcc</command> 2.95.2:
-            </para>
-
-<programlisting>
-CFLAGS="-O3 -mpentiumpro" CXX=gcc CXXFLAGS="-O3 -mpentiumpro \
--felide-constructors -fno-exceptions -fno-rtti"
-</programlisting>
-          </listitem>
-
-          <listitem>
-            <para>
-              <literal>pgcc</literal> 2.90.29 or newer:
-            </para>
-
-<programlisting>
-CFLAGS="-O3 -mpentiumpro -mstack-align-double" CXX=gcc \
-CXXFLAGS="-O3 -mpentiumpro -mstack-align-double \
--felide-constructors -fno-exceptions -fno-rtti"
-</programlisting>
-          </listitem>
-
-        </itemizedlist>
-
         <para>
           In most cases, you can get a reasonably optimized MySQL binary
-          by using the options from the preceding list and adding the
-          following options to the <command>configure</command> line:
+          by using the following options to the
+          <command>configure</command> line:
         </para>
 
 <programlisting>

@@ -1859,9 +1820,8 @@
     <para>
       All MySQL programs compile cleanly for us with no warnings on
       Solaris or Linux using <command>gcc</command>. On other systems,
-      warnings may occur due to differences in system include files. See
-      <xref linkend="mit-pthreads"/>, for warnings that may occur when
-      using MIT-pthreads. For other problems, check the following list.
+      warnings may occur due to differences in system include files. For
+      other problems, check the following list.
     </para>
 
     <para>

@@ -2334,170 +2294,4 @@
 
   </section>
 
-  <section id="mit-pthreads">
-
-    <title>MIT-pthreads Notes</title>
-
-    <indexterm>
-      <primary>MIT-pthreads</primary>
-    </indexterm>
-
-    <indexterm>
-      <primary>thread support</primary>
-      <secondary>nonnative</secondary>
-    </indexterm>
-
-    <para>
-      This section describes some of the issues involved in using
-      MIT-pthreads.
-    </para>
-
-    <para>
-      On Linux, you should <emphasis>not</emphasis> use MIT-pthreads.
-      Use the installed LinuxThreads implementation instead. See
-      <xref linkend="linux"/>.
-    </para>
-
-    <para>
-      If your system does not provide native thread support, you should
-      build MySQL using the MIT-pthreads package. This includes older
-      FreeBSD systems, SunOS 4.x, Solaris 2.4 and earlier, and some
-      others. See <xref linkend="general-installation-issues"/>.
-    </para>
-
-    <para>
-      MIT-pthreads is not part of the MySQL &current-series; source
-      distribution. If you require this package, you need to download it
-      separately from
-      <ulink url="http://dev.mysql.com/Downloads/Contrib/pthreads-1_60_beta6-mysql.tar.gz"/>
-    </para>
-
-    <para>
-      After downloading, extract this source archive into the top level
-      of the MySQL source directory. It creates a new subdirectory named
-      <literal>mit-pthreads</literal>.
-    </para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>
-          On most systems, you can force MIT-pthreads to be used by
-          running <command>configure</command> with the
-          <option>--with-mit-threads</option> option:
-        </para>
-
-<programlisting>
-shell&gt; <userinput>./configure --with-mit-threads</userinput>
-</programlisting>
-
-        <para>
-          Building in a nonsource directory is not supported when using
-          MIT-pthreads because we want to minimize our changes to this
-          code.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          The checks that determine whether to use MIT-pthreads occur
-          only during the part of the configuration process that deals
-          with the server code. If you have configured the distribution
-          using <option role="configure">--without-server</option> to
-          build only the client code, clients do not know whether
-          MIT-pthreads is being used and use Unix socket file
-          connections by default. Because Unix socket files do not work
-          under MIT-pthreads on some platforms, this means you need to
-          use <option>-h</option> or <option>--host</option> with a
-          value other than <literal>localhost</literal> when you run
-          client programs.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          When MySQL is compiled using MIT-pthreads, system locking is
-          disabled by default for performance reasons. You can tell the
-          server to use system locking with the
-          <option role="mysqld">--external-locking</option> option. This
-          is needed only if you want to be able to run two MySQL servers
-          against the same data files, but that is not recommended,
-          anyway.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          Sometimes the pthread <literal>bind()</literal> command fails
-          to bind to a socket without any error message (at least on
-          Solaris). The result is that all connections to the server
-          fail. For example:
-        </para>
-
-<programlisting>
-shell&gt; <userinput>mysqladmin version</userinput>
-mysqladmin: connect to server at '' failed;
-error: 'Can't connect to mysql server on localhost (146)'
-</programlisting>
-
-        <para>
-          The solution to this problem is to kill the
-          <command>mysqld</command> server and restart it. This has
-          happened to us only when we have forcibly stopped the server
-          and restarted it immediately.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          With MIT-pthreads, the <literal>sleep()</literal> system call
-          isn't interruptible with <literal>SIGINT</literal> (break).
-          This is noticeable only when you run <command>mysqladmin
-          --sleep</command>. You must wait for the
-          <literal>sleep()</literal> call to terminate before the
-          interrupt is served and the process stops.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          When linking, you might receive warning messages like these
-          (at least on Solaris); they can be ignored:
-        </para>
-
-<programlisting>
-ld: warning: symbol `_iob' has differing sizes:
-    (file /my/local/pthreads/lib/libpthread.a(findfp.o) value=0x4;
-file /usr/lib/libc.so value=0x140);
-    /my/local/pthreads/lib/libpthread.a(findfp.o) definition taken
-ld: warning: symbol `__iob' has differing sizes:
-    (file /my/local/pthreads/lib/libpthread.a(findfp.o) value=0x4;
-file /usr/lib/libc.so value=0x140);
-    /my/local/pthreads/lib/libpthread.a(findfp.o) definition taken
-</programlisting>
-      </listitem>
-
-      <listitem>
-        <para>
-          Some other warnings also can be ignored:
-        </para>
-
-<programlisting>
-implicit declaration of function `int strtoll(...)'
-implicit declaration of function `int strtoul(...)'
-</programlisting>
-      </listitem>
-
-      <listitem>
-        <para>
-          We have not been able to make <literal>readline</literal> work
-          with MIT-pthreads. (This is not necessary, but may be of
-          interest to some.)
-        </para>
-      </listitem>
-
-    </itemizedlist>
-
-  </section>
-
 </section>


Modified: trunk/refman-5.1/installing-windows.xml
===================================================================
--- trunk/refman-5.1/installing-windows.xml	2010-08-10 10:18:24 UTC (rev 22166)
+++ trunk/refman-5.1/installing-windows.xml	2010-08-10 11:21:24 UTC (rev 22167)
Changed blocks: 2, Lines Added: 21, Lines Deleted: 49; 3710 bytes

@@ -7,60 +7,32 @@
 ]>
 <section id="windows-installation">
 
-  <title>Installing MySQL on Windows</title>
+  <title>Installing MySQL on Microsoft Windows</title>
 
   <para>
-    This section describes the process for installing MySQL on Windows.
+    MySQL for Microsoft Windows is available in a number of different
+    forms. A Microsoft Windows operating system such as Windows 2000,
+    Windows XP, Windows Vista, Windows 7, Windows Server 2003, or
+    Windows Server 2008. Both 32-bit and 64-bit versions are supported.
   </para>
 
   <para>
-    To run MySQL on Windows, you need the following:
+    In addition to running MySQL as a standard application, you can also
+    run the MySQL server as a Windows service. By using a service you
+    can monitor and control the operation of the server through the
+    standard Windows service management tools. For more information, see
+    <xref linkend="windows-start-service"/>.
   </para>
 
-  <itemizedlist>
+  <para>
+    Generally, you should install MySQL on Windows using an account that
+    has administrator rights. Otherwise, you may encounter problems with
+    certain operations such as editing the <literal>PATH</literal>
+    environment variable or accessing the <command>Service Control
+    Manager</command>. Once installed, MySQL does not need to be
+    executed using a user with Administrator privileges.
+  </para>
 
-    <listitem>
-      <para>
-        A Windows operating system such as Windows 2000, Windows XP,
-        Windows Vista, Windows Server 2003, or Windows Server 2008. Both
-        32-bit and 64-bit versions are supported.
-      </para>
-
-      <para>
-        In addition to running MySQL as a standard application, you can
-        also run the MySQL server as a Windows service. By using a
-        service you can monitor and control the operation of the server
-        through the standard Windows service management tools. For more
-        information, see <xref linkend="windows-start-service"/>.
-      </para>
-
-      <para>
-        Generally, you should install MySQL on Windows using an account
-        that has administrator rights. Otherwise, you may encounter
-        problems with certain operations such as editing the
-        <literal>PATH</literal> environment variable or accessing the
-        <command>Service Control Manager</command>. Once installed,
-        MySQL does not need to be executed using a user with
-        Administrator privileges.
-      </para>
-    </listitem>
-
-    <listitem>
-      <para>
-        TCP/IP protocol support.
-      </para>
-    </listitem>
-
-    <listitem>
-      <para>
-        Enough space on the hard drive to unpack, install, and create
-        the databases in accordance with your requirements (generally a
-        minimum of 200 megabytes is recommended.)
-      </para>
-    </listitem>
-
-  </itemizedlist>
-
   <para>
     For a list of limitations within the Windows version of MySQL, see
     <xref linkend="limits-windows"/>.

@@ -592,11 +564,11 @@
 
   <section id="windows-using-installer">
 
-    <title>Installing MySQL with the MSI Package</title>
+    <title>Installing MySQL on Windows Using the MSI Package</title>
 
     <para>
-      The MSI package are designed to install and configure MySQL in
-      such a way that you can immediately get started using MySQL.
+      The MSI package is designed to install and configure MySQL in such
+      a way that you can immediately get started using MySQL.
     </para>
 
     <para>


Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml	2010-08-10 10:18:24 UTC (rev 22166)
+++ trunk/refman-5.1/installing.xml	2010-08-10 11:21:24 UTC (rev 22167)
Changed blocks: 1, Lines Added: 6, Lines Deleted: 6; 1714 bytes

@@ -128,24 +128,24 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dynxml-local-installing-source.xml"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="installing-updowngrade.xml"/>
-
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="installing-windows.xml"/>
 
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="installing-macosx.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="installing-linux.xml"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="installing-macosx.xml"/>
-
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="installing-solaris.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="installing-i5os.xml"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="installing-freebsd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="installing-aix.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="installing-hpux.xml"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="installing-aix.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="installing-freebsd.xml"/>
 
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="installing-updowngrade.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="installing-postinstall.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="installing-envvar.xml"/>


Modified: trunk/refman-5.1/renamed-nodes.txt
===================================================================
--- trunk/refman-5.1/renamed-nodes.txt	2010-08-10 10:18:24 UTC (rev 22166)
+++ trunk/refman-5.1/renamed-nodes.txt	2010-08-10 11:21:24 UTC (rev 22167)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 0; 471 bytes

@@ -277,3 +277,4 @@
 what-privileges privilege-system 2010-01-13
 which-os general-installation-issues 2010-10-01
 windows-vs-unix limits-windows 2011-08-03
+solaris-installation mysql-installation-solaris 2011-08-01


Thread
svn commit - mysqldoc@docsrva: r22167 - trunk/refman-5.1mc.brown10 Aug