svn commit - mysqldoc@docsrva: r1099 - in trunk: . refman-4.1 refman-5.0 refman-5.1

[paul]

Author: paul
Date: 2006-01-29 06:01:19 +0100 (Sun, 29 Jan 2006)
New Revision: 1099

Log:
 r6847@frost:  paul | 2006-01-28 22:58:49 -0600
 Kill diffs.


Modified:
   trunk/
   trunk/refman-4.1/database-administration.xml
   trunk/refman-5.0/database-administration.xml
   trunk/refman-5.1/database-administration.xml


Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6846
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2588
   + b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6847
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2588

Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml	2006-01-29 05:00:58 UTC (rev 1098)
+++ trunk/refman-4.1/database-administration.xml	2006-01-29 05:01:19 UTC (rev 1099)
@@ -16559,10 +16559,10 @@
         reads its logs and finds in them the list of pending committed
         and non-committed transactions that have not been flushed to the
         data files. <literal>InnoDB</literal> automatically rolls back
-        those that were not committed, and flushes to its data files
-        those that were committed. Information about this recovery
-        process is conveyed to the user through the MySQL error log. The
-        following is an example log excerpt:
+        those transactions that were not committed, and flushes to its
+        data files those that were committed. Information about this
+        recovery process is conveyed to the user through the MySQL error
+        log. The following is an example log excerpt:
       </para>
 
 <programlisting>
@@ -16645,7 +16645,7 @@
 
         <para>
           The resulting <filename>.sql</filename> file produced by
-          <command>mysqldump</command> contains SQL
+          <command>mysqldump</command> contains a set of SQL
           <literal>INSERT</literal> statements that can be used to
           reload the dumped tables at a later time.
         </para>
@@ -16656,7 +16656,7 @@
           generate. They are not optimal in the sense that each
           successive full backup includes all data, even that part that
           has not changed since the previous full backup. After we have
-          made the initial full backup, it is preferable to make
+          made the initial full backup, it is more efficient to make
           incremental backups. They are smaller and take less time to
           produce. The tradeoff is that, at recovery time, you cannot
           restore your data just by reloading the full backup. You must
@@ -17185,7 +17185,7 @@
 
         <para>
           If you run <command>mysqld</command> with external locking
-          disabled (which is the default as of MySQL 4.0), you can't
+          disabled (which is the default as of MySQL 4.0), you cannot
           reliably use <command>myisamchk</command> to check a table
           when <command>mysqld</command> is using the same table. If you
           can be sure that no one is accessing the tables through
@@ -17855,7 +17855,7 @@
         </indexterm>
 
         <para>
-          it is also a good idea to check tables when the server starts.
+          It is also a good idea to check tables when the server starts.
           For example, whenever the machine has done a restart in the
           middle of an update, you usually need to check all the tables
           that could have been affected. (These are
@@ -18957,9 +18957,9 @@
       </indexterm>
 
       <para>
-        This section discusses the procedure for adding additional
-        character sets to MySQL. You must have a MySQL source
-        distribution to use these instructions.
+        This section discusses the procedure for adding a new character
+        set to MySQL. You must have a MySQL source distribution to use
+        these instructions.
       </para>
 
       <para>
@@ -20794,7 +20794,7 @@
     </para>
 
     <para>
-      For better performance, you can also specify the following options
+      For better performance, you can specify the following options
       differently for each server, to spread the load between several
       physical disks:
     </para>

Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml	2006-01-29 05:00:58 UTC (rev 1098)
+++ trunk/refman-5.0/database-administration.xml	2006-01-29 05:01:19 UTC (rev 1099)
@@ -18920,6 +18920,7 @@
           <option>--log-bin</option> option so that it stores these
           changes in a file while it updates data. This option enables
           binary logging, so that the server writes each SQL statement
+          that updates data into a file called a MySQL binary log.
           Looking at the data directory of a MySQL server that was
           started with the <option>--log-bin</option> option and that
           has been running for some days, we find these MySQL binary log

Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml	2006-01-29 05:00:58 UTC (rev 1098)
+++ trunk/refman-5.1/database-administration.xml	2006-01-29 05:01:19 UTC (rev 1099)
@@ -18929,6 +18929,7 @@
           <option>--log-bin</option> option so that it stores these
           changes in a file while it updates data. This option enables
           binary logging, so that the server writes each SQL statement
+          that updates data into a file called a MySQL binary log.
           Looking at the data directory of a MySQL server that was
           started with the <option>--log-bin</option> option and that
           has been running for some days, we find these MySQL binary log