Author: paul
Date: 2006-01-12 19:16:47 +0100 (Thu, 12 Jan 2006)
New Revision: 774
Log:
r6093@frost: paul | 2006-01-11 14:09:38 -0600
Move some blocks of text around.
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:6091
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2101
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6093
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2101
Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml 2006-01-12 18:13:44 UTC (rev 773)
+++ trunk/refman-4.1/installing.xml 2006-01-12 18:16:47 UTC (rev 774)
@@ -17161,7 +17161,7 @@
<title>&title-sco-openserver;</title>
<para>
- OpenServer 6 includes these key improvements:
+ Key improvements of OpenServer 6 include:
</para>
<itemizedlist>
@@ -17199,7 +17199,7 @@
</itemizedlist>
<para>
- OpenServer 6.0.0 commands are organized as follows:
+ OpenServer 6.0.0 has the following:
</para>
<itemizedlist>
Modified: trunk/refman-5.0/installing.xml
===================================================================
--- trunk/refman-5.0/installing.xml 2006-01-12 18:13:44 UTC (rev 773)
+++ trunk/refman-5.0/installing.xml 2006-01-12 18:16:47 UTC (rev 774)
@@ -10521,115 +10521,115 @@
</itemizedlist>
- <para>
- There are some alternatives to running the
- <command>mysql_install_db</command> script as it is provided
- in the MySQL distribution:
- </para>
+ <para>
+ There are some alternatives to running the
+ <command>mysql_install_db</command> script as it is provided
+ in the MySQL distribution:
+ </para>
- <indexterm>
- <primary>grant tables</primary>
- <secondary>re-creating</secondary>
- </indexterm>
+ <indexterm>
+ <primary>grant tables</primary>
+ <secondary>re-creating</secondary>
+ </indexterm>
- <indexterm>
- <primary>re-creating</primary>
- <secondary>grant tables</secondary>
- </indexterm>
+ <indexterm>
+ <primary>re-creating</primary>
+ <secondary>grant tables</secondary>
+ </indexterm>
- <itemizedlist>
+ <itemizedlist>
- <listitem>
- <para>
- If you want the initial privileges to be different from
- the standard defaults, you can modify
- <command>mysql_install_db</command> before you run it.
- However, it is preferable to use <literal>GRANT</literal>
- and <literal>REVOKE</literal> to change the privileges
- <emphasis>after</emphasis> the grant tables have been set
- up. In other words, you can run
- <command>mysql_install_db</command>, and then use
- <literal>mysql -u root mysql</literal> to connect to the
- server as the MySQL <literal>root</literal> user so that
- you can issue the necessary <literal>GRANT</literal> and
- <literal>REVOKE</literal> statements.
- </para>
+ <listitem>
+ <para>
+ If you want the initial privileges to be different from
+ the standard defaults, you can modify
+ <command>mysql_install_db</command> before you run it.
+ However, it is preferable to use
+ <literal>GRANT</literal> and <literal>REVOKE</literal>
+ to change the privileges <emphasis>after</emphasis> the
+ grant tables have been set up. In other words, you can
+ run <command>mysql_install_db</command>, and then use
+ <literal>mysql -u root mysql</literal> to connect to the
+ server as the MySQL <literal>root</literal> user so that
+ you can issue the necessary <literal>GRANT</literal> and
+ <literal>REVOKE</literal> statements.
+ </para>
- <para>
- If you want to install MySQL on several machines with the
- same privileges, you can put the <literal>GRANT</literal>
- and <literal>REVOKE</literal> statements in a file and
- execute the file as a script using
- <literal>mysql</literal> after running
- <command>mysql_install_db</command>. For example:
- </para>
+ <para>
+ If you want to install MySQL on several machines with
+ the same privileges, you can put the
+ <literal>GRANT</literal> and <literal>REVOKE</literal>
+ statements in a file and execute the file as a script
+ using <literal>mysql</literal> after running
+ <command>mysql_install_db</command>. For example:
+ </para>
<programlisting>
shell> <userinput>bin/mysql_install_db --user=mysql</userinput>
shell> <userinput>bin/mysql -u root < your_script_file</userinput>
</programlisting>
- <para>
- By doing this, you can avoid having to issue the
- statements manually on each machine.
- </para>
- </listitem>
+ <para>
+ By doing this, you can avoid having to issue the
+ statements manually on each machine.
+ </para>
+ </listitem>
- <listitem>
- <para>
- It is possible to re-create the grant tables completely
- after they have previously been created. You might want to
- do this if you're just learning how to use
- <literal>GRANT</literal> and <literal>REVOKE</literal> and
- have made so many modifications after running
- <command>mysql_install_db</command> that you want to wipe
- out the tables and start over.
- </para>
+ <listitem>
+ <para>
+ It is possible to re-create the grant tables completely
+ after they have previously been created. You might want
+ to do this if you're just learning how to use
+ <literal>GRANT</literal> and <literal>REVOKE</literal>
+ and have made so many modifications after running
+ <command>mysql_install_db</command> that you want to
+ wipe out the tables and start over.
+ </para>
- <para>
- To re-create the grant tables, remove all the
- <filename>.frm</filename>, <filename>.MYI</filename>, and
- <filename>.MYD</filename> files in the directory
- containing the <literal>mysql</literal> database. (This is
- the directory named <filename>mysql</filename> under the
- data directory, which is listed as the
- <literal>datadir</literal> value when you run
- <command>mysqld --help</command>.) Then run the
- <command>mysql_install_db</command> script again.
- </para>
- </listitem>
+ <para>
+ To re-create the grant tables, remove all the
+ <filename>.frm</filename>, <filename>.MYI</filename>,
+ and <filename>.MYD</filename> files in the directory
+ containing the <literal>mysql</literal> database. (This
+ is the directory named <filename>mysql</filename> under
+ the data directory, which is listed as the
+ <literal>datadir</literal> value when you run
+ <command>mysqld --help</command>.) Then run the
+ <command>mysql_install_db</command> script again.
+ </para>
+ </listitem>
- <listitem>
- <para>
- You can start <command>mysqld</command> manually using the
- <option>--skip-grant-tables</option> option and add the
- privilege information yourself using
- <command>mysql</command>:
- </para>
+ <listitem>
+ <para>
+ You can start <command>mysqld</command> manually using
+ the <option>--skip-grant-tables</option> option and add
+ the privilege information yourself using
+ <command>mysql</command>:
+ </para>
<programlisting>
shell> <userinput>bin/mysqld_safe --user=mysql --skip-grant-tables &</userinput>
shell> <userinput>bin/mysql mysql</userinput>
</programlisting>
- <para>
- From <command>mysql</command>, manually execute the SQL
- commands contained in <command>mysql_install_db</command>.
- Make sure that you run <command>mysqladmin
- flush-privileges</command> or <command>mysqladmin
- reload</command> afterward to tell the server to reload
- the grant tables.
- </para>
+ <para>
+ From <command>mysql</command>, manually execute the SQL
+ commands contained in
+ <command>mysql_install_db</command>. Make sure that you
+ run <command>mysqladmin flush-privileges</command> or
+ <command>mysqladmin reload</command> afterward to tell
+ the server to reload the grant tables.
+ </para>
- <para>
- Note that by not using
- <command>mysql_install_db</command>, you not only have to
- populate the grant tables manually, you also have to
- create them first.
- </para>
- </listitem>
+ <para>
+ Note that by not using
+ <command>mysql_install_db</command>, you not only have
+ to populate the grant tables manually, you also have to
+ create them first.
+ </para>
+ </listitem>
- </itemizedlist>
+ </itemizedlist>
</section>
@@ -16330,7 +16330,7 @@
<title>&title-sco-openserver;</title>
<para>
- OpenServer 6 includes these key improvements:
+ Key improvements of OpenServer 6 include:
</para>
<itemizedlist>
@@ -16368,7 +16368,7 @@
</itemizedlist>
<para>
- OpenServer 6.0.0 commands are organized as follows:
+ OpenServer 6.0.0 has the following:
</para>
<itemizedlist>
Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml 2006-01-12 18:13:44 UTC (rev 773)
+++ trunk/refman-5.1/installing.xml 2006-01-12 18:16:47 UTC (rev 774)
@@ -15642,7 +15642,7 @@
<title>&title-sco-openserver;</title>
<para>
- OpenServer 6 includes these key improvements:
+ Key improvements of OpenServer 6 include:
</para>
<itemizedlist>
@@ -15680,7 +15680,7 @@
</itemizedlist>
<para>
- OpenServer 6.0.0 commands are organized as follows:
+ OpenServer 6.0.0 has the following:
</para>
<itemizedlist>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r774 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 12 Jan |
