Author: paul
Date: 2006-01-31 04:56:32 +0100 (Tue, 31 Jan 2006)
New Revision: 1145
Log:
r6964@frost: paul | 2006-01-30 21:54:58 -0600
General revisions.
Modified:
trunk/
trunk/refman-4.1/installing.xml
trunk/refman-5.0/installing.xml
trunk/refman-5.1/installing.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6963
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2719
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6964
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2719
Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml 2006-01-31 03:55:49 UTC (rev 1144)
+++ trunk/refman-4.1/installing.xml 2006-01-31 03:56:32 UTC (rev 1145)
@@ -9968,7 +9968,7 @@
script that is used on Unix. Regarding passwords, if you
installed MySQL using the Windows Installation Wizard, you may
have already assigned passwords to the accounts. (See
- <xref linkend="mysql-install-wizard"/>.) Otherwise, use the
+ <xref linkend="windows-install-wizard"/>.) Otherwise, use the
password-assignment procedure given in
<xref linkend="default-privileges"/>.
</para>
@@ -11981,7 +11981,7 @@
</para>
<para>
- The following items form a checklist of things you should do
+ The following items form a checklist of things that you should do
whenever you perform an upgrade:
</para>
@@ -11997,25 +11997,27 @@
<listitem>
<para>
- Before you do an upgrade, back up your databases.
+ Before you perform an upgrade, back up your databases,
+ including the <literal>mysql</literal> database that contains
+ the grant tables.
</para>
</listitem>
<listitem>
<para>
- If you are running MySQL Server on Windows, see
- <xref linkend="windows-upgrading"/>.
+ 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
+ <xref linkend="mysql-fix-privilege-tables"/>.
</para>
</listitem>
<listitem>
<para>
- An upgrade may involve changes to the grant tables that are
- stored in the <literal>mysql</literal> database. Occasionally
- new columns or tables are added to support new features. To
- take advantage of these features, be sure that your grant
- tables are up to date. The upgrade procedure is described in
- <xref linkend="mysql-fix-privilege-tables"/>.
+ If you are running MySQL Server on Windows, see
+ <xref linkend="windows-upgrading"/>.
</para>
</listitem>
@@ -12029,13 +12031,14 @@
<listitem>
<para>
- If you install a MySQL-Max distribution that includes a server
- named <command>mysqld-max</command>, and then upgrade later to
- a non-Max version of MySQL, <command>mysqld_safe</command>
- still attempts to run the old <command>mysqld-max</command>
- server. If you perform such an upgrade, you should manually
- remove the old <command>mysqld-max</command> server to ensure
- that <command>mysqld_safe</command> runs the new
+ If you previously installed a MySQL-Max distribution that
+ includes a server named <command>mysqld-max</command>, and
+ then upgrade later to a non-Max version of MySQL,
+ <command>mysqld_safe</command> still attempts to run the old
+ <command>mysqld-max</command> server. If you perform such an
+ upgrade, you should remove the old
+ <command>mysqld-max</command> server manually to ensure that
+ <command>mysqld_safe</command> runs the new
<command>mysqld</command> server.
</para>
</listitem>
@@ -12095,9 +12098,9 @@
<filename>my.cnf</filename> file from your previous installation.
You can check this with the <option>--print-defaults</option>
option (for example, <command>mysqld --print-defaults</command>).
- If this displays anything other than the program name, you have an
- active <filename>my.cnf</filename> file that affects server or
- client operation.
+ If this command displays anything other than the program name, you
+ have an active <filename>my.cnf</filename> file that affects
+ server or client operation.
</para>
<para>
@@ -12126,7 +12129,7 @@
<para>
<emphasis role="bold">Note</emphasis>: It is good practice to
back up your data before installing any new version of software.
- Although MySQL worked very hard to ensure a high level of
+ Although MySQL works very hard to ensure a high level of
quality, you should protect your data by making a backup. MySQL
generally recommends that you dump and reload your tables from
any previous version to upgrade to 4.1.
@@ -12141,10 +12144,10 @@
<listitem>
<para>
- Check the items in the change list found later in this
+ Check 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">Incompatible change</emphasis>; these
+ <emphasis role="bold">Incompatible change</emphasis>. These
result in incompatibilities with earlier versions of MySQL
and you should consider the implications of these
incompatibilities <emphasis>before you upgrade</emphasis>.
Modified: trunk/refman-5.0/installing.xml
===================================================================
--- trunk/refman-5.0/installing.xml 2006-01-31 03:55:49 UTC (rev 1144)
+++ trunk/refman-5.0/installing.xml 2006-01-31 03:56:32 UTC (rev 1145)
@@ -9809,7 +9809,7 @@
script that is used on Unix. Regarding passwords, if you
installed MySQL using the Windows Installation Wizard, you may
have already assigned passwords to the accounts. (See
- <xref linkend="mysql-install-wizard"/>.) Otherwise, use the
+ <xref linkend="windows-install-wizard"/>.) Otherwise, use the
password-assignment procedure given in
<xref linkend="default-privileges"/>.
</para>
@@ -11795,11 +11795,11 @@
release series to another, you should go to the next series rather
than skipping a 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 &previous-series; or ¤t-series;.
+ 4.0 rather than to 4.1 or 5.0.
</para>
<para>
- The following items form a checklist of things you should do
+ The following items form a checklist of things that you should do
whenever you perform an upgrade:
</para>
@@ -11818,44 +11818,41 @@
Before upgrading from MySQL &previous-series; to
¤t-series;, read <xref linkend="upgrading-from-4-1"/>)
as well as <xref linkend="news"/>. These provide information
- about features that are new or different in MySQL
- ¤t-series; as opposed to 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 next release series in turn until you have reached
- MySQL &previous-series;, and then proceed with the upgrade to
- MySQL ¤t-series;. For information on upgrading from
- MySQL &previous-series; or earlier releases, see the
+ about features that are new in MySQL ¤t-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
+ ¤t-series;. For information on upgrading from MySQL
+ &previous-series; or earlier releases, see the
<citetitle>&title-refman-4-1;</citetitle>.
</para>
</listitem>
<listitem>
<para>
- Before you perform an upgrade, back up your databases.
+ Before you perform an upgrade, back up your databases,
+ including the <literal>mysql</literal> database that contains
+ the grant tables.
</para>
</listitem>
<listitem>
<para>
- If you are running MySQL Server on Windows, see
- <xref linkend="windows-upgrading"/>.
+ 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
+ <xref linkend="mysql-fix-privilege-tables"/>.
</para>
</listitem>
<listitem>
<para>
- An upgrade to MySQL ¤t-series; from &previous-series;
- involves changes to the grant tables that are stored in the
- <literal>mysql</literal> database; columns and tables were
- added to support new features. To take advantage of these
- features, be sure that your grant tables are up to date. The
- procedure for upgrading the grant tables is described in
- <xref linkend="mysql-fix-privilege-tables"/>. You may want to
- use <command>mysqldump</command> to dump your tables before
- upgrading; after upgrading, you can reload the dump file using
- <command>mysql</command> or <literal>mysqlimport</literal> to
- re-create and repopulate your tables.
+ If you are running MySQL Server on Windows, see
+ <xref linkend="windows-upgrading"/>.
</para>
</listitem>
@@ -11869,13 +11866,14 @@
<listitem>
<para>
- If you install a MySQL-Max distribution that includes a server
- named <command>mysqld-max</command>, and then upgrade later to
- a non-Max version of MySQL, <command>mysqld_safe</command>
- still attempts to run the old <command>mysqld-max</command>
- server. If you perform such an upgrade, you should remove the
- old <command>mysqld-max</command> server manually to ensure
- that <command>mysqld_safe</command> runs the new
+ If you previously installed a MySQL-Max distribution that
+ includes a server named <command>mysqld-max</command>, and
+ then upgrade later to a non-Max version of MySQL,
+ <command>mysqld_safe</command> still attempts to run the old
+ <command>mysqld-max</command> server. If you perform such an
+ upgrade, you should remove the old
+ <command>mysqld-max</command> server manually to ensure that
+ <command>mysqld_safe</command> runs the new
<command>mysqld</command> server.
</para>
</listitem>
@@ -11924,9 +11922,9 @@
<filename>my.cnf</filename> file from your previous installation.
You can check this with the <option>--print-defaults</option>
option (for example, <command>mysqld --print-defaults</command>).
- If this displays anything other than the program name, you have an
- active <filename>my.cnf</filename> file that affects server or
- client operation.
+ If this command displays anything other than the program name, you
+ have an active <filename>my.cnf</filename> file that affects
+ server or client operation.
</para>
<para>
@@ -11944,11 +11942,9 @@
<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 run
- <command>mysql_fix_privilege_tables</command> (or the
- <filename>mysql_fix_privilege_tables.sql</filename> script on
- Windows). Otherwise, creating stored procedures might not work.
- The procedure for doing this is described in
+ <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-fix-privilege-tables"/>.
</para>
@@ -11971,7 +11967,7 @@
<para>
<emphasis role="bold">Note</emphasis>: It is good practice to
back up your data before installing any new version of software.
- Although MySQL worked very hard to ensure a high level of
+ Although MySQL works very hard to ensure a high level of
quality, you should protect your data by making a backup. MySQL
generally recommends that you dump and reload your tables from
any previous version to upgrade to ¤t-series;.
@@ -11986,10 +11982,10 @@
<listitem>
<para>
- Check the items in the change list found later in this
+ Check 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">Incompatible change</emphasis>; these
+ <emphasis role="bold">Incompatible change</emphasis>. These
result in incompatibilities with earlier versions of MySQL,
and may require your attention <emphasis>before you
upgrade</emphasis>.
@@ -12054,7 +12050,7 @@
</para>
<para>
- The following list describes changes that may affect
+ The following lists describe changes that may affect
applications and that you should watch out for when upgrading to
version ¤t-series;.
</para>
Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml 2006-01-31 03:55:49 UTC (rev 1144)
+++ trunk/refman-5.1/installing.xml 2006-01-31 03:56:32 UTC (rev 1145)
@@ -9805,7 +9805,7 @@
script that is used on Unix. Regarding passwords, if you
installed MySQL using the Windows Installation Wizard, you may
have already assigned passwords to the accounts. (See
- <xref linkend="mysql-install-wizard"/>.) Otherwise, use the
+ <xref linkend="windows-install-wizard"/>.) Otherwise, use the
password-assignment procedure given in
<xref linkend="default-privileges"/>.
</para>
@@ -11787,15 +11787,15 @@
</indexterm>
<para>
- As a general rule, we recommend that when upgrading from one
+ 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
- MySQL 3.23 and wish to upgrade to a newer series, upgrade to MySQL
- 4.0 rather than to &previous-series; or ¤t-series;.
+ MySQL 4.0 and wish to upgrade to a newer series, upgrade to MySQL
+ 4.1 rather than to 5.0 or 5.1.
</para>
<para>
- The following items form a checklist of things you should do
+ The following items form a checklist of things that you should do
whenever you perform an upgrade:
</para>
@@ -11814,45 +11814,42 @@
Before upgrading from MySQL &previous-series; to
¤t-series;, read <xref linkend="upgrading-from-5-0"/>,
as well as <xref linkend="news"/>. These provide information
- about features that are new or different in MySQL
- ¤t-series; as opposed to 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 next release series in turn until you have reached
- MySQL &previous-series;, and then proceed with the upgrade to
- MySQL ¤t-series;. For information on upgrading from
- MySQL &previous-series;, see the
- <citetitle>&title-refman-previous;</citetitle>; for ealrier
+ about features that are new in MySQL ¤t-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
+ ¤t-series;. For information on upgrading from MySQL
+ &previous-series;, see the
+ <citetitle>&title-refman-previous;</citetitle>; for earlier
releases, see the <citetitle>&title-refman-4-1;</citetitle>.
</para>
</listitem>
<listitem>
<para>
- Before you perform an upgrade, back up your databases.
+ Before you perform an upgrade, back up your databases,
+ including the <literal>mysql</literal> database that contains
+ the grant tables.
</para>
</listitem>
<listitem>
<para>
- If you are running MySQL Server on Windows, see
- <xref linkend="windows-upgrading"/>.
+ 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
+ <xref linkend="mysql-fix-privilege-tables"/>.
</para>
</listitem>
<listitem>
<para>
- An upgrade to MySQL ¤t-series; from &previous-series;
- involves changes to the grant tables that are stored in the
- <literal>mysql</literal> database; columns and tables were
- added to support new features. To take advantage of these
- features, be sure that your grant tables are up to date. The
- procedure for upgrading the grant tables is described in
- <xref linkend="mysql-fix-privilege-tables"/>. You may want to
- use <command>mysqldump</command> to dump your tables before
- upgrading; after upgrading, you can reload the dump file using
- <command>mysql</command> or <literal>mysqlimport</literal> to
- re-create and repopulate your tables.
+ If you are running MySQL Server on Windows, see
+ <xref linkend="windows-upgrading"/>.
</para>
</listitem>
@@ -11866,13 +11863,14 @@
<listitem>
<para>
- If you install a MySQL-Max distribution that includes a server
- named <command>mysqld-max</command>, and then upgrade later to
- a non-Max version of MySQL, <command>mysqld_safe</command>
- still attempts to run the old <command>mysqld-max</command>
- server. If you perform such an upgrade, you should remove the
- old <command>mysqld-max</command> server manually to ensure
- that <command>mysqld_safe</command> runs the new
+ If you previously installed a MySQL-Max distribution that
+ includes a server named <command>mysqld-max</command>, and
+ then upgrade later to a non-Max version of MySQL,
+ <command>mysqld_safe</command> still attempts to run the old
+ <command>mysqld-max</command> server. If you perform such an
+ upgrade, you should remove the old
+ <command>mysqld-max</command> server manually to ensure that
+ <command>mysqld_safe</command> runs the new
<command>mysqld</command> server.
</para>
</listitem>
@@ -11921,9 +11919,9 @@
<filename>my.cnf</filename> file from your previous installation.
You can check this with the <option>--print-defaults</option>
option (for example, <command>mysqld --print-defaults</command>).
- If this displays anything other than the program name, you have an
- active <filename>my.cnf</filename> file that affects server or
- client operation.
+ If this command displays anything other than the program name, you
+ have an active <filename>my.cnf</filename> file that affects
+ server or client operation.
</para>
<para>
@@ -11951,18 +11949,16 @@
<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 run
- <command>mysql_fix_privilege_tables</command> (or the
- <filename>mysql_fix_privilege_tables.sql</filename> script on
- Windows). Otherwise, creating stored procedures might not work.
- The procedure for doing this is described in
+ <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-fix-privilege-tables"/>.
</para>
<para>
<emphasis role="bold">Note</emphasis>: It is good practice to
back up your data before installing any new version of software.
- Although MySQL worked very hard to ensure a high level of
+ Although MySQL works very hard to ensure a high level of
quality, you should protect your data by making a backup. MySQL
generally recommends that you dump and reload your tables from
any previous version to upgrade to ¤t-series;.
@@ -11977,10 +11973,10 @@
<listitem>
<para>
- Check the items in the change list found later in this
+ Check 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">Incompatible change</emphasis>; these
+ <emphasis role="bold">Incompatible change</emphasis>. These
result in incompatibilities with earlier versions of MySQL,
and may require your attention <emphasis>before you
upgrade</emphasis>.
@@ -12013,7 +12009,7 @@
</itemizedlist>
<para>
- The following list describes changes that may affect
+ The following lists describe changes that may affect
applications and that you should watch out for when upgrading to
version ¤t-series;.
</para>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r1145 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 31 Jan |
