List:Commits« Previous MessageNext Message »
From:paul Date:January 22 2006 4:21pm
Subject:svn commit - mysqldoc@docsrva: r986 - in trunk: . refman-4.1 refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2006-01-22 17:21:17 +0100 (Sun, 22 Jan 2006)
New Revision: 986

Log:
 r6549@frost:  paul | 2006-01-22 09:57:16 -0600
 Tweaks. Reformat.


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:6548
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2396
   + b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6549
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2396

Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml	2006-01-22 16:18:54 UTC (rev 985)
+++ trunk/refman-4.1/database-administration.xml	2006-01-22 16:21:17 UTC (rev 986)
@@ -737,9 +737,9 @@
             </para>
 
             <para>
-              How the <literal>DELAY_KEY_WRITE</literal> table option should be
-              used. Delayed key writing causes key buffers not to be
-              flushed between writes for <literal>MyISAM</literal>
+              How the <literal>DELAY_KEY_WRITE</literal> table option
+              should be used. Delayed key writing causes key buffers not
+              to be flushed between writes for <literal>MyISAM</literal>
               tables. <literal>OFF</literal> disables delayed key
               writes. <literal>ON</literal> enables delayed key writes
               for those tables that were created with the
@@ -831,8 +831,9 @@
               disabled by default as of MySQL 4.0. Note that if you use
               this option on a system on which <literal>lockd</literal>
               does not fully work (such as Linux), it is easy for
-              <command>mysqld</command> to deadlock. This option
-              previously was named <option>--enable-locking</option>.
+              <command>mysqld</command> to deadlock. This option was
+              named <option>--enable-locking</option> before MySQL
+              4.0.3.
             </para>
 
             <para>
@@ -2131,17 +2132,18 @@
             <para>
               This mode can be useful if <literal>0</literal> has been
               stored in a table's <literal>AUTO_INCREMENT</literal>
-              column. (This is not a recommended practice, by the way.)
-              For example, if you dump the table with
-              <command>mysqldump</command> and then reload it, MySQL
-              normally generates new sequence numbers when it encounters
-              the <literal>0</literal> values, resulting in a table with
-              different contents than the one that was dumped. Enabling
-              <literal>NO_AUTO_VALUE_ON_ZERO</literal> before reloading
-              the dump file solves this problem. As of MySQL 4.1.1,
-              <command>mysqldump</command> automatically includes a
-              statement in the dump output to enable
-              <literal>NO_AUTO_VALUE_ON_ZERO</literal>.
+              column. (Storing <literal>0</literal> is not a recommended
+              practice, by the way.) For example, if you dump the table
+              with <command>mysqldump</command> and then reload it,
+              MySQL normally generates new sequence numbers when it
+              encounters the <literal>0</literal> values, resulting in a
+              table with contents different from the one that was
+              dumped. Enabling <literal>NO_AUTO_VALUE_ON_ZERO</literal>
+              before reloading the dump file solves this problem. As of
+              MySQL 4.1.1, <command>mysqldump</command> automatically
+              includes a statement in the dump output that enables
+              <literal>NO_AUTO_VALUE_ON_ZERO</literal>, to avoid this
+              problem..
             </para>
           </listitem>
 
@@ -4495,10 +4497,9 @@
               <literal>MAX_ROWS</literal> values. Setting this variable
               has no effect on any existing <literal>MEMORY</literal>
               table, unless the table is re-created with a statement
-              such as <literal>CREATE TABLE</literal> or
-              <literal>TRUNCATE TABLE</literal>, or altered with
-              <literal>ALTER TABLE</literal>. This variable was added in
-              MySQL 3.23.0.
+              such as <literal>CREATE TABLE</literal>, or altered with
+              <literal>ALTER TABLE</literal> or <literal>TRUNCATE
+              TABLE</literal>. This variable was added in MySQL 3.23.0.
             </para>
           </listitem>
 

Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml	2006-01-22 16:18:54 UTC (rev 985)
+++ trunk/refman-5.0/database-administration.xml	2006-01-22 16:21:17 UTC (rev 986)
@@ -756,9 +756,9 @@
             </para>
 
             <para>
-              How the <literal>DELAY_KEY_WRITE</literal> table option should be
-              used. Delayed key writing causes key buffers not to be
-              flushed between writes for <literal>MyISAM</literal>
+              How the <literal>DELAY_KEY_WRITE</literal> table option
+              should be used. Delayed key writing causes key buffers not
+              to be flushed between writes for <literal>MyISAM</literal>
               tables. <literal>OFF</literal> disables delayed key
               writes. <literal>ON</literal> enables delayed key writes
               for those tables that were created with the
@@ -2267,17 +2267,18 @@
             <para>
               This mode can be useful if <literal>0</literal> has been
               stored in a table's <literal>AUTO_INCREMENT</literal>
-              column. (This is not a recommended practice, by the way.)
-              For example, if you dump the table with
-              <command>mysqldump</command> and then reload it, MySQL
-              normally generates new sequence numbers when it encounters
-              the <literal>0</literal> values, resulting in a table with
-              different contents than the one that was dumped. Enabling
-              <literal>NO_AUTO_VALUE_ON_ZERO</literal> before reloading
-              the dump file solves this problem.
-              <command>mysqldump</command> automatically includes in its
-              output a statement enabling
-              <literal>NO_AUTO_VALUE_ON_ZERO</literal>.
+              column. (Storing <literal>0</literal> is not a recommended
+              practice, by the way.) For example, if you dump the table
+              with <command>mysqldump</command> and then reload it,
+              MySQL normally generates new sequence numbers when it
+              encounters the <literal>0</literal> values, resulting in a
+              table with contents different from the one that was
+              dumped. Enabling <literal>NO_AUTO_VALUE_ON_ZERO</literal>
+              before reloading the dump file solves this problem.
+              <command>mysqldump</command> now automatically includes in
+              its output a statement that enables
+              <literal>NO_AUTO_VALUE_ON_ZERO</literal>, to avoid this
+              problem.
             </para>
           </listitem>
 
@@ -5136,15 +5137,15 @@
 
             <para>
               This variable sets the maximum size to which
-              <literal>MEMORY</literal> (<literal>HEAP</literal>) tables
-              are allowed to grow. The value of the variable is used to
-              calculate <literal>MEMORY</literal> table
+              <literal>MEMORY</literal> tables are allowed to grow. The
+              value of the variable is used to calculate
+              <literal>MEMORY</literal> table
               <literal>MAX_ROWS</literal> values. Setting this variable
               has no effect on any existing <literal>MEMORY</literal>
               table, unless the table is re-created with a statement
-              such as <literal>CREATE TABLE</literal> or
-              <literal>TRUNCATE TABLE</literal>, or altered with
-              <literal>ALTER TABLE</literal>.
+              such as <literal>CREATE TABLE</literal> or altered with
+              <literal>ALTER TABLE</literal> or <literal>TRUNCATE
+              TABLE</literal>.
             </para>
           </listitem>
 

Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml	2006-01-22 16:18:54 UTC (rev 985)
+++ trunk/refman-5.1/database-administration.xml	2006-01-22 16:21:17 UTC (rev 986)
@@ -780,9 +780,9 @@
             </para>
 
             <para>
-              How the <literal>DELAY_KEY_WRITE</literal> table option should be
-              used. Delayed key writing causes key buffers not to be
-              flushed between writes for <literal>MyISAM</literal>
+              How the <literal>DELAY_KEY_WRITE</literal> table option
+              should be used. Delayed key writing causes key buffers not
+              to be flushed between writes for <literal>MyISAM</literal>
               tables. <literal>OFF</literal> disables delayed key
               writes. <literal>ON</literal> enables delayed key writes
               for those tables that were created with the
@@ -2255,17 +2255,18 @@
             <para>
               This mode can be useful if <literal>0</literal> has been
               stored in a table's <literal>AUTO_INCREMENT</literal>
-              column. (This is not a recommended practice, by the way.)
-              For example, if you dump the table with
-              <command>mysqldump</command> and then reload it, MySQL
-              normally generates new sequence numbers when it encounters
-              the <literal>0</literal> values, resulting in a table with
-              different contents than the one that was dumped. Enabling
-              <literal>NO_AUTO_VALUE_ON_ZERO</literal> before reloading
-              the dump file solves this problem.
-              <command>mysqldump</command> automatically includes in its
-              output a statement enabling
-              <literal>NO_AUTO_VALUE_ON_ZERO</literal>.
+              column. (Storing <literal>0</literal> is not a recommended
+              practice, by the way.) For example, if you dump the table
+              with <command>mysqldump</command> and then reload it,
+              MySQL normally generates new sequence numbers when it
+              encounters the <literal>0</literal> values, resulting in a
+              table with contents different from the one that was
+              dumped. Enabling <literal>NO_AUTO_VALUE_ON_ZERO</literal>
+              before reloading the dump file solves this problem.
+              <command>mysqldump</command> now automatically includes in
+              its output a statement that enables
+              <literal>NO_AUTO_VALUE_ON_ZERO</literal>, to avoid this
+              problem.
             </para>
           </listitem>
 
@@ -4860,7 +4861,7 @@
 
           <listitem>
             <para>
-              log_bin_trust_function_creators
+              <literal>log_bin_trust_function_creators</literal>
             </para>
 
             <para>
@@ -5150,15 +5151,15 @@
 
             <para>
               This variable sets the maximum size to which
-              <literal>MEMORY</literal> (<literal>HEAP</literal>) tables
-              are allowed to grow. The value of the variable is used to
-              calculate <literal>MEMORY</literal> table
+              <literal>MEMORY</literal> tables are allowed to grow. The
+              value of the variable is used to calculate
+              <literal>MEMORY</literal> table
               <literal>MAX_ROWS</literal> values. Setting this variable
               has no effect on any existing <literal>MEMORY</literal>
               table, unless the table is re-created with a statement
-              such as <literal>CREATE TABLE</literal> or
-              <literal>TRUNCATE TABLE</literal>, or altered with
-              <literal>ALTER TABLE</literal>.
+              such as <literal>CREATE TABLE</literal> or altered with
+              <literal>ALTER TABLE</literal> or <literal>TRUNCATE
+              TABLE</literal>.
             </para>
           </listitem>
 

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