svn commit - mysqldoc@docsrva: r5467 - trunk/refman-4.1

[jon]

Author: jstephens
Date: 2007-03-20 11:17:04 +0100 (Tue, 20 Mar 2007)
New Revision: 5467

Log:

Fixed apparent bad merge. (Thanks, Shane!)



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


Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml	2007-03-19 21:19:52 UTC (rev 5466)
+++ trunk/refman-4.1/database-administration.xml	2007-03-20 10:17:04 UTC (rev 5467)
Changed blocks: 5, Lines Added: 38, Lines Deleted: 28; 4419 bytes

@@ -5678,6 +5678,17 @@
               Each thread that does a sequential scan allocates a buffer
               of this size for each table it scans. If you do many
               sequential scans, you might want to increase this value.
+            </para>
+            
+            <para>
+              <literal>read_buffer_size</literal> and
+              <literal>read_rnd_buffer_size</literal> are not specific
+              to any storage engine and apply in a general manner for
+              optimization. See <xref linkend="memory-use"/>, for
+              example.
+            </para>
+            
+            <para>.
               This variable was added in MySQL 4.0.3. Previously, it was
               named <literal>record_buffer</literal>.
             </para>

@@ -5726,8 +5737,19 @@
               However, this is a buffer allocated for each client, so
               you should not set the global variable to a large value.
               Instead, change the session variable only from within
-              those clients that need to run large queries. This
-              variable was added in MySQL 4.0.3. Previously, it was
+              those clients that need to run large queries.
+            </para>
+            
+            <para>
+              <literal>read_buffer_size</literal> and
+              <literal>read_rnd_buffer_size</literal> are not specific
+              to any storage engine and apply in a general manner for
+              optimization. See <xref linkend="memory-use"/>, for
+              example.
+            </para>
+            
+            <para> 
+              This variable was added in MySQL 4.0.3. Previously, it was
               named <literal>record_rnd_buffer</literal>.
             </para>
           </listitem>

@@ -6124,9 +6146,21 @@
               zone is specified by the <literal>TZ</literal> environment
               variable. It also can be specified using the
               <option>--timezone</option> option of the
-              <command>mysqld_safe</command> script. This variable was
-              added in MySQL 4.1.3.
+              <command>mysqld_safe</command> script.
             </para>
+            
+            <para>
+              The <literal>system_time_zone</literal> variable differs
+              from <literal>time_zone</literal>. Although they might
+              have the same value, the latter variable is used to
+              initialize the time zone for each client that connects.
+              See <xref linkend="time-zone-support"/>.
+            </para>
+            
+            <para> 
+              <literal>system_time_zone</literal> was added in MySQL
+              4.1.3.
+            </para>
           </listitem>
 
           <listitem>

@@ -6362,22 +6396,6 @@
               <literal>malloc()</literal> calls. This variable was added
               in MySQL 4.0.16.
             </para>
-
-            <para>
-              The <literal>system_time_zone</literal> variable differs
-              from <literal>time_zone</literal>. Although they might
-              have the same value, the latter variable is used to
-              initialize the time zone for each client that connects.
-              See <xref linkend="time-zone-support"/>.
-            </para>
-
-            <para>
-              <literal>read_buffer_size</literal> and
-              <literal>read_rnd_buffer_size</literal> are not specific
-              to any storage engine and apply in a general manner for
-              optimization. See <xref linkend="memory-use"/>, for
-              example.
-            </para>
           </listitem>
 
           <listitem>

@@ -6486,14 +6504,6 @@
               <literal>mysql_real_connect()</literal>). See also
               <literal>interactive_timeout</literal>.
             </para>
-
-            <para>
-              <literal>read_buffer_size</literal> and
-              <literal>read_rnd_buffer_size</literal> are not specific
-              to any storage engine and apply in a general manner for
-              optimization. See <xref linkend="memory-use"/>, for
-              example.
-            </para>
           </listitem>
 
         </itemizedlist>