List:Commits« Previous MessageNext Message »
From:paul Date:January 31 2006 3:55am
Subject:svn commit - mysqldoc@docsrva: r1143 - in trunk: . refman-4.1 refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2006-01-31 04:55:14 +0100 (Tue, 31 Jan 2006)
New Revision: 1143

Log:
 r6962@frost:  paul | 2006-01-30 20:58:46 -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:6957
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2719
   + b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6962
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 00:46:00 UTC (rev 1142)
+++ trunk/refman-4.1/installing.xml	2006-01-31 03:55:14 UTC (rev 1143)
@@ -9845,9 +9845,9 @@
 
           <listitem>
             <para>
-              Copy or upload to your Windows machine the Windows source
-              package that you have just created. To compile it, use the
-              instructions in
+              Copy or upload the Windows source package that you have
+              just created to your Windows machine. To compile it, use
+              the instructions in
               <xref linkend="windows-vc-plus-plus-build"/>.
             </para>
           </listitem>
@@ -9927,15 +9927,14 @@
     </indexterm>
 
     <para>
-      After installing MySQL, there are some issues you should address.
-      For example, on Unix, you should initialize the data directory and
-      create the MySQL grant tables. On all platforms, an important
-      security concern is that the initial accounts in the grant tables
-      have no passwords. You should assign passwords to prevent
-      unauthorized access to the MySQL server. For MySQL 4.1.3 and up,
-      you can create time zone tables to enable recognition of named
-      time zones. (Currently, these tables can be populated only on
-      Unix. This problem will be addressed soon for Windows.)
+      After installing MySQL, there are some issues that you should
+      address. For example, on Unix, you should initialize the data
+      directory and create the MySQL grant tables. On all platforms, an
+      important security concern is that the initial accounts in the
+      grant tables have no passwords. You should assign passwords to
+      prevent unauthorized access to the MySQL server. Optionally, for
+      MySQL 4.1.3 and up, you can create time zone tables to enable
+      recognition of named time zones.
     </para>
 
     <para>
@@ -9964,13 +9963,13 @@
         On Windows, the data directory and the grant tables do not have
         to be created. MySQL Windows distributions include the grant
         tables with a set of preinitialized accounts in the
-        <literal>mysql</literal> database under the data directory. You
-        do not run the <command>mysql_install_db</command> script that
-        is used on Unix. However, if you did not install MySQL using the
-        Windows Installation Wizard, you should assign passwords to the
-        accounts. See
-        <xref linkend="mysql-install-wizard-introduction"/>. The
-        procedure for this is given in
+        <literal>mysql</literal> database under the data directory. It
+        is unnecessary to run the <command>mysql_install_db</command>
+        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
+        password-assignment procedure given in
         <xref linkend="default-privileges"/>.
       </para>
 
@@ -9995,16 +9994,27 @@
 
 C:\&gt; <userinput>C:\mysql\bin\mysqlshow mysql</userinput>
 Database: mysql
-+--------------+
-|    Tables    |
-+--------------+
-| columns_priv |
-| db           |
-| func         |
-| host         |
-| tables_priv  |
-| user         |
-+--------------+
++---------------------------+
+|          Tables           |
++---------------------------+
+| columns_priv              |
+| db                        |
+| func                      |
+| help_category             |
+| help_keyword              |
+| help_relation             |
+| help_topic                |
+| host                      |
+| proc                      |
+| procs_priv                |
+| tables_priv               |
+| time_zone                 |
+| time_zone_leap_second     |
+| time_zone_name            |
+| time_zone_transition      |
+| time_zone_transition_type |
+| user                      |
++---------------------------+
 
 C:\&gt; <userinput>C:\mysql\bin\mysql -e "SELECT Host,Db,User FROM db" mysql</userinput>
 +------+-------+------+
@@ -10135,8 +10145,9 @@
             If necessary, run the <command>mysql_install_db</command>
             program to set up the initial MySQL grant tables containing
             the privileges that determine how users are allowed to
-            connect to the server. You will need to do this if you used
-            a distribution type that does not run the program for you.
+            connect to the server. You'll need to do this if you used a
+            distribution type for which the installation procedure
+            doesn't run the program for you.
           </para>
 
           <para>
@@ -10163,8 +10174,9 @@
 
           <para>
             The <command>mysql_install_db</command> script creates the
-            data directory, the <literal>mysql</literal> database that
-            holds all database privileges, and the
+            server's data directory. Under the data directory, it
+            creates directories for the <literal>mysql</literal>
+            database that holds all database privileges and the
             <literal>test</literal> database that you can use to test
             MySQL. The script also creates privilege table entries for
             <literal>root</literal> accounts and anonymous-user
@@ -10206,9 +10218,8 @@
           </para>
 
           <para>
-            If you have problems with
-            <command>mysql_install_db</command>, see
-            <xref linkend="mysql-install-db"/>.
+            If you have trouble with <command>mysql_install_db</command>
+            at this point, see <xref linkend="mysql-install-db"/>.
           </para>
         </listitem>
 
@@ -10285,12 +10296,12 @@
 
 <programlisting>
 shell&gt; <userinput>bin/mysqladmin version</userinput>
-mysqladmin  Ver 8.40 Distrib 4.1.13, for linux on i586
+mysqladmin  Ver 14.7 Distrib 4.1.19, for linux on i586
 Copyright (C) 2000 MySQL AB &amp; MySQL Finland AB &amp; TCX DataKonsult AB
 This software comes with ABSOLUTELY NO WARRANTY. This is free software,
 and you are welcome to modify and redistribute it under the GPL license
 
-Server version          4.1.13-max
+Server version          4.1.19-max
 Protocol version        10
 Connection              Localhost via Unix socket
 TCP port                3306
@@ -10331,7 +10342,7 @@
 
         <listitem>
           <para>
-            Verify that you can restart the server. Do this by using
+            Verify that you can start the server again. Do this by using
             <command>mysqld_safe</command> or by invoking
             <command>mysqld</command> directly. For example:
           </para>
@@ -10401,11 +10412,9 @@
             <filename>sql-bench</filename> directory (under the MySQL
             installation directory) that you can use to compare how
             MySQL performs on different platforms. The benchmark suite
-            is written in Perl. It uses the Perl <literal>DBI</literal>
-            module to provide a database-independent interface to the
-            various databases, and some other additional Perl modules
-            are required to run the benchmark suite. You must have the
-            following modules installed:
+            is written in Perl. It requires the Perl DBI module that
+            provides a database-independent interface to the various
+            databases, and some other additional Perl modules:
           </para>
 
 <programlisting>
@@ -10478,8 +10487,8 @@
       <para>
         As of MySQL 4.1.3, the installation procedure creates time zone
         tables in the <literal>mysql</literal> database. However, you
-        must populate the tables manually. Instructions to do this are
-        given in <xref linkend="time-zone-support"/>.
+        must populate the tables manually using the instructions in
+        <xref linkend="time-zone-support"/>.
       </para>
 
       <section id="mysql-install-db">
@@ -10507,17 +10516,23 @@
           <command>mysqld</command> server if it is running. Then rename
           the <filename>mysql</filename> directory under the data
           directory to save it, and then run
-          <command>mysql_install_db</command>. For example:
+          <command>mysql_install_db</command>. Suppose that your current
+          directory is the MySQL installation directory and that
+          <command>mysql_install_db</command> is located in the
+          <filename>bin</filename> directory and the data directory is
+          named <filename>data</filename>. To rename the
+          <literal>mysql</literal> database and re-run
+          <command>mysql_install_db</command>, use these commands.
         </para>
 
 <programlisting>
-shell&gt; <userinput>mv mysql-data-directory/mysql mysql-data-directory/mysql-old</userinput>
-shell&gt; <userinput>mysql_install_db --user=mysql</userinput>
+shell&gt; <userinput>mv data/mysql data/mysql.old</userinput>
+shell&gt; <userinput>bin/mysql_install_db --user=mysql</userinput>
 </programlisting>
 
         <para>
-          This section lists problems you might encounter when you run
-          <command>mysql_install_db</command>:
+          When you run <command>mysql_install_db</command>, you might
+          encounter the following problems:
         </para>
 
         <itemizedlist>
@@ -10542,8 +10557,8 @@
             <para>
               In this case, you should examine the error log file very
               carefully. The log should be located in the directory
-              <filename>XXXXXX</filename> named by the error message,
-              and should indicate why <command>mysqld</command> did not
+              <filename>XXXXXX</filename> named by the error message and
+              should indicate why <command>mysqld</command> didn't
               start. If you do not understand what happened, include the
               log when you post a bug report. See
               <xref linkend="bug-reports"/>.
@@ -10558,10 +10573,11 @@
 
             <para>
               This indicates that the server is running, in which case
-              the grant tables have probably been created. If so, you do
-              not have to run <command>mysql_install_db</command> at all
-              because it need be run only once (when you install MySQL
-              the first time).
+              the grant tables have probably been created already. If
+              so, there is no need to run
+              <command>mysql_install_db</command> at all because it
+              needs to be run only once (when you install MySQL the
+              first time).
             </para>
           </listitem>
 
@@ -10613,8 +10629,8 @@
                 <secondary><literal>tmp</literal></secondary>
               </indexterm>
 
-              <emphasis role="bold">You do not have write access to
-              <filename>/tmp</filename></emphasis>
+              <emphasis role="bold">You do not have write access to the
+              <filename>/tmp</filename> directory</emphasis>
             </para>
 
             <para>
@@ -10626,10 +10642,13 @@
             </para>
 
             <para>
-              You can specify different temporary directory and Unix
-              socket file locations by executing these commands prior to
-              starting <command>mysql_install_db</command> or
-              <command>mysqld</command>:
+              You can specify different locations for the temporary
+              directory and Unix socket file by executing these commands
+              prior to starting <command>mysql_install_db</command> or
+              <command>mysqld</command>, where
+              <replaceable>some_tmp_dir</replaceable> is the full
+              pathname to some directory for which you have write
+              permission:
             </para>
 
             <indexterm type="type">
@@ -10657,13 +10676,7 @@
 </programlisting>
 
             <para>
-              <filename>some_tmp_dir</filename> should be the full
-              pathname to some directory for which you have write
-              permission.
-            </para>
-
-            <para>
-              After this, you should be able to run
+              Then you should be able to run
               <command>mysql_install_db</command> and start the server
               with these commands:
             </para>
@@ -10690,8 +10703,8 @@
 
         <para>
           There are some alternatives to running the
-          <command>mysql_install_db</command> script as it is provided
-          in the MySQL distribution:
+          <command>mysql_install_db</command> script provided in the
+          MySQL distribution:
         </para>
 
         <indexterm>
@@ -10756,12 +10769,8 @@
             <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
+              <filename>.MYD</filename> files in the
+              <literal>mysql</literal> database directory. Then run the
               <command>mysql_install_db</command> script again.
             </para>
 
@@ -10859,7 +10868,7 @@
               By invoking <command>mysqld_safe</command>, which tries to
               determine the proper options for <command>mysqld</command>
               and then runs it with those options. This script is used
-              on systems based on BSD Unix. See
+              on Unix and Unix-like systems. See
               <xref linkend="mysqld-safe"/>.
             </para>
           </listitem>
@@ -10890,8 +10899,8 @@
         </itemizedlist>
 
         <para>
-          The <command>mysql.server</command> and
-          <command>mysqld_safe</command> scripts and the Mac OS X
+          The <command>mysqld_safe</command> and
+          <command>mysql.server</command> scripts and the Mac OS X
           Startup Item can be used to start the server manually, or
           automatically at system startup time.
           <command>mysql.server</command> and the Startup Item also can
@@ -10928,7 +10937,7 @@
         </para>
 
         <para>
-          <command>mysql.server stop</command> brings down the server by
+          <command>mysql.server stop</command> stops the server by
           sending a signal to it. You can also stop the server manually
           by executing <command>mysqladmin shutdown</command>.
         </para>
@@ -11095,24 +11104,25 @@
               <row>
                 <entry><command>mysqld</command></entry>
                 <entry><literal>[mysqld]</literal>, <literal>[server]</literal>,
-                  <literal>[mysqld-major-version]</literal></entry>
+                  <literal>[mysqld-<replaceable>major_version</replaceable>]</literal></entry>
               </row>
               <row>
-                <entry><command>mysql.server</command></entry>
-                <entry><literal>[mysqld]</literal>, <literal>[mysql.server]</literal></entry>
-              </row>
-              <row>
                 <entry><command>mysqld_safe</command></entry>
                 <entry><literal>[mysqld]</literal>, <literal>[server]</literal>,
                   <literal>[mysqld_safe]</literal></entry>
               </row>
+              <row>
+                <entry><command>mysql.server</command></entry>
+                <entry><literal>[mysqld]</literal>, <literal>[mysql.server]</literal></entry>
+              </row>
             </tbody>
           </tgroup>
         </informaltable>
 
         <para>
-          <literal>[mysqld-major-version]</literal> means that groups
-          with names like <literal>[mysqld-4.0]</literal>,
+          <literal>[mysqld-<replaceable>major_version</replaceable>]</literal>
+          means that groups with names like
+          <literal>[mysqld-4.0]</literal>,
           <literal>[mysqld-4.1]</literal>, and
           <literal>[mysqld-5.0]</literal> are read by servers having
           versions 4.0.x, 4.1.x, 5.0.x, and so forth. This feature was

Modified: trunk/refman-5.0/installing.xml
===================================================================
--- trunk/refman-5.0/installing.xml	2006-01-31 00:46:00 UTC (rev 1142)
+++ trunk/refman-5.0/installing.xml	2006-01-31 03:55:14 UTC (rev 1143)
@@ -9686,9 +9686,9 @@
 
           <listitem>
             <para>
-              Copy or upload to your Windows machine the Windows source
-              package that you have just created. To compile it, use the
-              instructions in
+              Copy or upload the Windows source package that you have
+              just created to your Windows machine. To compile it, use
+              the instructions in
               <xref linkend="windows-vc-plus-plus-build"/>.
             </para>
           </listitem>
@@ -9768,15 +9768,14 @@
     </indexterm>
 
     <para>
-      After installing MySQL, there are some issues you should address.
-      For example, on Unix, you should initialize the data directory and
-      create the MySQL grant tables. On all platforms, an important
-      security concern is that the initial accounts in the grant tables
-      have no passwords. You should assign passwords to prevent
-      unauthorized access to the MySQL server. You can create time zone
-      tables to enable recognition of named time zones. (Currently,
-      these tables can be populated only on Unix. This problem will be
-      addressed soon for Windows.)
+      After installing MySQL, there are some issues that you should
+      address. For example, on Unix, you should initialize the data
+      directory and create the MySQL grant tables. On all platforms, an
+      important security concern is that the initial accounts in the
+      grant tables have no passwords. You should assign passwords to
+      prevent unauthorized access to the MySQL server. Optionally, you
+      can create time zone tables to enable recognition of named time
+      zones.
     </para>
 
     <para>
@@ -9805,13 +9804,13 @@
         On Windows, the data directory and the grant tables do not have
         to be created. MySQL Windows distributions include the grant
         tables with a set of preinitialized accounts in the
-        <literal>mysql</literal> database under the data directory. You
-        do not run the <command>mysql_install_db</command> script that
-        is used on Unix. However, if you did not install MySQL using the
-        Windows Installation Wizard, you should assign passwords to the
-        accounts. See
-        <xref linkend="mysql-install-wizard-introduction"/>. The
-        procedure for this is given in
+        <literal>mysql</literal> database under the data directory. It
+        is unnecessary to run the <command>mysql_install_db</command>
+        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
+        password-assignment procedure given in
         <xref linkend="default-privileges"/>.
       </para>
 
@@ -9836,16 +9835,27 @@
 
 C:\&gt; <userinput>C:\mysql\bin\mysqlshow mysql</userinput>
 Database: mysql
-+--------------+
-|    Tables    |
-+--------------+
-| columns_priv |
-| db           |
-| func         |
-| host         |
-| tables_priv  |
-| user         |
-+--------------+
++---------------------------+
+|          Tables           |
++---------------------------+
+| columns_priv              |
+| db                        |
+| func                      |
+| help_category             |
+| help_keyword              |
+| help_relation             |
+| help_topic                |
+| host                      |
+| proc                      |
+| procs_priv                |
+| tables_priv               |
+| time_zone                 |
+| time_zone_leap_second     |
+| time_zone_name            |
+| time_zone_transition      |
+| time_zone_transition_type |
+| user                      |
++---------------------------+
 
 C:\&gt; <userinput>C:\mysql\bin\mysql -e "SELECT Host,Db,User FROM db" mysql</userinput>
 +------+-------+------+
@@ -9977,7 +9987,8 @@
             program to set up the initial MySQL grant tables containing
             the privileges that determine how users are allowed to
             connect to the server. You'll need to do this if you used a
-            distribution type that doesn't run the program for you.
+            distribution type for which the installation procedure
+            doesn't run the program for you.
           </para>
 
           <para>
@@ -10004,8 +10015,9 @@
 
           <para>
             The <command>mysql_install_db</command> script creates the
-            data directory, the <literal>mysql</literal> database that
-            holds all database privileges, and the
+            server's data directory. Under the data directory, it
+            creates directories for the <literal>mysql</literal>
+            database that holds all database privileges and the
             <literal>test</literal> database that you can use to test
             MySQL. The script also creates privilege table entries for
             <literal>root</literal> accounts and anonymous-user
@@ -10039,7 +10051,7 @@
             <literal>columns_priv</literal>, and
             <literal>func</literal>, as well as others. See
             <xref linkend="privilege-system"/>, for a complete listing
-            and description of these.
+            and description of these tables.
           </para>
 
           <para>
@@ -10049,9 +10061,8 @@
           </para>
 
           <para>
-            If you have problems with
-            <command>mysql_install_db</command>, see
-            <xref linkend="mysql-install-db"/>.
+            If you have trouble with <command>mysql_install_db</command>
+            at this point, see <xref linkend="mysql-install-db"/>.
           </para>
         </listitem>
 
@@ -10122,7 +10133,7 @@
 
 <programlisting>
 shell&gt; <userinput>bin/mysqladmin version</userinput>
-mysqladmin  Ver 8.41 Distrib &current-version;, for pc-linux-gnu on i686
+mysqladmin  Ver 14.12 Distrib &current-version;, for pc-linux-gnu on i686
 Copyright (C) 2000 MySQL AB &amp; MySQL Finland AB &amp; TCX DataKonsult AB
 This software comes with ABSOLUTELY NO WARRANTY. This is free software,
 and you are welcome to modify and redistribute it under the GPL license
@@ -10167,7 +10178,7 @@
 
         <listitem>
           <para>
-            Verify that you can restart the server. Do this by using
+            Verify that you can start the server again. Do this by using
             <command>mysqld_safe</command> or by invoking
             <command>mysqld</command> directly. For example:
           </para>
@@ -10248,11 +10259,9 @@
             <filename>sql-bench</filename> directory (under the MySQL
             installation directory) that you can use to compare how
             MySQL performs on different platforms. The benchmark suite
-            is written in Perl. It uses the Perl DBI module to provide a
-            database-independent interface to the various databases, and
-            some other additional Perl modules are required to run the
-            benchmark suite. You must have the following modules
-            installed:
+            is written in Perl. It requires the Perl DBI module that
+            provides a database-independent interface to the various
+            databases, and some other additional Perl modules:
           </para>
 
 <programlisting>
@@ -10324,8 +10333,8 @@
       <para>
         The MySQL &current-series; installation procedure creates time
         zone tables in the <literal>mysql</literal> database. However,
-        you must populate the tables manually. Instructions for doing
-        this are given in <xref linkend="time-zone-support"/>.
+        you must populate the tables manually using the instructions in
+        <xref linkend="time-zone-support"/>.
       </para>
 
       <section id="mysql-install-db">
@@ -10353,17 +10362,23 @@
           <command>mysqld</command> server if it's running. Then rename
           the <filename>mysql</filename> directory under the data
           directory to save it, and then run
-          <command>mysql_install_db</command>. For example:
+          <command>mysql_install_db</command>. Suppose that your current
+          directory is the MySQL installation directory and that
+          <command>mysql_install_db</command> is located in the
+          <filename>bin</filename> directory and the data directory is
+          named <filename>data</filename>. To rename the
+          <literal>mysql</literal> database and re-run
+          <command>mysql_install_db</command>, use these commands.
         </para>
 
 <programlisting>
-shell&gt; <userinput>mv mysql-data-directory/mysql mysql-data-directory/mysql-old</userinput>
-shell&gt; <userinput>mysql_install_db --user=mysql</userinput>
+shell&gt; <userinput>mv data/mysql data/mysql.old</userinput>
+shell&gt; <userinput>bin/mysql_install_db --user=mysql</userinput>
 </programlisting>
 
         <para>
-          This section lists problems you might encounter when you run
-          <command>mysql_install_db</command>:
+          When you run <command>mysql_install_db</command>, you might
+          encounter the following problems:
         </para>
 
         <itemizedlist>
@@ -10388,8 +10403,8 @@
             <para>
               In this case, you should examine the error log file very
               carefully. The log should be located in the directory
-              <filename>XXXXXX</filename> named by the error message,
-              and should indicate why <command>mysqld</command> didn't
+              <filename>XXXXXX</filename> named by the error message and
+              should indicate why <command>mysqld</command> didn't
               start. If you do not understand what happened, include the
               log when you post a bug report. See
               <xref linkend="bug-reports"/>.
@@ -10404,10 +10419,11 @@
 
             <para>
               This indicates that the server is running, in which case
-              the grant tables have probably been created. If so, there
-              is no need to run <command>mysql_install_db</command> at
-              all because it needs to be run only once (when you install
-              MySQL the first time).
+              the grant tables have probably been created already. If
+              so, there is no need to run
+              <command>mysql_install_db</command> at all because it
+              needs to be run only once (when you install MySQL the
+              first time).
             </para>
           </listitem>
 
@@ -10459,8 +10475,8 @@
                 <secondary><literal>tmp</literal></secondary>
               </indexterm>
 
-              <emphasis role="bold">You do not have write access to
-              <filename>/tmp</filename></emphasis>
+              <emphasis role="bold">You do not have write access to the
+              <filename>/tmp</filename> directory</emphasis>
             </para>
 
             <para>
@@ -10472,10 +10488,13 @@
             </para>
 
             <para>
-              You can specify different temporary directory and Unix
-              socket file locations by executing these commands prior to
-              starting <command>mysql_install_db</command> or
-              <command>mysqld</command>:
+              You can specify different locations for the temporary
+              directory and Unix socket file by executing these commands
+              prior to starting <command>mysql_install_db</command> or
+              <command>mysqld</command>, where
+              <replaceable>some_tmp_dir</replaceable> is the full
+              pathname to some directory for which you have write
+              permission:
             </para>
 
             <indexterm type="type">
@@ -10503,13 +10522,7 @@
 </programlisting>
 
             <para>
-              <filename><replaceable>some_tmp_dir</replaceable></filename>
-              should be the full pathname to some directory for which
-              you have write permission.
-            </para>
-
-            <para>
-              After this, you should be able to run
+              Then you should be able to run
               <command>mysql_install_db</command> and start the server
               with these commands:
             </para>
@@ -10535,8 +10548,8 @@
 
         <para>
           There are some alternatives to running the
-          <command>mysql_install_db</command> script as it is provided
-          in the MySQL distribution:
+          <command>mysql_install_db</command> script provided in the
+          MySQL distribution:
         </para>
 
         <indexterm>
@@ -10601,12 +10614,8 @@
             <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
+              <filename>.MYD</filename> files in the
+              <literal>mysql</literal> database directory. Then run the
               <command>mysql_install_db</command> script again.
             </para>
           </listitem>
@@ -10694,7 +10703,7 @@
               By invoking <command>mysqld_safe</command>, which tries to
               determine the proper options for <command>mysqld</command>
               and then runs it with those options. This script is used
-              on systems based on BSD Unix. See
+              on Unix and Unix-like systems. See
               <xref linkend="mysqld-safe"/>.
             </para>
           </listitem>
@@ -10725,8 +10734,8 @@
         </itemizedlist>
 
         <para>
-          The <command>mysql.server</command> and
-          <command>mysqld_safe</command> scripts and the Mac OS X
+          The <command>mysqld_safe</command> and
+          <command>mysql.server</command> scripts and the Mac OS X
           Startup Item can be used to start the server manually, or
           automatically at system startup time.
           <command>mysql.server</command> and the Startup Item also can
@@ -10763,7 +10772,7 @@
         </para>
 
         <para>
-          <command>mysql.server stop</command> brings down the server by
+          <command>mysql.server stop</command> stops the server by
           sending a signal to it. You can also stop the server manually
           by executing <command>mysqladmin shutdown</command>.
         </para>
@@ -10926,26 +10935,27 @@
               <row>
                 <entry><command>mysqld</command></entry>
                 <entry><literal>[mysqld]</literal>, <literal>[server]</literal>,
-                  <literal>[mysqld-major-version]</literal></entry>
+                  <literal>[mysqld-<replaceable>major_version</replaceable>]</literal></entry>
               </row>
               <row>
+                <entry><command>mysqld_safe</command></entry>
+                <entry><literal>[mysqld]</literal>, <literal>[server]</literal>,
+                  <literal>[mysqld_safe]</literal></entry>
+              </row>
+              <row>
                 <entry><command>mysql.server</command></entry>
                 <entry><literal>[mysqld]</literal>, <literal>[mysql.server]</literal>,
                   <literal>[server]</literal></entry>
               </row>
-              <row>
-                <entry><command>mysqld_safe</command></entry>
-                <entry><literal>[mysqld]</literal>, <literal>[server]</literal>,
-                  <literal>[mysqld_safe]</literal></entry>
-              </row>
             </tbody>
           </tgroup>
         </informaltable>
 
         <para>
-          <literal>[mysqld-major-version]</literal> means that groups
-          with names like <literal>[mysqld-&previous-series;]</literal>
-          and <literal>[mysqld-&current-series;]</literal> are read by
+          <literal>[mysqld-<replaceable>major_version</replaceable>]</literal>
+          means that groups with names like
+          <literal>[mysqld-&previous-series;]</literal> and
+          <literal>[mysqld-&current-series;]</literal> are read by
           servers having versions &previous-series;.x,
           &current-series;.x, and so forth. This feature can be used to
           specify options that can be read only by servers within a

Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml	2006-01-31 00:46:00 UTC (rev 1142)
+++ trunk/refman-5.1/installing.xml	2006-01-31 03:55:14 UTC (rev 1143)
@@ -9682,9 +9682,9 @@
 
           <listitem>
             <para>
-              Copy or upload to your Windows machine the Windows source
-              package that you have just created. To compile it, use the
-              instructions in
+              Copy or upload the Windows source package that you have
+              just created to your Windows machine. To compile it, use
+              the instructions in
               <xref linkend="windows-vc-plus-plus-build"/>.
             </para>
           </listitem>
@@ -9764,15 +9764,14 @@
     </indexterm>
 
     <para>
-      After installing MySQL, there are some issues you should address.
-      For example, on Unix, you should initialize the data directory and
-      create the MySQL grant tables. On all platforms, an important
-      security concern is that the initial accounts in the grant tables
-      have no passwords. You should assign passwords to prevent
-      unauthorized access to the MySQL server. You can create time zone
-      tables to enable recognition of named time zones. (Currently,
-      these tables can be populated only on Unix. This problem will be
-      addressed soon for Windows.)
+      After installing MySQL, there are some issues that you should
+      address. For example, on Unix, you should initialize the data
+      directory and create the MySQL grant tables. On all platforms, an
+      important security concern is that the initial accounts in the
+      grant tables have no passwords. You should assign passwords to
+      prevent unauthorized access to the MySQL server. Optionally, you
+      can create time zone tables to enable recognition of named time
+      zones.
     </para>
 
     <para>
@@ -9801,13 +9800,13 @@
         On Windows, the data directory and the grant tables do not have
         to be created. MySQL Windows distributions include the grant
         tables with a set of preinitialized accounts in the
-        <literal>mysql</literal> database under the data directory. You
-        do not run the <command>mysql_install_db</command> script that
-        is used on Unix. However, if you did not install MySQL using the
-        Windows Installation Wizard, you should assign passwords to the
-        accounts. See
-        <xref linkend="mysql-install-wizard-introduction"/>. The
-        procedure for this is given in
+        <literal>mysql</literal> database under the data directory. It
+        is unnecessary to run the <command>mysql_install_db</command>
+        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
+        password-assignment procedure given in
         <xref linkend="default-privileges"/>.
       </para>
 
@@ -9832,16 +9831,27 @@
 
 C:\&gt; <userinput>C:\mysql\bin\mysqlshow mysql</userinput>
 Database: mysql
-+--------------+
-|    Tables    |
-+--------------+
-| columns_priv |
-| db           |
-| func         |
-| host         |
-| tables_priv  |
-| user         |
-+--------------+
++---------------------------+
+|          Tables           |
++---------------------------+
+| columns_priv              |
+| db                        |
+| func                      |
+| help_category             |
+| help_keyword              |
+| help_relation             |
+| help_topic                |
+| host                      |
+| proc                      |
+| procs_priv                |
+| tables_priv               |
+| time_zone                 |
+| time_zone_leap_second     |
+| time_zone_name            |
+| time_zone_transition      |
+| time_zone_transition_type |
+| user                      |
++---------------------------+
 
 C:\&gt; <userinput>C:\mysql\bin\mysql -e "SELECT Host,Db,User FROM db" mysql</userinput>
 +------+-------+------+
@@ -9973,7 +9983,8 @@
             program to set up the initial MySQL grant tables containing
             the privileges that determine how users are allowed to
             connect to the server. You'll need to do this if you used a
-            distribution type that doesn't run the program for you.
+            distribution type for which the installation procedure
+            doesn't run the program for you.
           </para>
 
           <para>
@@ -10000,8 +10011,9 @@
 
           <para>
             The <command>mysql_install_db</command> script creates the
-            data directory, the <literal>mysql</literal> database that
-            holds all database privileges, and the
+            server's data directory. Under the data directory, it
+            creates directories for the <literal>mysql</literal>
+            database that holds all database privileges and the
             <literal>test</literal> database that you can use to test
             MySQL. The script also creates privilege table entries for
             <literal>root</literal> accounts and anonymous-user
@@ -10035,7 +10047,7 @@
             <literal>columns_priv</literal>, and
             <literal>func</literal>, as well as others. See
             <xref linkend="privilege-system"/>, for a complete listing
-            and description of these.
+            and description of these tables.
           </para>
 
           <para>
@@ -10045,9 +10057,8 @@
           </para>
 
           <para>
-            If you have problems with
-            <command>mysql_install_db</command>, see
-            <xref linkend="mysql-install-db"/>.
+            If you have trouble with <command>mysql_install_db</command>
+            at this point, see <xref linkend="mysql-install-db"/>.
           </para>
         </listitem>
 
@@ -10118,7 +10129,7 @@
 
 <programlisting>
 shell&gt; <userinput>bin/mysqladmin version</userinput>
-mysqladmin  Ver 8.41 Distrib &current-version;, for pc-linux-gnu on i686
+mysqladmin  Ver 14.12 Distrib &current-version;, for pc-linux-gnu on i686
 Copyright (C) 2000 MySQL AB &amp; MySQL Finland AB &amp; TCX DataKonsult AB
 This software comes with ABSOLUTELY NO WARRANTY. This is free software,
 and you are welcome to modify and redistribute it under the GPL license
@@ -10163,7 +10174,7 @@
 
         <listitem>
           <para>
-            Verify that you can restart the server. Do this by using
+            Verify that you can start the server again. Do this by using
             <command>mysqld_safe</command> or by invoking
             <command>mysqld</command> directly. For example:
           </para>
@@ -10244,11 +10255,9 @@
             <filename>sql-bench</filename> directory (under the MySQL
             installation directory) that you can use to compare how
             MySQL performs on different platforms. The benchmark suite
-            is written in Perl. It uses the Perl DBI module to provide a
-            database-independent interface to the various databases, and
-            some other additional Perl modules are required to run the
-            benchmark suite. You must have the following modules
-            installed:
+            is written in Perl. It requires the Perl DBI module that
+            provides a database-independent interface to the various
+            databases, and some other additional Perl modules:
           </para>
 
 <programlisting>
@@ -10320,8 +10329,8 @@
       <para>
         The MySQL &current-series; installation procedure creates time
         zone tables in the <literal>mysql</literal> database. However,
-        you must populate the tables manually. Instructions for doing
-        this are given in <xref linkend="time-zone-support"/>.
+        you must populate the tables manually using the instructions in
+        <xref linkend="time-zone-support"/>.
       </para>
 
       <section id="mysql-install-db">
@@ -10349,17 +10358,23 @@
           <command>mysqld</command> server if it's running. Then rename
           the <filename>mysql</filename> directory under the data
           directory to save it, and then run
-          <command>mysql_install_db</command>. For example:
+          <command>mysql_install_db</command>. Suppose that your current
+          directory is the MySQL installation directory and that
+          <command>mysql_install_db</command> is located in the
+          <filename>bin</filename> directory and the data directory is
+          named <filename>data</filename>. To rename the
+          <literal>mysql</literal> database and re-run
+          <command>mysql_install_db</command>, use these commands.
         </para>
 
 <programlisting>
-shell&gt; <userinput>mv mysql-data-directory/mysql mysql-data-directory/mysql-old</userinput>
-shell&gt; <userinput>mysql_install_db --user=mysql</userinput>
+shell&gt; <userinput>mv data/mysql data/mysql.old</userinput>
+shell&gt; <userinput>bin/mysql_install_db --user=mysql</userinput>
 </programlisting>
 
         <para>
-          This section lists problems you might encounter when you run
-          <command>mysql_install_db</command>:
+          When you run <command>mysql_install_db</command>, you might
+          encounter the following problems:
         </para>
 
         <itemizedlist>
@@ -10384,8 +10399,8 @@
             <para>
               In this case, you should examine the error log file very
               carefully. The log should be located in the directory
-              <filename>XXXXXX</filename> named by the error message,
-              and should indicate why <command>mysqld</command> didn't
+              <filename>XXXXXX</filename> named by the error message and
+              should indicate why <command>mysqld</command> didn't
               start. If you do not understand what happened, include the
               log when you post a bug report. See
               <xref linkend="bug-reports"/>.
@@ -10400,10 +10415,11 @@
 
             <para>
               This indicates that the server is running, in which case
-              the grant tables have probably been created. If so, there
-              is no need to run <command>mysql_install_db</command> at
-              all because it needs to be run only once (when you install
-              MySQL the first time).
+              the grant tables have probably been created already. If
+              so, there is no need to run
+              <command>mysql_install_db</command> at all because it
+              needs to be run only once (when you install MySQL the
+              first time).
             </para>
           </listitem>
 
@@ -10455,8 +10471,8 @@
                 <secondary><literal>tmp</literal></secondary>
               </indexterm>
 
-              <emphasis role="bold">You do not have write access to
-              <filename>/tmp</filename></emphasis>
+              <emphasis role="bold">You do not have write access to the
+              <filename>/tmp</filename> directory</emphasis>
             </para>
 
             <para>
@@ -10468,10 +10484,13 @@
             </para>
 
             <para>
-              You can specify different temporary directory and Unix
-              socket file locations by executing these commands prior to
-              starting <command>mysql_install_db</command> or
-              <command>mysqld</command>:
+              You can specify different locations for the temporary
+              directory and Unix socket file by executing these commands
+              prior to starting <command>mysql_install_db</command> or
+              <command>mysqld</command>, where
+              <replaceable>some_tmp_dir</replaceable> is the full
+              pathname to some directory for which you have write
+              permission:
             </para>
 
             <indexterm type="type">
@@ -10499,13 +10518,7 @@
 </programlisting>
 
             <para>
-              <filename><replaceable>some_tmp_dir</replaceable></filename>
-              should be the full pathname to some directory for which
-              you have write permission.
-            </para>
-
-            <para>
-              After this, you should be able to run
+              Then you should be able to run
               <command>mysql_install_db</command> and start the server
               with these commands:
             </para>
@@ -10531,8 +10544,8 @@
 
         <para>
           There are some alternatives to running the
-          <command>mysql_install_db</command> script as it is provided
-          in the MySQL distribution:
+          <command>mysql_install_db</command> script provided in the
+          MySQL distribution:
         </para>
 
         <indexterm>
@@ -10597,12 +10610,8 @@
             <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
+              <filename>.MYD</filename> files in the
+              <literal>mysql</literal> database directory. Then run the
               <command>mysql_install_db</command> script again.
             </para>
           </listitem>
@@ -10690,7 +10699,7 @@
               By invoking <command>mysqld_safe</command>, which tries to
               determine the proper options for <command>mysqld</command>
               and then runs it with those options. This script is used
-              on systems based on BSD Unix. See
+              on Unix and Unix-like systems. See
               <xref linkend="mysqld-safe"/>.
             </para>
           </listitem>
@@ -10721,8 +10730,8 @@
         </itemizedlist>
 
         <para>
-          The <command>mysql.server</command> and
-          <command>mysqld_safe</command> scripts and the Mac OS X
+          The <command>mysqld_safe</command> and
+          <command>mysql.server</command> scripts and the Mac OS X
           Startup Item can be used to start the server manually, or
           automatically at system startup time.
           <command>mysql.server</command> and the Startup Item also can
@@ -10759,7 +10768,7 @@
         </para>
 
         <para>
-          <command>mysql.server stop</command> brings down the server by
+          <command>mysql.server stop</command> stops the server by
           sending a signal to it. You can also stop the server manually
           by executing <command>mysqladmin shutdown</command>.
         </para>
@@ -10922,26 +10931,27 @@
               <row>
                 <entry><command>mysqld</command></entry>
                 <entry><literal>[mysqld]</literal>, <literal>[server]</literal>,
-                  <literal>[mysqld-major-version]</literal></entry>
+                  <literal>[mysqld-<replaceable>major_version</replaceable>]</literal></entry>
               </row>
               <row>
+                <entry><command>mysqld_safe</command></entry>
+                <entry><literal>[mysqld]</literal>, <literal>[server]</literal>,
+                  <literal>[mysqld_safe]</literal></entry>
+              </row>
+              <row>
                 <entry><command>mysql.server</command></entry>
                 <entry><literal>[mysqld]</literal>, <literal>[mysql.server]</literal>,
                   <literal>[server]</literal></entry>
               </row>
-              <row>
-                <entry><command>mysqld_safe</command></entry>
-                <entry><literal>[mysqld]</literal>, <literal>[server]</literal>,
-                  <literal>[mysqld_safe]</literal></entry>
-              </row>
             </tbody>
           </tgroup>
         </informaltable>
 
         <para>
-          <literal>[mysqld-major-version]</literal> means that groups
-          with names like <literal>[mysqld-&previous-series;]</literal>
-          and <literal>[mysqld-&current-series;]</literal> are read by
+          <literal>[mysqld-<replaceable>major_version</replaceable>]</literal>
+          means that groups with names like
+          <literal>[mysqld-&previous-series;]</literal> and
+          <literal>[mysqld-&current-series;]</literal> are read by
           servers having versions &previous-series;.x,
           &current-series;.x, and so forth. This feature can be used to
           specify options that can be read only by servers within a

Thread
svn commit - mysqldoc@docsrva: r1143 - in trunk: . refman-4.1 refman-5.0 refman-5.1paul31 Jan