List:Commits« Previous MessageNext Message »
From:paul Date:January 9 2006 5:10am
Subject:svn commit - mysqldoc@docsrva: r733 - in trunk: . refman-5.1
View as plain text  
Author: paul
Date: 2006-01-09 06:10:00 +0100 (Mon, 09 Jan 2006)
New Revision: 733

Log:
 r5982@frost:  paul | 2006-01-08 23:09:39 -0600
 Minor tweaks.
 Format.


Modified:
   trunk/
   trunk/refman-5.1/apis.xml
   trunk/refman-5.1/custom-engine.xml
   trunk/refman-5.1/database-administration.xml
   trunk/refman-5.1/innodb.xml
   trunk/refman-5.1/installing.xml
   trunk/refman-5.1/ndbcluster.xml
   trunk/refman-5.1/optimization.xml
   trunk/refman-5.1/partitioning.xml
   trunk/refman-5.1/problems.xml
   trunk/refman-5.1/sql-syntax.xml


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

Modified: trunk/refman-5.1/apis.xml
===================================================================
--- trunk/refman-5.1/apis.xml	2006-01-09 03:11:19 UTC (rev 732)
+++ trunk/refman-5.1/apis.xml	2006-01-09 05:10:00 UTC (rev 733)
@@ -2037,8 +2037,8 @@
         <para>
           Note that when you use a <literal>REPLACE</literal> command,
           <literal>mysql_affected_rows()</literal> returns 2 if the new
-          row replaced an old row, because in this case one row
-          was inserted after the duplicate was deleted.
+          row replaced an old row, because in this case one row was
+          inserted after the duplicate was deleted.
         </para>
 
         <para>

Modified: trunk/refman-5.1/custom-engine.xml
===================================================================
--- trunk/refman-5.1/custom-engine.xml	2006-01-09 03:11:19 UTC (rev 732)
+++ trunk/refman-5.1/custom-engine.xml	2006-01-09 05:10:00 UTC (rev 733)
@@ -2771,10 +2771,11 @@
       </para>
 
       <para>
-        When a <literal>COMMIT</literal> or <literal>ROLLBACK</literal> operation occurs (with <literal>bool
-        all</literal> set to <literal>true</literal>), all savepoints
-        are assumed to be released. If the storage engine allocates
-        resources for savepoints, it should free them.
+        When a <literal>COMMIT</literal> or <literal>ROLLBACK</literal>
+        operation occurs (with <literal>bool all</literal> set to
+        <literal>true</literal>), all savepoints are assumed to be
+        released. If the storage engine allocates resources for
+        savepoints, it should free them.
       </para>
 
       <para>

Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml	2006-01-09 03:11:19 UTC (rev 732)
+++ trunk/refman-5.1/database-administration.xml	2006-01-09 05:10:00 UTC (rev 733)
@@ -13131,12 +13131,12 @@
       <para>
         Administrative privileges (such as <literal>RELOAD</literal> or
         <literal>SHUTDOWN</literal>) are specified only in the
-        <literal>user</literal> table. The reason for this is that administrative
-        operations are operations on the server itself and are not
-        database-specific, so there is no reason to list these
-        privileges in the other grant tables. In fact, to determine
-        whether you can perform an administrative operation, the server
-        need consult only the <literal>user</literal> table.
+        <literal>user</literal> table. The reason for this is that
+        administrative operations are operations on the server itself
+        and are not database-specific, so there is no reason to list
+        these privileges in the other grant tables. In fact, to
+        determine whether you can perform an administrative operation,
+        the server need consult only the <literal>user</literal> table.
       </para>
 
       <para>

Modified: trunk/refman-5.1/innodb.xml
===================================================================
--- trunk/refman-5.1/innodb.xml	2006-01-09 03:11:19 UTC (rev 732)
+++ trunk/refman-5.1/innodb.xml	2006-01-09 05:10:00 UTC (rev 733)
@@ -913,8 +913,8 @@
         <literal>newraw</literal> immediately after the data file size
         in <literal>innodb_data_file_path</literal>. The partition must
         be at least as large as the size that you specify. Note that 1MB
-        in <literal>InnoDB</literal> is 1024 &times; 1024 bytes, whereas 1MB
-        usually means 1,000,000 bytes in disk specifications.
+        in <literal>InnoDB</literal> is 1024 &times; 1024 bytes, whereas
+        1MB usually means 1,000,000 bytes in disk specifications.
       </para>
 
 <programlisting>

Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml	2006-01-09 03:11:19 UTC (rev 732)
+++ trunk/refman-5.1/installing.xml	2006-01-09 05:10:00 UTC (rev 733)
@@ -14341,9 +14341,9 @@
         <para>
           Some customers have had problems on BSDI 4.0.1 that the
           <command>mysqld</command> binary after a while can't open
-          tables. This occurs because some library/system-related bug causes
-          <command>mysqld</command> to change current directory without
-          having asked for that to happen.
+          tables. This occurs because some library/system-related bug
+          causes <command>mysqld</command> to change current directory
+          without having asked for that to happen.
         </para>
 
         <para>

Modified: trunk/refman-5.1/ndbcluster.xml
===================================================================
--- trunk/refman-5.1/ndbcluster.xml	2006-01-09 03:11:19 UTC (rev 732)
+++ trunk/refman-5.1/ndbcluster.xml	2006-01-09 05:10:00 UTC (rev 733)
@@ -1719,8 +1719,8 @@
 
       <para>
         For subsequent <command>ndbd</command> starts, you will
-        generally <emphasis role="bold">not</emphasis> want to use the <option>--initial</option>
-        option:
+        generally <emphasis role="bold">not</emphasis> want to use the
+        <option>--initial</option> option:
       </para>
 
 <programlisting>
@@ -1728,11 +1728,11 @@
 </programlisting>
 
       <para>
-        The reason for this is that the <option>--initial</option> option will
-        delete all existing data and log files (as well as all table
-        metadata) for this data node and create new ones. One exception
-        to this rule is when restarting the cluster and restoring from
-        backup after adding new data nodes.
+        The reason for this is that the <option>--initial</option>
+        option will delete all existing data and log files (as well as
+        all table metadata) for this data node and create new ones. One
+        exception to this rule is when restarting the cluster and
+        restoring from backup after adding new data nodes.
       </para>
 
       <remark role="todo">
@@ -2593,8 +2593,9 @@
         <para>
           For each parameter it is possible to use <literal>k</literal>,
           <literal>M</literal>, or <literal>G</literal> as a suffix to
-          indicate units of 1024, 1024&times;1024, or 1024&times;1024&times;1024. (For
-          example, <literal>100k</literal> means 100 &times; 1024 = 102400.)
+          indicate units of 1024, 1024&times;1024, or
+          1024&times;1024&times;1024. (For example,
+          <literal>100k</literal> means 100 &times; 1024 = 102400.)
           Parameters and values are currently case-sensitive.
         </para>
 
@@ -3291,9 +3292,9 @@
               <filename>ndb/src/kernel/blocks/Dbtc/Dbtc.hpp</filename>)
               set to 4000*128 bytes (500KB). A similar buffer for key
               info, <literal>ZDATABUF_FILESIZE</literal> (also in
-              <filename>Dbtc.hpp</filename>) contains 4000 &times; 16 = 62.5KB
-              of buffer space. <literal>Dbtc</literal> is the module
-              which handles transaction coordination.
+              <filename>Dbtc.hpp</filename>) contains 4000 &times; 16 =
+              62.5KB of buffer space. <literal>Dbtc</literal> is the
+              module which handles transaction coordination.
             </para>
           </listitem>
 
@@ -3997,7 +3998,7 @@
               When a transaction is committed, it is committed in main
               memory in all nodes on which the data is mirrored.
               However, transaction log records are not flushed to disk
-              as part of the commit. The reasoning behing this behavior
+              as part of the commit. The reasoning behind this behavior
               is that having the transaction safely committed on at
               least two autonomous host machines should meet reasonable
               standards for durability.
@@ -10652,11 +10653,11 @@
 
           <listitem>
             <para>
-              MySQL replication will not work correctly off if updates
-              are done on multiple MySQL servers. However, if the
-              database partitioning scheme done at the application
-              level, and no transactions take place across these
-              partitions, then replication can be made to work.
+              MySQL replication will not work correctly if updates are
+              done on multiple MySQL servers. However, if the database
+              partitioning scheme done at the application level, and no
+              transactions take place across these partitions, then
+              replication can be made to work.
             </para>
           </listitem>
 
@@ -12064,9 +12065,10 @@
           Yes, it is possible to use DNS and DHCP for cluster hosts.
           However, if your application requires <quote>five
           nines</quote> availability, we recommend using fixed IP
-          addresses. Making communication between
-          Cluster hosts dependent on services such as DNS and DHCP introduces additional
-          points of failure, and the fewer of these, the better.
+          addresses. Making communication between Cluster hosts
+          dependent on services such as DNS and DHCP introduces
+          additional points of failure, and the fewer of these, the
+          better.
         </para>
       </listitem>
 

Modified: trunk/refman-5.1/optimization.xml
===================================================================
--- trunk/refman-5.1/optimization.xml	2006-01-09 03:11:19 UTC (rev 732)
+++ trunk/refman-5.1/optimization.xml	2006-01-09 05:10:00 UTC (rev 733)
@@ -1846,9 +1846,9 @@
         Cartesian product of all the tables; that is, every combination
         of rows. This takes quite a long time, because the product of
         the number of rows in each table must be examined. For the case
-        at hand, this product is <literal>74 &times; 2135 &times; 74 &times; 3872 =
-        45,268,558,720</literal> rows. If the tables were bigger, you
-        can only imagine how long it would take.
+        at hand, this product is <literal>74 &times; 2135 &times; 74
+        &times; 3872 = 45,268,558,720</literal> rows. If the tables were
+        bigger, you can only imagine how long it would take.
       </para>
 
       <para>
@@ -2002,8 +2002,8 @@
         you can estimate that, using B-tree indexes, you need this many
         seeks to find a row:
         <literal>log(<replaceable>row_count</replaceable>) /
-        log(<replaceable>index_block_length</replaceable> / 3 &times; 2 /
-        (<replaceable>index_length</replaceable> +
+        log(<replaceable>index_block_length</replaceable> / 3 &times; 2
+        / (<replaceable>index_length</replaceable> +
         <replaceable>data_pointer_length</replaceable>)) + 1</literal>.
       </para>
 
@@ -2016,10 +2016,10 @@
       </para>
 
       <para>
-        This index would require storage of about 500,000 &times; 7 &times; 3/2 =
-        5.2MB (assuming a typical index buffer fill ratio of 2/3), so
-        you probably have much of the index in memory and so need only
-        one or two calls to read data to find the row.
+        This index would require storage of about 500,000 &times; 7
+        &times; 3/2 = 5.2MB (assuming a typical index buffer fill ratio
+        of 2/3), so you probably have much of the index in memory and so
+        need only one or two calls to read data to find the row.
       </para>
 
       <para>

Modified: trunk/refman-5.1/partitioning.xml
===================================================================
--- trunk/refman-5.1/partitioning.xml	2006-01-09 03:11:19 UTC (rev 732)
+++ trunk/refman-5.1/partitioning.xml	2006-01-09 05:10:00 UTC (rev 733)
@@ -496,8 +496,9 @@
 </programlisting>
 
     <para>
-      Failure occurs because MySQL sees no difference between the partition
-      names <literal>mypart</literal> and <literal>MyPart</literal>.
+      Failure occurs because MySQL sees no difference between the
+      partition names <literal>mypart</literal> and
+      <literal>MyPart</literal>.
     </para>
 
     <para>
@@ -919,9 +920,9 @@
 </programlisting>
 
       <para>
-        Failure occurs because the <literal>store_id</literal> column value
-        <literal>21</literal> is not found in any of the value lists
-        used to define partitions <literal>pNorth</literal>,
+        Failure occurs because the <literal>store_id</literal> column
+        value <literal>21</literal> is not found in any of the value
+        lists used to define partitions <literal>pNorth</literal>,
         <literal>pEast</literal>, <literal>pWest</literal>, or
         <literal>pCentral</literal>. It is important to note that there
         is no <quote>catch-all</quote> definition for list partitions

Modified: trunk/refman-5.1/problems.xml
===================================================================
--- trunk/refman-5.1/problems.xml	2006-01-09 03:11:19 UTC (rev 732)
+++ trunk/refman-5.1/problems.xml	2006-01-09 05:10:00 UTC (rev 733)
@@ -3734,10 +3734,10 @@
 
       <para>
         Standard SQL doesn't allow you to refer to a column alias in a
-        <literal>WHERE</literal> clause. This restriction is imposed because when the
-        <literal>WHERE</literal> code is executed, the column value may
-        not yet be determined. For example, the following query is
-        illegal:
+        <literal>WHERE</literal> clause. This restriction is imposed
+        because when the <literal>WHERE</literal> code is executed, the
+        column value may not yet be determined. For example, the
+        following query is illegal:
       </para>
 
 <programlisting>

Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml	2006-01-09 03:11:19 UTC (rev 732)
+++ trunk/refman-5.1/sql-syntax.xml	2006-01-09 05:10:00 UTC (rev 733)
@@ -1392,9 +1392,9 @@
         index type. However, <literal>USING</literal> is the preferred
         form. In addition, the index name that precedes the index type
         in the index specification syntax is not optional with
-        <literal>TYPE</literal>: Unlike
-        <literal>USING</literal>, <literal>TYPE</literal> is not a
-        reserved word and thus is interpreted as an index name.
+        <literal>TYPE</literal>: Unlike <literal>USING</literal>,
+        <literal>TYPE</literal> is not a reserved word and thus is
+        interpreted as an index name.
       </para>
 
       <para>
@@ -19070,9 +19070,9 @@
           <option>--replicate-*-do-*</option> and
           <option>--replicate-*-ignore-*</option> options are honored.
           <option>--replicate-rewrite-db</option> is
-          <emphasis>not</emphasis> taken into account because a
-          user could use this option to set up a non-unique mapping such
-          as <option>--replicate-rewrite-db=db1-&gt;db3</option> and
+          <emphasis>not</emphasis> taken into account because a user
+          could use this option to set up a non-unique mapping such as
+          <option>--replicate-rewrite-db=db1-&gt;db3</option> and
           <option>--replicate-rewrite-db=db2-&gt;db3</option>, which
           would confuse the slave when loading tables from the master.
         </para>

Thread
svn commit - mysqldoc@docsrva: r733 - in trunk: . refman-5.1paul9 Jan