Author: paul
Date: 2006-01-24 06:19:01 +0100 (Tue, 24 Jan 2006)
New Revision: 1014
Log:
r6624@frost: paul | 2006-01-23 23:17:20 -0600
General revisions.
Modified:
trunk/
trunk/refman-4.1/database-administration.xml
trunk/refman-4.1/extending-mysql.xml
trunk/refman-4.1/installing.xml
trunk/refman-4.1/renamed-nodes.txt
trunk/refman-4.1/sql-syntax.xml
trunk/refman-5.0/database-administration.xml
trunk/refman-5.0/extending-mysql.xml
trunk/refman-5.0/installing.xml
trunk/refman-5.0/renamed-nodes.txt
trunk/refman-5.0/sql-syntax.xml
trunk/refman-5.0/stored-procedures.xml
trunk/refman-5.0/views.xml
trunk/refman-5.1/database-administration.xml
trunk/refman-5.1/extending-mysql.xml
trunk/refman-5.1/installing.xml
trunk/refman-5.1/renamed-nodes.txt
trunk/refman-5.1/sql-syntax.xml
trunk/refman-5.1/stored-procedures.xml
trunk/refman-5.1/views.xml
trunk/refman-common/news-5.0.xml
trunk/refman-common/news-5.1.xml
trunk/refman-common/titles.en.ent
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6621
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2449
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6624
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2449
Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml 2006-01-24 04:51:18 UTC (rev 1013)
+++ trunk/refman-4.1/database-administration.xml 2006-01-24 05:19:01 UTC (rev 1014)
@@ -7150,7 +7150,7 @@
</para>
<para>
- The number of seconds the server has been up.
+ The number of seconds that the server has been up.
</para>
</listitem>
@@ -7757,9 +7757,9 @@
SQL threads, if active, are stopped before client threads
are marked as killed. The SQL thread is allowed to finish
its current statement (to avoid causing replication
- problems) then stops. If the SQL thread was in the middle
- of a transaction at this point, the transaction is rolled
- back.
+ problems), and then stops. If the SQL thread was in the
+ middle of a transaction at this point, the transaction is
+ rolled back.
</para>
</listitem>
@@ -9491,6 +9491,16 @@
<primary><command>mysql_fix_privilege_tables</command></primary>
</indexterm>
+ <indexterm>
+ <primary>upgrading</primary>
+ <secondary>grant tables</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>grant tables</primary>
+ <secondary>upgrading</secondary>
+ </indexterm>
+
<refmeta>
<refentrytitle><command>mysql_fix_privilege_tables</command></refentrytitle>
@@ -9520,11 +9530,13 @@
<para>
Some releases of MySQL introduce changes to the structure of
the system tables in the <literal>mysql</literal> database to
- add new privileges or features. When you update to a new
- version of MySQL, you should update your system tables as well
- to make sure that their structure is up to date. First make a
- backup of your <literal>mysql</literal> database, and then use
- the following procedure.
+ add new privileges or support new features. When you update to
+ a new version of MySQL, you should update your system tables
+ as well to make sure that their structure is up to date.
+ Otherwise, there might be capabilities that you cannot take
+ advantage of. First, make a backup of your
+ <literal>mysql</literal> database, and then use the following
+ procedure.
</para>
<para>
@@ -9588,13 +9600,13 @@
</programlisting>
<para>
- If your installation is located in some other directory,
- adjust the pathnames appropriately.
+ The <command>mysql</command> command will prompt you for the
+ <literal>root</literal> password; enter it when prompted.
</para>
<para>
- The <command>mysql</command> command will prompt you for the
- <literal>root</literal> password; enter it when prompted.
+ If your installation is located in some other directory,
+ adjust the pathnames appropriately.
</para>
<para>
@@ -9609,11 +9621,6 @@
After running the script, stop the server and restart it.
</para>
- <para>
- For additional information, see
- <xref linkend="upgrading-grant-tables"/>.
- </para>
-
</refsection>
</refentry>
@@ -13192,7 +13199,7 @@
occasionally when new capabilities are added, so after an
upgrade you should always make sure that your tables have
the current structure. For instructions, see
- <xref linkend="upgrading-grant-tables"/>.
+ <xref linkend="mysql-fix-privilege-tables"/>.
</para>
</listitem>
@@ -15192,7 +15199,8 @@
<literal>max_connections</literal>, and
<literal>max_user_connections</literal> columns. If your
<literal>user</literal> table does not have these columns, it
- must be upgraded; see <xref linkend="upgrading-grant-tables"/>.
+ must be upgraded; see
+ <xref linkend="mysql-fix-privilege-tables"/>.
</para>
<para>
@@ -15789,7 +15797,7 @@
<literal>mysql.user</literal> table. This is necessary if
your grant tables date from a version prior to MySQL
4.0.0. The upgrade procedure is described in
- <xref linkend="upgrading-grant-tables"/>.
+ <xref linkend="mysql-fix-privilege-tables"/>.
</para>
</listitem>
@@ -19786,7 +19794,7 @@
You must do so manually. (If you are upgrading to MySQL 4.1.3 or
later from an earlier version, you should create the tables by
upgrading your <literal>mysql</literal> database. Use the
- instructions in <xref linkend="upgrading-grant-tables"/>.)
+ instructions in <xref linkend="mysql-fix-privilege-tables"/>.)
</para>
<para>
Modified: trunk/refman-4.1/extending-mysql.xml
===================================================================
--- trunk/refman-4.1/extending-mysql.xml 2006-01-24 04:51:18 UTC (rev 1013)
+++ trunk/refman-4.1/extending-mysql.xml 2006-01-24 05:19:01 UTC (rev 1014)
@@ -721,7 +721,7 @@
function's name, type, and shared library name. If you do not
have this table, you should run the
<command>mysql_fix_privilege_tables</command> script to create
- it. See <xref linkend="upgrading-grant-tables"/>.
+ it. See <xref linkend="mysql-fix-privilege-tables"/>.
</para>
<remark role="help-description-end"/>
Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml 2006-01-24 04:51:18 UTC (rev 1013)
+++ trunk/refman-4.1/installing.xml 2006-01-24 05:19:01 UTC (rev 1014)
@@ -6299,7 +6299,7 @@
OS X Server version of MySQL to the official MySQL PKG, you also
need to convert the existing MySQL privilege tables to the current
format, because some new security privileges have been added. See
- <xref linkend="upgrading-grant-tables"/>.
+ <xref linkend="mysql-fix-privilege-tables"/>.
</para>
<para>
@@ -11910,7 +11910,7 @@
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="upgrading-grant-tables"/>.
+ <xref linkend="mysql-fix-privilege-tables"/>.
</para>
</listitem>
@@ -12068,9 +12068,9 @@
longer <literal>Password</literal> column that is needed for
more secure handling of passwords. The procedure uses
<command>mysql_fix_privilege_tables</command> and is
- described in <xref linkend="upgrading-grant-tables"/>. If
- you do not do this, MySQL does not use the new more secure
- protocol to authenticate. Implications of the
+ described in <xref linkend="mysql-fix-privilege-tables"/>.
+ If you do not do this, MySQL does not use the new more
+ secure protocol to authenticate. Implications of the
password-handling change for applications are given later in
this section.
</para>
@@ -12967,7 +12967,7 @@
After upgrading, update the grant tables to add new
privileges and features. This procedure uses the
<command>mysql_fix_privilege_tables</command> script and is
- described in <xref linkend="upgrading-grant-tables"/>.
+ described in <xref linkend="mysql-fix-privilege-tables"/>.
</para>
</listitem>
@@ -13104,15 +13104,15 @@
<para>
In order for these new privileges to work, you must update
the grant tables. The procedure for this is described in
- <xref linkend="upgrading-grant-tables"/>. Until you do this,
- all accounts have the <literal>SHOW DATABASES</literal>,
- <literal>CREATE TEMPORARY TABLES</literal>, and
- <literal>LOCK TABLES</literal> privileges.
- <literal>SUPER</literal> and <literal>EXECUTE</literal>
- privileges take their value from <literal>PROCESS</literal>.
- <literal>REPLICATION SLAVE</literal> and
- <literal>REPLICATION CLIENT</literal> take their values from
- <literal>FILE</literal>.
+ <xref linkend="mysql-fix-privilege-tables"/>. Until you do
+ this, all accounts have the <literal>SHOW
+ DATABASES</literal>, <literal>CREATE TEMPORARY
+ TABLES</literal>, and <literal>LOCK TABLES</literal>
+ privileges. <literal>SUPER</literal> and
+ <literal>EXECUTE</literal> privileges take their value from
+ <literal>PROCESS</literal>. <literal>REPLICATION
+ SLAVE</literal> and <literal>REPLICATION CLIENT</literal>
+ take their values from <literal>FILE</literal>.
</para>
<para>
@@ -13559,35 +13559,6 @@
</section>
- <section id="upgrading-grant-tables">
-
- <title>&title-upgrading-grant-tables;</title>
-
- <indexterm>
- <primary>upgrading</primary>
- <secondary>grant tables</secondary>
- </indexterm>
-
- <indexterm>
- <primary>grant tables</primary>
- <secondary>upgrading</secondary>
- </indexterm>
-
- <para>
- Some releases introduce changes to the structure of the grant
- tables (the tables in the <literal>mysql</literal> database) to
- add new privileges or to support new features. To make sure that
- your grant tables are current when you update to a new version
- of MySQL, you should run the
- <command>mysql_fix_privilege_tables</command> script to update
- your grant tables as well. Otherwise, there might be
- capabilities that you cannot take advantage of. The procedure
- for performing the update is described at
- <xref linkend="mysql-fix-privilege-tables"/>.
- </para>
-
- </section>
-
<section id="upgrading-to-arch">
<title>&title-upgrading-to-arch;</title>
Modified: trunk/refman-4.1/renamed-nodes.txt
===================================================================
--- trunk/refman-4.1/renamed-nodes.txt 2006-01-24 04:51:18 UTC (rev 1013)
+++ trunk/refman-4.1/renamed-nodes.txt 2006-01-24 05:19:01 UTC (rev 1014)
@@ -107,3 +107,4 @@
gis-features-that-are-not-yet-implemented mysql-gis-conformance-and-compatibility
parentheses operator-precedence
server-side-scripts server-side-overview
+upgrading-grant-tables mysql-fix-privilege-tables
Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml 2006-01-24 04:51:18 UTC (rev 1013)
+++ trunk/refman-4.1/sql-syntax.xml 2006-01-24 05:19:01 UTC (rev 1014)
@@ -10562,7 +10562,7 @@
<literal>SUPER</literal> privileges were added in MySQL 4.0.2.
To use these privileges when upgrading from an earlier version
of MySQL that does not have them, you must first upgrade the
- grant tables. See <xref linkend="upgrading-grant-tables"/>.
+ grant tables. See <xref linkend="mysql-fix-privilege-tables"/>.
</para>
<para>
Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml 2006-01-24 04:51:18 UTC (rev 1013)
+++ trunk/refman-5.0/database-administration.xml 2006-01-24 05:19:01 UTC (rev 1014)
@@ -8014,7 +8014,7 @@
</para>
<para>
- The number of seconds the server has been up.
+ The number of seconds that the server has been up.
</para>
</listitem>
@@ -8964,9 +8964,9 @@
SQL threads, if active, are stopped before client threads
are marked as killed. The SQL thread is allowed to finish
its current statement (to avoid causing replication
- problems) then stops. If the SQL thread was in the middle
- of a transaction at this point, the transaction is rolled
- back.
+ problems), and then stops. If the SQL thread was in the
+ middle of a transaction at this point, the transaction is
+ rolled back.
</para>
</listitem>
@@ -11539,6 +11539,16 @@
<primary><command>mysql_fix_privilege_tables</command></primary>
</indexterm>
+ <indexterm>
+ <primary>upgrading</primary>
+ <secondary>grant tables</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>grant tables</primary>
+ <secondary>upgrading</secondary>
+ </indexterm>
+
<refmeta>
<refentrytitle><command>mysql_fix_privilege_tables</command></refentrytitle>
@@ -11568,11 +11578,13 @@
<para>
Some releases of MySQL introduce changes to the structure of
the system tables in the <literal>mysql</literal> database to
- add new privileges or features. When you update to a new
- version of MySQL, you should update your system tables as well
- to make sure that their structure is up to date. First make a
- backup of your <literal>mysql</literal> database, and then use
- the following procedure.
+ add new privileges or support new features. When you update to
+ a new version of MySQL, you should update your system tables
+ as well to make sure that their structure is up to date.
+ Otherwise, there might be capabilities that you cannot take
+ advantage of. First, make a backup of your
+ <literal>mysql</literal> database, and then use the following
+ procedure.
</para>
<para>
@@ -11625,13 +11637,13 @@
</programlisting>
<para>
- If your installation is located in some other directory,
- adjust the pathnames appropriately.
+ The <command>mysql</command> command will prompt you for the
+ <literal>root</literal> password; enter it when prompted.
</para>
<para>
- The <command>mysql</command> command will prompt you for the
- <literal>root</literal> password; enter it when prompted.
+ If your installation is located in some other directory,
+ adjust the pathnames appropriately.
</para>
<para>
@@ -11646,11 +11658,6 @@
After running the script, stop the server and restart it.
</para>
- <para>
- For additional information, see
- <xref linkend="upgrading-grant-tables"/>.
- </para>
-
</refsection>
</refentry>
@@ -15361,7 +15368,7 @@
occasionally when new capabilities are added, so after an
upgrade you should always make sure that your tables have
the current structure. For instructions, see
- <xref linkend="upgrading-grant-tables"/>.
+ <xref linkend="mysql-fix-privilege-tables"/>.
</para>
</listitem>
@@ -17332,7 +17339,8 @@
<literal>max_connections</literal>, and
<literal>max_user_connections</literal> columns. If your
<literal>user</literal> table doesn't have these columns, it
- must be upgraded; see <xref linkend="upgrading-grant-tables"/>.
+ must be upgraded; see
+ <xref linkend="mysql-fix-privilege-tables"/>.
</para>
<para>
@@ -17955,7 +17963,7 @@
<literal>mysql.user</literal> table. This is necessary if
your grant tables date from a version prior to MySQL
4.0.0. The upgrade procedure is described in
- <xref linkend="upgrading-grant-tables"/>.
+ <xref linkend="mysql-fix-privilege-tables"/>.
</para>
</listitem>
@@ -21967,7 +21975,7 @@
You must do so manually. (If you are upgrading to MySQL 4.1.3 or
later from an earlier version, you should create the tables by
upgrading your <literal>mysql</literal> database. Use the
- instructions in <xref linkend="upgrading-grant-tables"/>.)
+ instructions in <xref linkend="mysql-fix-privilege-tables"/>.)
</para>
<para>
Modified: trunk/refman-5.0/extending-mysql.xml
===================================================================
--- trunk/refman-5.0/extending-mysql.xml 2006-01-24 04:51:18 UTC (rev 1013)
+++ trunk/refman-5.0/extending-mysql.xml 2006-01-24 05:19:01 UTC (rev 1014)
@@ -724,7 +724,7 @@
function's name, type, and shared library name. If you do not
have this table, you should run the
<command>mysql_fix_privilege_tables</command> script to create
- it. See <xref linkend="upgrading-grant-tables"/>.
+ it. See <xref linkend="mysql-fix-privilege-tables"/>.
</para>
<remark role="help-description-end"/>
Modified: trunk/refman-5.0/installing.xml
===================================================================
--- trunk/refman-5.0/installing.xml 2006-01-24 04:51:18 UTC (rev 1013)
+++ trunk/refman-5.0/installing.xml 2006-01-24 05:19:01 UTC (rev 1014)
@@ -6283,7 +6283,7 @@
OS X Server version of MySQL to the official MySQL PKG, you also
need to convert the existing MySQL privilege tables to the current
format, because some new security privileges have been added. See
- <xref linkend="upgrading-grant-tables"/>.
+ <xref linkend="mysql-fix-privilege-tables"/>.
</para>
<para>
@@ -11802,8 +11802,8 @@
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="upgrading-grant-tables"/>. You may want to use
- <command>mysqldump</command> to dump your tables before
+ <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.
@@ -11901,7 +11901,7 @@
<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
- <xref linkend="upgrading-grant-tables"/>.
+ <xref linkend="mysql-fix-privilege-tables"/>.
</para>
</section>
@@ -11972,7 +11972,7 @@
the <literal>mysql</literal> database. To create this file,
you should run the
<command>mysql_fix_privilege_tables</command> script as
- described in <xref linkend="upgrading-grant-tables"/>.
+ described in <xref linkend="mysql-fix-privilege-tables"/>.
</para>
</listitem>
@@ -11984,7 +11984,7 @@
the <literal>mysql</literal> database. To create these
columns, you should run the
<command>mysql_fix_privilege_tables</command> script as
- described in <xref linkend="upgrading-grant-tables"/>.
+ described in <xref linkend="mysql-fix-privilege-tables"/>.
</para>
</listitem>
@@ -12672,35 +12672,6 @@
</section>
- <section id="upgrading-grant-tables">
-
- <title>&title-upgrading-grant-tables;</title>
-
- <indexterm>
- <primary>upgrading</primary>
- <secondary>grant tables</secondary>
- </indexterm>
-
- <indexterm>
- <primary>grant tables</primary>
- <secondary>upgrading</secondary>
- </indexterm>
-
- <para>
- Some releases introduce changes to the structure of the grant
- tables (the tables in the <literal>mysql</literal> database) to
- add new privileges or to support new features. To make sure that
- your grant tables are current when you update to a new version
- of MySQL, you should run the
- <command>mysql_fix_privilege_tables</command> script to update
- your grant tables as well. Otherwise, there might be
- capabilities that you cannot take advantage of. The procedure
- for performing the update is described at
- <xref linkend="mysql-fix-privilege-tables"/>.
- </para>
-
- </section>
-
<section id="upgrading-to-arch">
<title>&title-upgrading-to-arch;</title>
Modified: trunk/refman-5.0/renamed-nodes.txt
===================================================================
--- trunk/refman-5.0/renamed-nodes.txt 2006-01-24 04:51:18 UTC (rev 1013)
+++ trunk/refman-5.0/renamed-nodes.txt 2006-01-24 05:19:01 UTC (rev 1014)
@@ -405,3 +405,4 @@
parentheses operator-precedence
server-side-scripts server-side-overview
instance-manager-command-line-options instance-manager-command-options
+upgrading-grant-tables mysql-fix-privilege-tables
Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml 2006-01-24 04:51:18 UTC (rev 1013)
+++ trunk/refman-5.0/sql-syntax.xml 2006-01-24 05:19:01 UTC (rev 1014)
@@ -11539,7 +11539,7 @@
table, a stored function, or a stored procedure. To use this
clause when upgrading from a version of MySQL older than
5.0.6, you must upgrade your grant tables. See
- <xref linkend="upgrading-grant-tables"/>.
+ <xref linkend="mysql-fix-privilege-tables"/>.
</para>
<remark role="help-description-end"/>
@@ -11718,7 +11718,7 @@
added in MySQL 5.0.3. To use these privileges when upgrading
from an earlier version of MySQL that does not have them, you
must first upgrade the grant tables, as described in
- <xref linkend="upgrading-grant-tables"/>.
+ <xref linkend="mysql-fix-privilege-tables"/>.
</para>
<para>
Modified: trunk/refman-5.0/stored-procedures.xml
===================================================================
--- trunk/refman-5.0/stored-procedures.xml 2006-01-24 04:51:18 UTC (rev 1013)
+++ trunk/refman-5.0/stored-procedures.xml 2006-01-24 05:19:01 UTC (rev 1014)
@@ -107,7 +107,7 @@
upgrading to MySQL ¤t-series; from an earlier version, be
sure to update your grant tables to make sure that the
<literal>proc</literal> table exists. See
- <xref linkend="upgrading-grant-tables"/>.
+ <xref linkend="mysql-fix-privilege-tables"/>.
</para>
<para>
Modified: trunk/refman-5.0/views.xml
===================================================================
--- trunk/refman-5.0/views.xml 2006-01-24 04:51:18 UTC (rev 1013)
+++ trunk/refman-5.0/views.xml 2006-01-24 05:19:01 UTC (rev 1014)
@@ -62,7 +62,7 @@
To use views if you have upgraded to MySQL 5.0.1 from an older
release, you should upgrade your grant tables so that they contain
the view-related privileges. See
- <xref linkend="upgrading-grant-tables"/>.
+ <xref linkend="mysql-fix-privilege-tables"/>.
</para>
<section id="alter-view">
Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml 2006-01-24 04:51:18 UTC (rev 1013)
+++ trunk/refman-5.1/database-administration.xml 2006-01-24 05:19:01 UTC (rev 1014)
@@ -3643,7 +3643,9 @@
<para>
<literal>YES</literal> if <command>mysqld</command>
- supports partitioning. Added in MySQL 5.1.1 as <literal>have_partition_engine</literal> and renamed to <literal>have_partioning</literal> in 5.1.6.
+ supports partitioning. Added in MySQL 5.1.1 as
+ <literal>have_partition_engine</literal> and renamed to
+ <literal>have_partioning</literal> in 5.1.6.
</para>
</listitem>
@@ -8076,7 +8078,7 @@
</para>
<para>
- The number of seconds the server has been up.
+ The number of seconds that the server has been up.
</para>
</listitem>
@@ -9014,9 +9016,9 @@
SQL threads, if active, are stopped before client threads
are marked as killed. The SQL thread is allowed to finish
its current statement (to avoid causing replication
- problems) then stops. If the SQL thread was in the middle
- of a transaction at this point, the transaction is rolled
- back.
+ problems), and then stops. If the SQL thread was in the
+ middle of a transaction at this point, the transaction is
+ rolled back.
</para>
</listitem>
@@ -11583,6 +11585,16 @@
<primary><command>mysql_fix_privilege_tables</command></primary>
</indexterm>
+ <indexterm>
+ <primary>upgrading</primary>
+ <secondary>grant tables</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>grant tables</primary>
+ <secondary>upgrading</secondary>
+ </indexterm>
+
<refmeta>
<refentrytitle><command>mysql_fix_privilege_tables</command></refentrytitle>
@@ -11612,11 +11624,13 @@
<para>
Some releases of MySQL introduce changes to the structure of
the system tables in the <literal>mysql</literal> database to
- add new privileges or features. When you update to a new
- version of MySQL, you should update your system tables as well
- to make sure that their structure is up to date. First make a
- backup of your <literal>mysql</literal> database, and then use
- the following procedure.
+ add new privileges or support new features. When you update to
+ a new version of MySQL, you should update your system tables
+ as well to make sure that their structure is up to date.
+ Otherwise, there might be capabilities that you cannot take
+ advantage of. First, make a backup of your
+ <literal>mysql</literal> database, and then use the following
+ procedure.
</para>
<para>
@@ -11669,13 +11683,13 @@
</programlisting>
<para>
- If your installation is located in some other directory,
- adjust the pathnames appropriately.
+ The <command>mysql</command> command will prompt you for the
+ <literal>root</literal> password; enter it when prompted.
</para>
<para>
- The <command>mysql</command> command will prompt you for the
- <literal>root</literal> password; enter it when prompted.
+ If your installation is located in some other directory,
+ adjust the pathnames appropriately.
</para>
<para>
@@ -11690,11 +11704,6 @@
After running the script, stop the server and restart it.
</para>
- <para>
- For additional information, see
- <xref linkend="upgrading-grant-tables"/>.
- </para>
-
</refsection>
</refentry>
@@ -15377,7 +15386,7 @@
occasionally when new capabilities are added, so after an
upgrade you should always make sure that your tables have
the current structure. For instructions, see
- <xref linkend="upgrading-grant-tables"/>.
+ <xref linkend="mysql-fix-privilege-tables"/>.
</para>
</listitem>
@@ -17348,7 +17357,8 @@
<literal>max_connections</literal>, and
<literal>max_user_connections</literal> columns. If your
<literal>user</literal> table doesn't have these columns, it
- must be upgraded; see <xref linkend="upgrading-grant-tables"/>.
+ must be upgraded; see
+ <xref linkend="mysql-fix-privilege-tables"/>.
</para>
<para>
@@ -17966,7 +17976,7 @@
<literal>mysql.user</literal> table. This is necessary if
your grant tables date from a version prior to MySQL
4.0.0. The upgrade procedure is described in
- <xref linkend="upgrading-grant-tables"/>.
+ <xref linkend="mysql-fix-privilege-tables"/>.
</para>
</listitem>
@@ -21978,7 +21988,7 @@
You must do so manually. (If you are upgrading to MySQL 4.1.3 or
later from an earlier version, you should create the tables by
upgrading your <literal>mysql</literal> database. Use the
- instructions in <xref linkend="upgrading-grant-tables"/>.)
+ instructions in <xref linkend="mysql-fix-privilege-tables"/>.)
</para>
<para>
Modified: trunk/refman-5.1/extending-mysql.xml
===================================================================
--- trunk/refman-5.1/extending-mysql.xml 2006-01-24 04:51:18 UTC (rev 1013)
+++ trunk/refman-5.1/extending-mysql.xml 2006-01-24 05:19:01 UTC (rev 1014)
@@ -517,7 +517,7 @@
part of the MySQL installation process. If you are upgrading from
an older version to MySQL 5.1, you should run the
<command>mysql_fix_privilege_tables</command> command to create
- this table. See <xref linkend="upgrading-grant-tables"/>.
+ this table. See <xref linkend="mysql-fix-privilege-tables"/>.
</para>
<section id="plugin-api-characteristics">
@@ -2538,7 +2538,7 @@
function's name, type, and shared library name. If you do not
have this table, you should run the
<command>mysql_fix_privilege_tables</command> script to create
- it. See <xref linkend="upgrading-grant-tables"/>.
+ it. See <xref linkend="mysql-fix-privilege-tables"/>.
</para>
<remark role="help-description-end"/>
Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml 2006-01-24 04:51:18 UTC (rev 1013)
+++ trunk/refman-5.1/installing.xml 2006-01-24 05:19:01 UTC (rev 1014)
@@ -6276,7 +6276,7 @@
OS X Server version of MySQL to the official MySQL PKG, you also
need to convert the existing MySQL privilege tables to the current
format, because some new security privileges have been added. See
- <xref linkend="upgrading-grant-tables"/>.
+ <xref linkend="mysql-fix-privilege-tables"/>.
</para>
<para>
@@ -11801,8 +11801,8 @@
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="upgrading-grant-tables"/>. You may want to use
- <command>mysqldump</command> to dump your tables before
+ <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.
@@ -11910,7 +11910,7 @@
<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
- <xref linkend="upgrading-grant-tables"/>.
+ <xref linkend="mysql-fix-privilege-tables"/>.
</para>
<para>
@@ -11988,7 +11988,7 @@
table. When upgrading from an older version of MySQL, you
should run the <command>mysql_fix_privilege_tables</command>
command to create this table. See
- <xref linkend="upgrading-grant-tables"/>.
+ <xref linkend="mysql-fix-privilege-tables"/>.
</para>
<para>
@@ -12190,35 +12190,6 @@
</section>
- <section id="upgrading-grant-tables">
-
- <title>&title-upgrading-grant-tables;</title>
-
- <indexterm>
- <primary>upgrading</primary>
- <secondary>grant tables</secondary>
- </indexterm>
-
- <indexterm>
- <primary>grant tables</primary>
- <secondary>upgrading</secondary>
- </indexterm>
-
- <para>
- Some releases introduce changes to the structure of the grant
- tables (the tables in the <literal>mysql</literal> database) to
- add new privileges or to support new features. To make sure that
- your grant tables are current when you update to a new version
- of MySQL, you should run the
- <command>mysql_fix_privilege_tables</command> script to update
- your grant tables as well. Otherwise, there might be
- capabilities that you cannot take advantage of. The procedure
- for performing the update is described at
- <xref linkend="mysql-fix-privilege-tables"/>.
- </para>
-
- </section>
-
<section id="upgrading-to-arch">
<title>&title-upgrading-to-arch;</title>
Modified: trunk/refman-5.1/renamed-nodes.txt
===================================================================
--- trunk/refman-5.1/renamed-nodes.txt 2006-01-24 04:51:18 UTC (rev 1013)
+++ trunk/refman-5.1/renamed-nodes.txt 2006-01-24 05:19:01 UTC (rev 1014)
@@ -109,3 +109,4 @@
parentheses operator-precedence
server-side-scripts server-side-overview
instance-manager-command-line-options instance-manager-command-options
+upgrading-grant-tables mysql-fix-privilege-tables
Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml 2006-01-24 04:51:18 UTC (rev 1013)
+++ trunk/refman-5.1/sql-syntax.xml 2006-01-24 05:19:01 UTC (rev 1014)
@@ -12030,7 +12030,7 @@
when the following object is a table, a stored function, or a
stored procedure. To use this clause when upgrading from older
versions of MySQL, you must upgrade your grant tables. See
- <xref linkend="upgrading-grant-tables"/>.
+ <xref linkend="mysql-fix-privilege-tables"/>.
</para>
<remark role="help-description-end"/>
@@ -12208,7 +12208,7 @@
from an earlier version of MySQL that does not have them, you
must first upgrade your grant tables as described in
<xref
- linkend="upgrading-grant-tables"/>.
+ linkend="mysql-fix-privilege-tables"/>.
</para>
<para>
Modified: trunk/refman-5.1/stored-procedures.xml
===================================================================
--- trunk/refman-5.1/stored-procedures.xml 2006-01-24 04:51:18 UTC (rev 1013)
+++ trunk/refman-5.1/stored-procedures.xml 2006-01-24 05:19:01 UTC (rev 1014)
@@ -107,7 +107,7 @@
upgrading to MySQL ¤t-series; from an earlier version, be
sure to update your grant tables to make sure that the
<literal>proc</literal> table exists. See
- <xref linkend="upgrading-grant-tables"/>.
+ <xref linkend="mysql-fix-privilege-tables"/>.
</para>
<para>
Modified: trunk/refman-5.1/views.xml
===================================================================
--- trunk/refman-5.1/views.xml 2006-01-24 04:51:18 UTC (rev 1013)
+++ trunk/refman-5.1/views.xml 2006-01-24 05:19:01 UTC (rev 1014)
@@ -61,7 +61,7 @@
To use views if you have upgraded to MySQL ¤t-series; from an
older release that did not support views, you should upgrade your
grant tables so that they contain the view-related privileges. See
- <xref linkend="upgrading-grant-tables"/>.
+ <xref linkend="mysql-fix-privilege-tables"/>.
</para>
<section id="alter-view">
Modified: trunk/refman-common/news-5.0.xml
===================================================================
--- trunk/refman-common/news-5.0.xml 2006-01-24 04:51:18 UTC (rev 1013)
+++ trunk/refman-common/news-5.0.xml 2006-01-24 05:19:01 UTC (rev 1014)
@@ -3827,7 +3827,7 @@
<filename>mysql_fix_privilege_tables.sql</filename> script
that upgrades the grant tables to the current structure.
Instructions for doing this are given in
- <xref linkend="upgrading-grant-tables"/>.
+ <xref linkend="mysql-fix-privilege-tables"/>.
</para>
</listitem>
@@ -7538,7 +7538,7 @@
disambiguating whether the grant object is a table, a stored
function, or a stored procedure. Use of this clause requires
that you upgrade your grant tables. See
- <xref linkend="upgrading-grant-tables"/>. (Bug #10246)
+ <xref linkend="mysql-fix-privilege-tables"/>. (Bug #10246)
</para>
</listitem>
@@ -11249,7 +11249,7 @@
Added support for read-only and updatable views based on a
single table or other updatable views. View use requires that
you upgrade your grant tables to add the view-related
- privileges. See <xref linkend="upgrading-grant-tables"/>.
+ privileges. See <xref linkend="mysql-fix-privilege-tables"/>.
</para>
</listitem>
Modified: trunk/refman-common/news-5.1.xml
===================================================================
--- trunk/refman-common/news-5.1.xml 2006-01-24 04:51:18 UTC (rev 1013)
+++ trunk/refman-common/news-5.1.xml 2006-01-24 05:19:01 UTC (rev 1014)
@@ -905,7 +905,7 @@
table. When upgrading from an older version of MySQL, you
should run the <command>mysql_fix_privilege_tables</command>
command to create this table. See
- <xref linkend="upgrading-grant-tables"/>.
+ <xref linkend="mysql-fix-privilege-tables"/>.
</para>
<para>
Modified: trunk/refman-common/titles.en.ent
===================================================================
--- trunk/refman-common/titles.en.ent 2006-01-24 04:51:18 UTC (rev 1013)
+++ trunk/refman-common/titles.en.ent 2006-01-24 05:19:01 UTC (rev 1014)
@@ -1652,7 +1652,6 @@
<!ENTITY title-upgrading-from-4-0 "Upgrading from MySQL 4.0 to 4.1">
<!ENTITY title-upgrading-from-4-1 "Upgrading from MySQL 4.1 to 5.0">
<!ENTITY title-upgrading-from-5-0 "Upgrading from MySQL 5.0">
-<!ENTITY title-upgrading-grant-tables "Upgrading the Grant Tables">
<!ENTITY title-upgrading-to-arch "Copying MySQL Databases to Another Machine">
<!ENTITY title-use "<literal>USE</literal> Syntax">
<!ENTITY title-used-libraries "Libraries used by and included with MySQL">
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r1014 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-common | paul | 24 Jan |
