List:Commits« Previous MessageNext Message »
From:paul Date:April 23 2008 8:04pm
Subject:svn commit - mysqldoc@docsrva: r10570 - in trunk: . dynamic-docs/changelog it/refman-5.1 pt/refman-5.1 refman-4.1 refman-5.0 refman-5.1 refman-6.0
View as plain text  
Author: paul
Date: 2008-04-23 22:04:27 +0200 (Wed, 23 Apr 2008)
New Revision: 10570

Log:
 r30910@frost:  paul | 2008-04-23 14:26:22 -0500
 There are some incompatibilities that mysql_upgrade does not fix
 and must be dealt with separately. This is the first set of edits
 intended to provide users with warning of that fact and what to
 do about it.


Modified:
   trunk/dynamic-docs/changelog/mysqld.xml
   trunk/it/refman-5.1/installing-core.xml
   trunk/it/refman-5.1/programs-installation.xml
   trunk/pt/refman-5.1/installing-core.xml
   trunk/pt/refman-5.1/programs-installation.xml
   trunk/refman-4.1/installing.xml
   trunk/refman-5.0/installing-cs-core.xml
   trunk/refman-5.0/programs-installation.xml
   trunk/refman-5.1/installing-core.xml
   trunk/refman-5.1/programs-installation.xml
   trunk/refman-6.0/installing-core.xml
   trunk/refman-6.0/programs-installation.xml

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:30908
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:30908
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:30910
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:30908


Modified: trunk/dynamic-docs/changelog/mysqld.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld.xml	2008-04-23 17:32:38 UTC (rev 10569)
+++ trunk/dynamic-docs/changelog/mysqld.xml	2008-04-23 20:04:27 UTC (rev 10570)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 789 bytes

@@ -33830,8 +33830,8 @@
         against non-apostrophe words (for example, a search for
         <literal>Jerry</literal> will match against the term
         <literal>Jerry's</literal>). Users upgrading to this version
-        must issue <literal>REPAIR TABLE</literal> statements for tables
-        containing <literal>FULLTEXT</literal> indexes.
+        must issue <literal>REPAIR TABLE ... QUICK</literal> statements
+        for tables containing <literal>FULLTEXT</literal> indexes.
       </para>
 
     </message>


Modified: trunk/it/refman-5.1/installing-core.xml
===================================================================
--- trunk/it/refman-5.1/installing-core.xml	2008-04-23 17:32:38 UTC (rev 10569)
+++ trunk/it/refman-5.1/installing-core.xml	2008-04-23 20:04:27 UTC (rev 10570)
Changed blocks: 8, Lines Added: 52, Lines Deleted: 48; 8937 bytes

@@ -12097,9 +12097,17 @@
     <para>
       As a general rule, we recommend that when you upgrade from one
       release series to another, you should go to the next series rather
-      than skipping a series. For example, if you currently are running
+      than skipping a series. If you wish to upgrade from a release
+      series previous to MySQL &previous-series;, you should upgrade to
+      each successive release series in turn until you have reached
+      MySQL &previous-series;, and then proceed with the upgrade to
+      MySQL &current-series;. For example, if you currently are running
       MySQL 4.0 and wish to upgrade to a newer series, upgrade to MySQL
-      4.1 rather than to 5.0 or 5.1.
+      4.1 first before upgrading to 5.0, and so forth. For information
+      on upgrading from MySQL &previous-series;, see the
+      <citetitle>&title-refman-previous;</citetitle>; for earlier
+      releases, see the <citetitle>MySQL 3.23, 4.0, 4.1 Reference
+      Manual</citetitle>.
     </para>
 
     <para>

@@ -12111,28 +12119,22 @@
 
       <listitem>
         <para>
-          Before upgrading from MySQL &previous-series; to
-          &current-series;, read <xref linkend="upgrading-from-5-0"/>,
-          as well as <xref linkend="news"/>. These provide information
-          about features that are new in MySQL &current-series; or
-          differ from those found in MySQL &previous-series;. If you
-          wish to upgrade from a release series previous to MySQL
-          &previous-series;, you should upgrade to each successive
-          release series in turn until you have reached MySQL
-          &previous-series;, and then proceed with the upgrade to MySQL
-          &current-series;. For information on upgrading from MySQL
-          &previous-series;, see the
-          <citetitle>&title-refman-previous;</citetitle>; for earlier
-          releases, see the <citetitle>MySQL 3.23, 4.0, 4.1 Reference
-          Manual</citetitle>.
+          Before you perform any upgrade, back up your databases,
+          including the <literal>mysql</literal> database that contains
+          the grant tables.
         </para>
       </listitem>
 
       <listitem>
         <para>
-          Before you perform an upgrade, back up your databases,
-          including the <literal>mysql</literal> database that contains
-          the grant tables.
+          Before upgrading from MySQL &previous-series; to
+          &current-series;, read all the notes in
+          <xref linkend="upgrading-from-5-0"/>. These notes will enable
+          you to identify any upgrade issues that apply to your current
+          MySQL installation. Read <xref linkend="news"/> as well. These
+          notes provide information about features that are new in MySQL
+          &current-series; or differ from those found in MySQL
+          &previous-series;.
         </para>
       </listitem>
 

@@ -12141,18 +12143,19 @@
           Some releases of MySQL introduce incompatible changes to
           tables. (Our aim is to avoid these changes, but occasionally
           they are necessary to correct problems that would be worse
-          than an incompatibility between releases.) Some releases of
-          MySQL introduce changes to the structure of the grant tables
-          to add new privileges or features.
+          than an incompatibility between releases.)
         </para>
 
         <para>
           To avoid problems due to such changes, after you upgrade to a
-          new version of MySQL, you should check your tables (and repair
-          them if necessary), and update your grant tables to make sure
-          that they have the current structure so that you can take
-          advantage of any new capabilities. See
-          <xref linkend="mysql-upgrade"/>.
+          new version of MySQL, you should run
+          <command>mysql_upgrade</command> (see
+          <xref linkend="mysql-upgrade"/>). This program will check your
+          tables (and repair them if necessary), and to update your
+          grant tables to make sure that they have the current structure
+          so that you can take advantage of any new capabilities. (Some
+          releases of MySQL introduce changes to the structure of the
+          grant tables to add new privileges or features.)
         </para>
       </listitem>
 

@@ -12274,12 +12277,11 @@
       </indexterm>
 
       <para>
-        <emphasis role="bold">When upgrading a 5.0 installation to
-        5.0.10 or above</emphasis> note that it is
-        <emphasis>necessary</emphasis> to upgrade your grant tables.
-        Otherwise, creating stored procedures and functions might not
-        work. The procedure for doing this is described in
-        <xref linkend="mysql-upgrade"/>.
+        <emphasis role="bold">After upgrading a 5.0 installation to
+        5.0.10 or above</emphasis>, it is <emphasis>necessary</emphasis>
+        to upgrade your grant tables. Otherwise, creating stored
+        procedures and functions might not work. The procedure for doing
+        this is described in <xref linkend="mysql-upgrade"/>.
       </para>
 
       <note>

@@ -12302,16 +12304,17 @@
 
         <listitem>
           <para>
-            Check the items in <xref linkend="upgrade"/>, to see whether
-            any of them might affect your applications.
+            Read all the items in <xref linkend="upgrade"/>, to see
+            whether any of them might affect your applications.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            Check the items in the change lists found later in this
+            Read all the items in the change lists found later in this
             section to see whether any of them might affect your
             applications. Note particularly any that are marked
+            <emphasis role="bold">Known issue</emphasis> or
             <emphasis role="bold">Incompatible change</emphasis>. These
             result in incompatibilities with earlier versions of MySQL,
             and may require your attention <emphasis>before you

@@ -12324,19 +12327,20 @@
             Some releases of MySQL introduce incompatible changes to
             tables. (Our aim is to avoid these changes, but occasionally
             they are necessary to correct problems that would be worse
-            than an incompatibility between releases.) Some releases of
-            MySQL introduce changes to the structure of the grant tables
-            to add new privileges or features.
+            than an incompatibility between releases.)
           </para>
 
           <para>
             To avoid problems due to such changes, after you upgrade to
             a new version of MySQL, you should run
-            <command>mysql_upgrade</command> to check your tables (and
-            repair them if necessary), and to update your grant tables
-            to make sure that they have the current structure so that
-            you can take advantage of any new capabilities. See
-            <xref linkend="mysql-upgrade"/>.
+            <command>mysql_upgrade</command> (see
+            <xref linkend="mysql-upgrade"/>). This program will check
+            your tables (and repair them if necessary), and to update
+            your grant tables to make sure that they have the current
+            structure so that you can take advantage of any new
+            capabilities. (Some releases of MySQL introduce changes to
+            the structure of the grant tables to add new privileges or
+            features.)
           </para>
         </listitem>
 

@@ -12463,7 +12467,7 @@
             allows the loading and unloading of components at runtime,
             without restarting the server. <xref linkend="plugin-api"/>.
             The plugin API requires the <literal>mysql.plugin</literal>
-            table. When upgrading from an older version of MySQL, you
+            table. After upgrading from an older version of MySQL, you
             should run the <command>mysql_upgrade</command> command to
             create this table. See <xref linkend="mysql-upgrade"/>.
           </para>

@@ -12728,9 +12732,9 @@
             <emphasis role="bold">Incompatible change</emphasis>: The
             structure of <literal>FULLTEXT</literal> indexes has been
             changed in MySQL 5.1.6. After upgrading to MySQL 5.1.6 or
-            greater, call the <literal>REPAIR TABLE</literal> statement
-            for each table that contains any <literal>FULLTEXT</literal>
-            indexes.
+            greater, use the <literal>REPAIR TABLE ... QUICK</literal>
+            statement for each table that contains any
+            <literal>FULLTEXT</literal> indexes.
           </para>
         </listitem>
 


Modified: trunk/it/refman-5.1/programs-installation.xml
===================================================================
--- trunk/it/refman-5.1/programs-installation.xml	2008-04-23 17:32:38 UTC (rev 10569)
+++ trunk/it/refman-5.1/programs-installation.xml	2008-04-23 20:04:27 UTC (rev 10570)
Changed blocks: 1, Lines Added: 11, Lines Deleted: 0; 949 bytes

@@ -1220,6 +1220,17 @@
         <option>--force</option> option.
       </para>
 
+      <caution>
+        <para>
+          Some upgrade incompatibilities may require special handling
+          <emphasis>before</emphasis> you upgrade your MySQL
+          installation and run <command>mysql_upgrade</command>. See
+          <xref linkend="id"/>, for instructions on determining whether
+          any such incompatibilies apply to your installation and how to
+          handle them.
+        </para>
+      </caution>
+
       <para>
         To check and repair tables and to upgrade the system tables,
         <command>mysql_upgrade</command> executes the following


Modified: trunk/pt/refman-5.1/installing-core.xml
===================================================================
--- trunk/pt/refman-5.1/installing-core.xml	2008-04-23 17:32:38 UTC (rev 10569)
+++ trunk/pt/refman-5.1/installing-core.xml	2008-04-23 20:04:27 UTC (rev 10570)
Changed blocks: 8, Lines Added: 52, Lines Deleted: 48; 8937 bytes

@@ -12097,9 +12097,17 @@
     <para>
       As a general rule, we recommend that when you upgrade from one
       release series to another, you should go to the next series rather
-      than skipping a series. For example, if you currently are running
+      than skipping a series. If you wish to upgrade from a release
+      series previous to MySQL &previous-series;, you should upgrade to
+      each successive release series in turn until you have reached
+      MySQL &previous-series;, and then proceed with the upgrade to
+      MySQL &current-series;. For example, if you currently are running
       MySQL 4.0 and wish to upgrade to a newer series, upgrade to MySQL
-      4.1 rather than to 5.0 or 5.1.
+      4.1 first before upgrading to 5.0, and so forth. For information
+      on upgrading from MySQL &previous-series;, see the
+      <citetitle>&title-refman-previous;</citetitle>; for earlier
+      releases, see the <citetitle>MySQL 3.23, 4.0, 4.1 Reference
+      Manual</citetitle>.
     </para>
 
     <para>

@@ -12111,28 +12119,22 @@
 
       <listitem>
         <para>
-          Before upgrading from MySQL &previous-series; to
-          &current-series;, read <xref linkend="upgrading-from-5-0"/>,
-          as well as <xref linkend="news"/>. These provide information
-          about features that are new in MySQL &current-series; or
-          differ from those found in MySQL &previous-series;. If you
-          wish to upgrade from a release series previous to MySQL
-          &previous-series;, you should upgrade to each successive
-          release series in turn until you have reached MySQL
-          &previous-series;, and then proceed with the upgrade to MySQL
-          &current-series;. For information on upgrading from MySQL
-          &previous-series;, see the
-          <citetitle>&title-refman-previous;</citetitle>; for earlier
-          releases, see the <citetitle>MySQL 3.23, 4.0, 4.1 Reference
-          Manual</citetitle>.
+          Before you perform any upgrade, back up your databases,
+          including the <literal>mysql</literal> database that contains
+          the grant tables.
         </para>
       </listitem>
 
       <listitem>
         <para>
-          Before you perform an upgrade, back up your databases,
-          including the <literal>mysql</literal> database that contains
-          the grant tables.
+          Before upgrading from MySQL &previous-series; to
+          &current-series;, read all the notes in
+          <xref linkend="upgrading-from-5-0"/>. These notes will enable
+          you to identify any upgrade issues that apply to your current
+          MySQL installation. Read <xref linkend="news"/> as well. These
+          notes provide information about features that are new in MySQL
+          &current-series; or differ from those found in MySQL
+          &previous-series;.
         </para>
       </listitem>
 

@@ -12141,18 +12143,19 @@
           Some releases of MySQL introduce incompatible changes to
           tables. (Our aim is to avoid these changes, but occasionally
           they are necessary to correct problems that would be worse
-          than an incompatibility between releases.) Some releases of
-          MySQL introduce changes to the structure of the grant tables
-          to add new privileges or features.
+          than an incompatibility between releases.)
         </para>
 
         <para>
           To avoid problems due to such changes, after you upgrade to a
-          new version of MySQL, you should check your tables (and repair
-          them if necessary), and update your grant tables to make sure
-          that they have the current structure so that you can take
-          advantage of any new capabilities. See
-          <xref linkend="mysql-upgrade"/>.
+          new version of MySQL, you should run
+          <command>mysql_upgrade</command> (see
+          <xref linkend="mysql-upgrade"/>). This program will check your
+          tables (and repair them if necessary), and to update your
+          grant tables to make sure that they have the current structure
+          so that you can take advantage of any new capabilities. (Some
+          releases of MySQL introduce changes to the structure of the
+          grant tables to add new privileges or features.)
         </para>
       </listitem>
 

@@ -12274,12 +12277,11 @@
       </indexterm>
 
       <para>
-        <emphasis role="bold">When upgrading a 5.0 installation to
-        5.0.10 or above</emphasis> note that it is
-        <emphasis>necessary</emphasis> to upgrade your grant tables.
-        Otherwise, creating stored procedures and functions might not
-        work. The procedure for doing this is described in
-        <xref linkend="mysql-upgrade"/>.
+        <emphasis role="bold">After upgrading a 5.0 installation to
+        5.0.10 or above</emphasis>, it is <emphasis>necessary</emphasis>
+        to upgrade your grant tables. Otherwise, creating stored
+        procedures and functions might not work. The procedure for doing
+        this is described in <xref linkend="mysql-upgrade"/>.
       </para>
 
       <note>

@@ -12302,16 +12304,17 @@
 
         <listitem>
           <para>
-            Check the items in <xref linkend="upgrade"/>, to see whether
-            any of them might affect your applications.
+            Read all the items in <xref linkend="upgrade"/>, to see
+            whether any of them might affect your applications.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            Check the items in the change lists found later in this
+            Read all the items in the change lists found later in this
             section to see whether any of them might affect your
             applications. Note particularly any that are marked
+            <emphasis role="bold">Known issue</emphasis> or
             <emphasis role="bold">Incompatible change</emphasis>. These
             result in incompatibilities with earlier versions of MySQL,
             and may require your attention <emphasis>before you

@@ -12324,19 +12327,20 @@
             Some releases of MySQL introduce incompatible changes to
             tables. (Our aim is to avoid these changes, but occasionally
             they are necessary to correct problems that would be worse
-            than an incompatibility between releases.) Some releases of
-            MySQL introduce changes to the structure of the grant tables
-            to add new privileges or features.
+            than an incompatibility between releases.)
           </para>
 
           <para>
             To avoid problems due to such changes, after you upgrade to
             a new version of MySQL, you should run
-            <command>mysql_upgrade</command> to check your tables (and
-            repair them if necessary), and to update your grant tables
-            to make sure that they have the current structure so that
-            you can take advantage of any new capabilities. See
-            <xref linkend="mysql-upgrade"/>.
+            <command>mysql_upgrade</command> (see
+            <xref linkend="mysql-upgrade"/>). This program will check
+            your tables (and repair them if necessary), and to update
+            your grant tables to make sure that they have the current
+            structure so that you can take advantage of any new
+            capabilities. (Some releases of MySQL introduce changes to
+            the structure of the grant tables to add new privileges or
+            features.)
           </para>
         </listitem>
 

@@ -12463,7 +12467,7 @@
             allows the loading and unloading of components at runtime,
             without restarting the server. <xref linkend="plugin-api"/>.
             The plugin API requires the <literal>mysql.plugin</literal>
-            table. When upgrading from an older version of MySQL, you
+            table. After upgrading from an older version of MySQL, you
             should run the <command>mysql_upgrade</command> command to
             create this table. See <xref linkend="mysql-upgrade"/>.
           </para>

@@ -12728,9 +12732,9 @@
             <emphasis role="bold">Incompatible change</emphasis>: The
             structure of <literal>FULLTEXT</literal> indexes has been
             changed in MySQL 5.1.6. After upgrading to MySQL 5.1.6 or
-            greater, call the <literal>REPAIR TABLE</literal> statement
-            for each table that contains any <literal>FULLTEXT</literal>
-            indexes.
+            greater, use the <literal>REPAIR TABLE ... QUICK</literal>
+            statement for each table that contains any
+            <literal>FULLTEXT</literal> indexes.
           </para>
         </listitem>
 


Modified: trunk/pt/refman-5.1/programs-installation.xml
===================================================================
--- trunk/pt/refman-5.1/programs-installation.xml	2008-04-23 17:32:38 UTC (rev 10569)
+++ trunk/pt/refman-5.1/programs-installation.xml	2008-04-23 20:04:27 UTC (rev 10570)
Changed blocks: 1, Lines Added: 11, Lines Deleted: 0; 949 bytes

@@ -1220,6 +1220,17 @@
         <option>--force</option> option.
       </para>
 
+      <caution>
+        <para>
+          Some upgrade incompatibilities may require special handling
+          <emphasis>before</emphasis> you upgrade your MySQL
+          installation and run <command>mysql_upgrade</command>. See
+          <xref linkend="id"/>, for instructions on determining whether
+          any such incompatibilies apply to your installation and how to
+          handle them.
+        </para>
+      </caution>
+
       <para>
         To check and repair tables and to upgrade the system tables,
         <command>mysql_upgrade</command> executes the following


Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml	2008-04-23 17:32:38 UTC (rev 10569)
+++ trunk/refman-4.1/installing.xml	2008-04-23 20:04:27 UTC (rev 10570)
Changed blocks: 3, Lines Added: 19, Lines Deleted: 16; 3736 bytes

@@ -12360,27 +12360,28 @@
 
       <listitem>
         <para>
-          Read the upgrading section for the release series to which you
-          are upgrading. Read the change notes as well. These provide
-          information about new features you can use.
+          Before you perform any upgrade, back up your databases,
+          including the <literal>mysql</literal> database that contains
+          the grant tables.
         </para>
       </listitem>
 
       <listitem>
         <para>
-          Before you perform an upgrade, back up your databases,
-          including the <literal>mysql</literal> database that contains
-          the grant tables.
+          Read all the notes the upgrading section for the release
+          series to which you are upgrading. Read the change notes as
+          well. These provide information about new features you can
+          use.
         </para>
       </listitem>
 
       <listitem>
         <para>
           Some releases of MySQL introduce changes to the structure of
-          the grant tables to add new privileges or features. Whenever
-          you update to a new version of MySQL, you should update your
-          grant tables to make sure that they have the current structure
-          so that you can take advantage of any new capabilities. See
+          the grant tables to add new privileges or features. After you
+          update to a new version of MySQL, you should update your grant
+          tables to make sure that they have the current structure so
+          that you can take advantage of any new capabilities. See
           <xref linkend="mysql-fix-privilege-tables"/>.
         </para>
       </listitem>

@@ -12545,16 +12546,17 @@
 
         <listitem>
           <para>
-            Check the items in <xref linkend="upgrade"/>, to see whether
-            any of them might affect your applications.
+            Read all the items in <xref linkend="upgrade"/>, to see
+            whether any of them might affect your applications.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            Check the items in the change lists found later in this
+            Read all the items in the change lists found later in this
             section to see whether any of them might affect your
             applications. Note particularly any that are marked
+            <emphasis role="bold">Known issue</emphasis> or
             <emphasis role="bold">Incompatible change</emphasis>. These
             result in incompatibilities with earlier versions of MySQL
             and you should consider the implications of these

@@ -13524,16 +13526,17 @@
 
         <listitem>
           <para>
-            Check the items in <xref linkend="upgrade"/>, to see whether
-            any of them might affect your applications.
+            Read all the items in <xref linkend="upgrade"/>, to see
+            whether any of them might affect your applications.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            Check the items in the change list found later in this
+            Read all the items in the change list found later in this
             section to see whether any of them might affect your
             applications. Note particularly any that are marked
+            <emphasis role="bold">Known issue</emphasis> or
             <emphasis role="bold">Incompatible change</emphasis>; these
             result in incompatibilities with earlier versions of MySQL.
           </para>


Modified: trunk/refman-5.0/installing-cs-core.xml
===================================================================
--- trunk/refman-5.0/installing-cs-core.xml	2008-04-23 17:32:38 UTC (rev 10569)
+++ trunk/refman-5.0/installing-cs-core.xml	2008-04-23 20:04:27 UTC (rev 10570)
Changed blocks: 9, Lines Added: 67, Lines Deleted: 61; 10607 bytes

@@ -12886,9 +12886,15 @@
     <para>
       As a general rule, we recommend that when upgrading from one
       release series to another, you should go to the next series rather
-      than skipping a series. For example, if you currently are running
+      than skipping a series. If you wish to upgrade from a release
+      series previous to MySQL &previous-series;, you should upgrade to
+      each successive release series in turn until you have reached
+      MySQL &previous-series;, and then proceed with the upgrade to
+      MySQL &current-series;. For example, if you currently are running
       MySQL 3.23 and wish to upgrade to a newer series, upgrade to MySQL
-      4.0 rather than to 4.1 or 5.0.
+      4.0 first before upgrading to 4.1, and so forth. For information
+      on upgrading from MySQL &previous-series; or earlier releases, see
+      the <citetitle>MySQL 3.23, 4.0, 4.1 Reference Manual</citetitle>.
     </para>
 
     <para>

@@ -12900,26 +12906,22 @@
 
       <listitem>
         <para>
-          Before upgrading from MySQL &previous-series; to
-          &current-series;, read <xref linkend="upgrading-from-4-1"/>)
-          as well as <xref linkend="news"/>. These provide information
-          about features that are new in MySQL &current-series; or
-          differ from those found in MySQL &previous-series;. If you
-          wish to upgrade from a release series previous to MySQL
-          &previous-series;, you should upgrade to each successive
-          release series in turn until you have reached MySQL
-          &previous-series;, and then proceed with the upgrade to MySQL
-          &current-series;. For information on upgrading from MySQL
-          &previous-series; or earlier releases, see the
-          <citetitle>MySQL 3.23, 4.0, 4.1 Reference Manual</citetitle>.
+          Before you perform any upgrade, back up your databases,
+          including the <literal>mysql</literal> database that contains
+          the grant tables.
         </para>
       </listitem>
 
       <listitem>
         <para>
-          Before you perform an upgrade, back up your databases,
-          including the <literal>mysql</literal> database that contains
-          the grant tables.
+          Before upgrading from MySQL &previous-series; to
+          &current-series;, read all the notes in
+          <xref linkend="upgrading-from-4-1"/>. These notes will enable
+          you to identify any upgrade issues that apply to your current
+          MySQL installation. Read <xref linkend="news"/> as well. These
+          notes provide information about features that are new in MySQL
+          &current-series; or differ from those found in MySQL
+          &previous-series;.
         </para>
       </listitem>
 

@@ -12928,19 +12930,19 @@
           Some releases of MySQL introduce incompatible changes to
           tables. (Our aim is to avoid these changes, but occasionally
           they are necessary to correct problems that would be worse
-          than an incompatibility between releases.) Some releases of
-          MySQL introduce changes to the structure of the grant tables
-          to add new privileges or features.
+          than an incompatibility between releases.)
         </para>
 
         <para>
           To avoid problems due to such changes, after you upgrade to a
           new version of MySQL, you should run
-          <command>mysql_upgrade</command> to check your tables (and
-          repair them if necessary), and to update your grant tables to
-          make sure that they have the current structure so that you can
-          take advantage of any new capabilities. See
-          <xref linkend="mysql-upgrade"/>.
+          <command>mysql_upgrade</command> (see
+          <xref linkend="mysql-upgrade"/>). This program will check your
+          tables (and repair them if necessary), and to update your
+          grant tables to make sure that they have the current structure
+          so that you can take advantage of any new capabilities. (Some
+          releases of MySQL introduce changes to the structure of the
+          grant tables to add new privileges or features.)
         </para>
       </listitem>
 

@@ -12992,27 +12994,6 @@
         </para>
       </listitem>
 
-      <listitem>
-        <para>
-          If you have created a user-defined function (UDF) with a given
-          name and upgrade MySQL to a version that implements a new
-          built-in function with the same name, the UDF becomes
-          inaccessible. To correct this, use <literal>DROP
-          FUNCTION</literal> to drop the UDF, and then use
-          <literal>CREATE FUNCTION</literal> to re-create the UDF with a
-          different non-conflicting name. If a new version of MySQL
-          implements a built-in function with the same name as an
-          existing stored function, you have two choices: Rename the
-          stored function to use a non-conflicting name, or change calls
-          to the function so that they use a database qualifier (that
-          is, use
-          <literal><replaceable>db_name</replaceable>.<replaceable>func_name</replaceable>()</literal>
-          syntax). See <xref linkend="function-resolution"/>, for the
-          rules describing how the server interprets references to
-          different kinds of functions.
-        </para>
-      </listitem>
-
     </itemizedlist>
 
     <para>

@@ -13066,13 +13047,13 @@
 
     <section id="upgrading-from-5-0" role="cs">
 
-      <title>Upgrading from MySQL 5.0 to 5.1</title>
+      <title>Upgrading from MySQL 5.0 to 5.0.10 or Higher</title>
       
       &cs-only;
       
       <para>
-        <emphasis role="bold">When upgrading a 5.0 installation to
-        5.0.10 or above</emphasis> note that it is
+        <emphasis role="bold">After upgrading a 5.0 installation to
+        5.0.10 or higher</emphasis>, it is
         <emphasis>necessary</emphasis> to upgrade your grant tables.
         Otherwise, creating stored procedures and functions might not
         work. The procedure for doing this is described in

@@ -13115,16 +13096,17 @@
 
         <listitem>
           <para>
-            Check the items in <xref linkend="upgrade"/>, to see whether
-            any of them might affect your applications.
+            Read all the items in <xref linkend="upgrade"/>, to see
+            whether any of them might affect your applications.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            Check the items in the change lists found later in this
+            Read all the items in the change lists found later in this
             section to see whether any of them might affect your
             applications. Note particularly any that are marked
+            <emphasis role="bold">Known issue</emphasis> or
             <emphasis role="bold">Incompatible change</emphasis>. These
             result in incompatibilities with earlier versions of MySQL,
             and may require your attention <emphasis>before you

@@ -13137,18 +13119,20 @@
             Some releases of MySQL introduce incompatible changes to
             tables. (Our aim is to avoid these changes, but occasionally
             they are necessary to correct problems that would be worse
-            than an incompatibility between releases.) Some releases of
-            MySQL introduce changes to the structure of the grant tables
-            to add new privileges or features.
+            than an incompatibility between releases.)
           </para>
 
           <para>
             To avoid problems due to such changes, after you upgrade to
-            a new version of MySQL, you should check your tables (and
-            repair them if necessary), and update your grant tables to
-            make sure that they have the current structure so that you
-            can take advantage of any new capabilities. See
-            <xref linkend="mysql-upgrade"/>.
+            a new version of MySQL, you should run
+            <command>mysql_upgrade</command> (see
+            <xref linkend="mysql-upgrade"/>). This program will check
+            your tables (and repair them if necessary), and to update
+            your grant tables to make sure that they have the current
+            structure so that you can take advantage of any new
+            capabilities. (Some releases of MySQL introduce changes to
+            the structure of the grant tables to add new privileges or
+            features.)
           </para>
         </listitem>
 

@@ -13472,6 +13456,28 @@
 
         <listitem>
           <para>
+            <emphasis role="bold">Incompatible change</emphasis>: If you
+            have created a user-defined function (UDF) with a given name
+            and upgrade MySQL to a version that implements a new
+            built-in function with the same name, the UDF becomes
+            inaccessible. To correct this, use <literal>DROP
+            FUNCTION</literal> to drop the UDF, and then use
+            <literal>CREATE FUNCTION</literal> to re-create the UDF with
+            a different non-conflicting name. If a new version of MySQL
+            implements a built-in function with the same name as an
+            existing stored function, you have two choices: Rename the
+            stored function to use a non-conflicting name, or change
+            calls to the function so that they use a database qualifier
+            (that is, use
+            <literal><replaceable>db_name</replaceable>.<replaceable>func_name</replaceable>()</literal>
+            syntax). See <xref linkend="function-resolution"/>, for the
+            rules describing how the server interprets references to
+            different kinds of functions.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
             <emphasis role="bold">Incompatible change:</emphasis> The
             parser accepted statements that contained <literal>/* ...
             */</literal> that were not properly closed with

@@ -13550,7 +13556,7 @@
           </para>
 
           <para>
-            When upgrading from a previous version of MySQL 5 to MySQL
+            After upgrading from a previous version of MySQL 5 to MySQL
             5.0.10 or newer, you must drop all triggers and re-create
             them or <literal>DROP TRIGGER</literal> will not work after
             the upgrade. Here is a suggested procedure for doing this:


Modified: trunk/refman-5.0/programs-installation.xml
===================================================================
--- trunk/refman-5.0/programs-installation.xml	2008-04-23 17:32:38 UTC (rev 10569)
+++ trunk/refman-5.0/programs-installation.xml	2008-04-23 20:04:27 UTC (rev 10570)
Changed blocks: 1, Lines Added: 11, Lines Deleted: 0; 940 bytes

@@ -1363,6 +1363,17 @@
         <option>--force</option> option.
       </para>
 
+      <caution>
+        <para>
+          Some upgrade incompatibilities may require special handling
+          <emphasis>before</emphasis> you upgrade your MySQL
+          installation and run <command>mysql_upgrade</command>. See
+          <xref linkend="id"/>, for instructions on determining whether
+          any such incompatibilies apply to your installation and how to
+          handle them.
+        </para>
+      </caution>
+
       <para>
         To check and repair tables and to upgrade the system tables,
         <command>mysql_upgrade</command> executes the following


Modified: trunk/refman-5.1/installing-core.xml
===================================================================
--- trunk/refman-5.1/installing-core.xml	2008-04-23 17:32:38 UTC (rev 10569)
+++ trunk/refman-5.1/installing-core.xml	2008-04-23 20:04:27 UTC (rev 10570)
Changed blocks: 8, Lines Added: 52, Lines Deleted: 48; 8928 bytes

@@ -12179,9 +12179,17 @@
     <para>
       As a general rule, we recommend that when you upgrade from one
       release series to another, you should go to the next series rather
-      than skipping a series. For example, if you currently are running
+      than skipping a series. If you wish to upgrade from a release
+      series previous to MySQL &previous-series;, you should upgrade to
+      each successive release series in turn until you have reached
+      MySQL &previous-series;, and then proceed with the upgrade to
+      MySQL &current-series;. For example, if you currently are running
       MySQL 4.0 and wish to upgrade to a newer series, upgrade to MySQL
-      4.1 rather than to 5.0 or 5.1.
+      4.1 first before upgrading to 5.0, and so forth. For information
+      on upgrading from MySQL &previous-series;, see the
+      <citetitle>&title-refman-previous;</citetitle>; for earlier
+      releases, see the <citetitle>MySQL 3.23, 4.0, 4.1 Reference
+      Manual</citetitle>.
     </para>
 
     <para>

@@ -12193,28 +12201,22 @@
 
       <listitem>
         <para>
-          Before upgrading from MySQL &previous-series; to
-          &current-series;, read <xref linkend="upgrading-from-5-0"/>,
-          as well as <xref linkend="news"/>. These provide information
-          about features that are new in MySQL &current-series; or
-          differ from those found in MySQL &previous-series;. If you
-          wish to upgrade from a release series previous to MySQL
-          &previous-series;, you should upgrade to each successive
-          release series in turn until you have reached MySQL
-          &previous-series;, and then proceed with the upgrade to MySQL
-          &current-series;. For information on upgrading from MySQL
-          &previous-series;, see the
-          <citetitle>&title-refman-previous;</citetitle>; for earlier
-          releases, see the <citetitle>MySQL 3.23, 4.0, 4.1 Reference
-          Manual</citetitle>.
+          Before you perform any upgrade, back up your databases,
+          including the <literal>mysql</literal> database that contains
+          the grant tables.
         </para>
       </listitem>
 
       <listitem>
         <para>
-          Before you perform an upgrade, back up your databases,
-          including the <literal>mysql</literal> database that contains
-          the grant tables.
+          Before upgrading from MySQL &previous-series; to
+          &current-series;, read all the notes in
+          <xref linkend="upgrading-from-5-0"/>. These notes will enable
+          you to identify any upgrade issues that apply to your current
+          MySQL installation. Read <xref linkend="news"/> as well. These
+          notes provide information about features that are new in MySQL
+          &current-series; or differ from those found in MySQL
+          &previous-series;.
         </para>
       </listitem>
 

@@ -12223,18 +12225,19 @@
           Some releases of MySQL introduce incompatible changes to
           tables. (Our aim is to avoid these changes, but occasionally
           they are necessary to correct problems that would be worse
-          than an incompatibility between releases.) Some releases of
-          MySQL introduce changes to the structure of the grant tables
-          to add new privileges or features.
+          than an incompatibility between releases.)
         </para>
 
         <para>
           To avoid problems due to such changes, after you upgrade to a
-          new version of MySQL, you should check your tables (and repair
-          them if necessary), and update your grant tables to make sure
-          that they have the current structure so that you can take
-          advantage of any new capabilities. See
-          <xref linkend="mysql-upgrade"/>.
+          new version of MySQL, you should run
+          <command>mysql_upgrade</command> (see
+          <xref linkend="mysql-upgrade"/>). This program will check your
+          tables (and repair them if necessary), and to update your
+          grant tables to make sure that they have the current structure
+          so that you can take advantage of any new capabilities. (Some
+          releases of MySQL introduce changes to the structure of the
+          grant tables to add new privileges or features.)
         </para>
       </listitem>
 

@@ -12356,12 +12359,11 @@
       </indexterm>
 
       <para>
-        <emphasis role="bold">When upgrading a 5.0 installation to
-        5.0.10 or above</emphasis> note that it is
-        <emphasis>necessary</emphasis> to upgrade your grant tables.
-        Otherwise, creating stored procedures and functions might not
-        work. The procedure for doing this is described in
-        <xref linkend="mysql-upgrade"/>.
+        <emphasis role="bold">After upgrading a 5.0 installation to
+        5.0.10 or above</emphasis>, it is <emphasis>necessary</emphasis>
+        to upgrade your grant tables. Otherwise, creating stored
+        procedures and functions might not work. The procedure for doing
+        this is described in <xref linkend="mysql-upgrade"/>.
       </para>
 
       <note>

@@ -12384,16 +12386,17 @@
 
         <listitem>
           <para>
-            Check the items in <xref linkend="upgrade"/>, to see whether
-            any of them might affect your applications.
+            Read all the items in <xref linkend="upgrade"/>, to see
+            whether any of them might affect your applications.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            Check the items in the change lists found later in this
+            Read all the items in the change lists found later in this
             section to see whether any of them might affect your
             applications. Note particularly any that are marked
+            <emphasis role="bold">Known issue</emphasis> or
             <emphasis role="bold">Incompatible change</emphasis>. These
             result in incompatibilities with earlier versions of MySQL,
             and may require your attention <emphasis>before you

@@ -12406,19 +12409,20 @@
             Some releases of MySQL introduce incompatible changes to
             tables. (Our aim is to avoid these changes, but occasionally
             they are necessary to correct problems that would be worse
-            than an incompatibility between releases.) Some releases of
-            MySQL introduce changes to the structure of the grant tables
-            to add new privileges or features.
+            than an incompatibility between releases.)
           </para>
 
           <para>
             To avoid problems due to such changes, after you upgrade to
             a new version of MySQL, you should run
-            <command>mysql_upgrade</command> to check your tables (and
-            repair them if necessary), and to update your grant tables
-            to make sure that they have the current structure so that
-            you can take advantage of any new capabilities. See
-            <xref linkend="mysql-upgrade"/>.
+            <command>mysql_upgrade</command> (see
+            <xref linkend="mysql-upgrade"/>). This program will check
+            your tables (and repair them if necessary), and to update
+            your grant tables to make sure that they have the current
+            structure so that you can take advantage of any new
+            capabilities. (Some releases of MySQL introduce changes to
+            the structure of the grant tables to add new privileges or
+            features.)
           </para>
         </listitem>
 

@@ -12545,7 +12549,7 @@
             allows the loading and unloading of components at runtime,
             without restarting the server. <xref linkend="plugin-api"/>.
             The plugin API requires the <literal>mysql.plugin</literal>
-            table. When upgrading from an older version of MySQL, you
+            table. After upgrading from an older version of MySQL, you
             should run the <command>mysql_upgrade</command> command to
             create this table. See <xref linkend="mysql-upgrade"/>.
           </para>

@@ -12810,9 +12814,9 @@
             <emphasis role="bold">Incompatible change</emphasis>: The
             structure of <literal>FULLTEXT</literal> indexes has been
             changed in MySQL 5.1.6. After upgrading to MySQL 5.1.6 or
-            greater, call the <literal>REPAIR TABLE</literal> statement
-            for each table that contains any <literal>FULLTEXT</literal>
-            indexes.
+            greater, use the <literal>REPAIR TABLE ... QUICK</literal>
+            statement for each table that contains any
+            <literal>FULLTEXT</literal> indexes.
           </para>
         </listitem>
 


Modified: trunk/refman-5.1/programs-installation.xml
===================================================================
--- trunk/refman-5.1/programs-installation.xml	2008-04-23 17:32:38 UTC (rev 10569)
+++ trunk/refman-5.1/programs-installation.xml	2008-04-23 20:04:27 UTC (rev 10570)
Changed blocks: 1, Lines Added: 11, Lines Deleted: 0; 940 bytes

@@ -1220,6 +1220,17 @@
         <option>--force</option> option.
       </para>
 
+      <caution>
+        <para>
+          Some upgrade incompatibilities may require special handling
+          <emphasis>before</emphasis> you upgrade your MySQL
+          installation and run <command>mysql_upgrade</command>. See
+          <xref linkend="id"/>, for instructions on determining whether
+          any such incompatibilies apply to your installation and how to
+          handle them.
+        </para>
+      </caution>
+
       <para>
         To check and repair tables and to upgrade the system tables,
         <command>mysql_upgrade</command> executes the following


Modified: trunk/refman-6.0/installing-core.xml
===================================================================
--- trunk/refman-6.0/installing-core.xml	2008-04-23 17:32:38 UTC (rev 10569)
+++ trunk/refman-6.0/installing-core.xml	2008-04-23 20:04:27 UTC (rev 10570)
Changed blocks: 5, Lines Added: 44, Lines Deleted: 37; 6993 bytes

@@ -12211,7 +12211,17 @@
       release series to another, you should go to the next series rather
       than skipping a series. For example, if you currently are running
       MySQL 4.0 and wish to upgrade to a newer series, upgrade to MySQL
-      4.1 rather than to 5.0 or 5.1.
+      4.1 rather than to 5.0 or 5.1. If you wish to upgrade from a
+      release series previous to MySQL &previous-series;, you should
+      upgrade to each successive release series in turn until you have
+      reached MySQL &previous-series;, and then proceed with the upgrade
+      to MySQL &current-series;. For example, if you currently are
+      running MySQL 4.1 and wish to upgrade to a newer series, upgrade
+      to MySQL 5.0 first before upgrading to 4.1, and so forth. For
+      information on upgrading from MySQL &previous-series;, see the
+      <citetitle>&title-refman-previous;</citetitle>; for earlier
+      releases, see the <citetitle>MySQL 3.23, 4.0, 4.1 Reference
+      Manual</citetitle>.
     </para>
 
     <para>

@@ -12223,28 +12233,22 @@
 
       <listitem>
         <para>
-          Before upgrading from MySQL &previous-series; to
-          &current-series;, read <xref linkend="upgrading-from-5-1"/>,
-          as well as <xref linkend="news"/>. These provide information
-          about features that are new in MySQL &current-series; or
-          differ from those found in MySQL &previous-series;. If you
-          wish to upgrade from a release series previous to MySQL
-          &previous-series;, you should upgrade to each successive
-          release series in turn until you have reached MySQL
-          &previous-series;, and then proceed with the upgrade to MySQL
-          &current-series;. For information on upgrading from MySQL
-          &previous-series;, see the
-          <citetitle>&title-refman-previous;</citetitle>; for earlier
-          releases, see the <citetitle>MySQL 3.23, 4.0, 4.1 Reference
-          Manual</citetitle>.
+          Before you perform any upgrade, back up your databases,
+          including the <literal>mysql</literal> database that contains
+          the grant tables.
         </para>
       </listitem>
 
       <listitem>
         <para>
-          Before you perform an upgrade, back up your databases,
-          including the <literal>mysql</literal> database that contains
-          the grant tables.
+          Before upgrading from MySQL &previous-series; to
+          &current-series;, read all the notes in
+          <xref linkend="upgrading-from-5-1"/>. These notes will enable
+          you to identify any upgrade issues that apply to your current
+          MySQL installation. Read <xref linkend="news"/> as well. These
+          notes provide information about features that are new in MySQL
+          &current-series; or differ from those found in MySQL
+          &previous-series;.
         </para>
       </listitem>
 

@@ -12253,18 +12257,19 @@
           Some releases of MySQL introduce incompatible changes to
           tables. (Our aim is to avoid these changes, but occasionally
           they are necessary to correct problems that would be worse
-          than an incompatibility between releases.) Some releases of
-          MySQL introduce changes to the structure of the grant tables
-          to add new privileges or features.
+          than an incompatibility between releases.)
         </para>
 
         <para>
           To avoid problems due to such changes, after you upgrade to a
-          new version of MySQL, you should check your tables (and repair
-          them if necessary), and update your grant tables to make sure
-          that they have the current structure so that you can take
-          advantage of any new capabilities. See
-          <xref linkend="mysql-upgrade"/>.
+          new version of MySQL, you should run
+          <command>mysql_upgrade</command> (see
+          <xref linkend="mysql-upgrade"/>). This program will check your
+          tables (and repair them if necessary), and to update your
+          grant tables to make sure that they have the current structure
+          so that you can take advantage of any new capabilities. (Some
+          releases of MySQL introduce changes to the structure of the
+          grant tables to add new privileges or features.)
         </para>
       </listitem>
 

@@ -12395,16 +12400,17 @@
 
         <listitem>
           <para>
-            Check the items in <xref linkend="upgrade"/>, to see whether
-            any of them might affect your applications.
+            Read all the items in <xref linkend="upgrade"/>, to see
+            whether any of them might affect your applications.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            Check the items in the change lists found later in this
+            Read all the items in the change lists found later in this
             section to see whether any of them might affect your
             applications. Note particularly any that are marked
+            <emphasis role="bold">Known issue</emphasis> or
             <emphasis role="bold">Incompatible change</emphasis>. These
             result in incompatibilities with earlier versions of MySQL,
             and may require your attention <emphasis>before you

@@ -12417,19 +12423,20 @@
             Some releases of MySQL introduce incompatible changes to
             tables. (Our aim is to avoid these changes, but occasionally
             they are necessary to correct problems that would be worse
-            than an incompatibility between releases.) Some releases of
-            MySQL introduce changes to the structure of the grant tables
-            to add new privileges or features.
+            than an incompatibility between releases.)
           </para>
 
           <para>
             To avoid problems due to such changes, after you upgrade to
             a new version of MySQL, you should run
-            <command>mysql_upgrade</command> to check your tables (and
-            repair them if necessary), and to update your grant tables
-            to make sure that they have the current structure so that
-            you can take advantage of any new capabilities. See
-            <xref linkend="mysql-upgrade"/>.
+            <command>mysql_upgrade</command> (see
+            <xref linkend="mysql-upgrade"/>). This program will check
+            your tables (and repair them if necessary), and to update
+            your grant tables to make sure that they have the current
+            structure so that you can take advantage of any new
+            capabilities. (Some releases of MySQL introduce changes to
+            the structure of the grant tables to add new privileges or
+            features.)
           </para>
         </listitem>
 


Modified: trunk/refman-6.0/programs-installation.xml
===================================================================
--- trunk/refman-6.0/programs-installation.xml	2008-04-23 17:32:38 UTC (rev 10569)
+++ trunk/refman-6.0/programs-installation.xml	2008-04-23 20:04:27 UTC (rev 10570)
Changed blocks: 1, Lines Added: 11, Lines Deleted: 0; 940 bytes

@@ -1213,6 +1213,17 @@
         <option>--force</option> option.
       </para>
 
+      <caution>
+        <para>
+          Some upgrade incompatibilities may require special handling
+          <emphasis>before</emphasis> you upgrade your MySQL
+          installation and run <command>mysql_upgrade</command>. See
+          <xref linkend="id"/>, for instructions on determining whether
+          any such incompatibilies apply to your installation and how to
+          handle them.
+        </para>
+      </caution>
+
       <para>
         To check and repair tables and to upgrade the system tables,
         <command>mysql_upgrade</command> executes the following


Thread
svn commit - mysqldoc@docsrva: r10570 - in trunk: . dynamic-docs/changelog it/refman-5.1 pt/refman-5.1 refman-4.1 refman-5.0 refman-5.1 refman-6.0paul23 Apr