List:Commits« Previous MessageNext Message »
From:paul.dubois Date:January 13 2011 8:32pm
Subject:svn commit - mysqldoc@docsrva: r24806 - in trunk: . dynamic-docs/command-optvars refman-5.6 refman-6.0
View as plain text  
Author: paul
Date: 2011-01-13 21:32:41 +0100 (Thu, 13 Jan 2011)
New Revision: 24806

Log:
 r44072@dhcp-213:  paul | 2011-01-13 14:12:52 -0500
 Initial information about optimizer_join_cache_level


Modified:
   trunk/dynamic-docs/command-optvars/mysqld.xml
   trunk/refman-5.6/dba-mysqld-server-core.xml
   trunk/refman-6.0/dba-mysqld-server-core.xml
   trunk/refman-6.0/optimization.xml

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:46284
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:66486
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
ebeeeee4-b232-4669-a521-231442eced53:/mysqldoc-local/mysqldoc/trunk:44064
   + 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:46284
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:66486
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
ebeeeee4-b232-4669-a521-231442eced53:/mysqldoc-local/mysqldoc/trunk:44072


Modified: trunk/dynamic-docs/command-optvars/mysqld.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysqld.xml	2011-01-13 19:19:06 UTC (rev 24805)
+++ trunk/dynamic-docs/command-optvars/mysqld.xml	2011-01-13 20:32:41 UTC (rev 24806)
Changed blocks: 2, Lines Added: 7, Lines Deleted: 0; 1019 bytes

@@ -14042,6 +14042,7 @@
       <manual version="6.0"/>
       <introduced version="6.0.9"/>
       <removed version="6.0.14"/>
+<!-- renamed to optimizer_join_cache_level in 6.0.14 -->
     </versions>
 
   </mysqloption>

@@ -18719,13 +18720,19 @@
     </types>
 
     <values vartype="numeric" platform="all">
+      <value default="4" minimum="0" maximum="4"/>
+    </values>
+
+    <values vartype="numeric" platform="all" inversion="6.0.14">
       <value default="1" minimum="0" maximum="8"/>
     </values>
 
     <versions>
       <manual version="5.6"/>
+      <introduced version="5.6.1"/>
       <manual version="6.0"/>
       <introduced version="6.0.14"/>
+<!-- renamed from join_cache_level in 6.0.14 -->
     </versions>
 
   </mysqloption>


Modified: trunk/refman-5.6/dba-mysqld-server-core.xml
===================================================================
--- trunk/refman-5.6/dba-mysqld-server-core.xml	2011-01-13 19:19:06 UTC (rev 24805)
+++ trunk/refman-5.6/dba-mysqld-server-core.xml	2011-01-13 20:32:41 UTC (rev 24806)
Changed blocks: 3, Lines Added: 17, Lines Deleted: 34; 4052 bytes

@@ -7919,12 +7919,12 @@
           <literal role="sysvar">optimizer_join_cache_level</literal>
         </para>
 
-        <para condition="dynamic:optvar:item" role="6.0:mysqld:optimizer_join_cache_level"/>
+        <para condition="dynamic:optvar:item" role="5.6:mysqld:optimizer_join_cache_level"/>
 
         <para>
           This variable is used for join buffer managment. It controls
-          for which join operations of which types join buffers are
-          supposed to be used.
+          for join operations which types of join buffers are supposed
+          to be used.
 
 <!--
  See

@@ -7956,13 +7956,13 @@
               </row>
               <row>
                 <entry><literal>1</literal></entry>
-                <entry>This is the default value. Join buffers are employed exactly in the same
-                  cases as in versions of MySQL prior to 6.0.9: They are
-                  used only for inner joins that are executed by the
-                  original Block Nested-Loop (BNL) join algorithm. When
-                  this algorithm is applied, rows of the inner table are
-                  accessed through a table scan, a plain index scan, or
-                  a range index scan.</entry>
+                <entry>Join buffers are employed exactly in the same cases as in versions of
+                  MySQL prior to 6.0.9: They are used only for inner
+                  joins that are executed by the original Block
+                  Nested-Loop (BNL) join algorithm. When this algorithm
+                  is applied, rows of the inner table are accessed
+                  through a table scan, a plain index scan, or a range
+                  index scan.</entry>
               </row>
               <row>
                 <entry><literal>2</literal></entry>

@@ -7977,31 +7977,14 @@
               </row>
               <row>
                 <entry><literal>4</literal></entry>
-                <entry>The BNL algorithm uses incremental buffers for inner tables. In this
-                  case, the BNL algorithm can be used for nested outer
-                  joins and semi-joins (outer joins and semi-joins with
-                  several inner tables). Such an operation can be
-                  executed only if incremental join buffers are used to
-                  join all inner tables but the first one.</entry>
+                <entry>This is the default value. The BNL algorithm uses incremental buffers
+                  for inner tables. In this case, the BNL algorithm can
+                  be used for nested outer joins and semi-joins (outer
+                  joins and semi-joins with several inner tables). Such
+                  an operation can be executed only if incremental join
+                  buffers are used to join all inner tables but the
+                  first one.</entry>
               </row>
-              <row>
-                <entry><literal>5</literal></entry>
-                <entry>The BKA algorithm uses regular buffers for any join operation with index
-                  access to the joined table.</entry>
-              </row>
-              <row>
-                <entry><literal>6</literal></entry>
-                <entry>The BKA algorithm uses incremental buffers for any join operation with
-                  index access to the joined table.</entry>
-              </row>
-              <row>
-                <entry><literal>7</literal></entry>
-                <entry>The BKA algorithm uses regular join buffers with a hash table.</entry>
-              </row>
-              <row>
-                <entry><literal>8</literal></entry>
-                <entry>The BKA algorithm uses incremental join buffers with a hash table.</entry>
-              </row>
             </tbody>
           </tgroup>
         </informaltable>


Modified: trunk/refman-6.0/dba-mysqld-server-core.xml
===================================================================
--- trunk/refman-6.0/dba-mysqld-server-core.xml	2011-01-13 19:19:06 UTC (rev 24805)
+++ trunk/refman-6.0/dba-mysqld-server-core.xml	2011-01-13 20:32:41 UTC (rev 24806)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 4; 893 bytes

@@ -8484,10 +8484,9 @@
 
         <para>
           This variable is used for join buffer managment. It controls
-          for which join operations of which types join buffers are
-          supposed to be used. See
-          <xref linkend="bnl-bka-optimization"/>. The following table
-          shows the permissible
+          for join operations which types of join buffers are supposed
+          to be used. See <xref linkend="bnl-bka-optimization"/>. The
+          following table shows the permissible
           <literal role="sysvar">optimizer_join_cache_level</literal>
           values.
         </para>


Modified: trunk/refman-6.0/optimization.xml
===================================================================
--- trunk/refman-6.0/optimization.xml	2011-01-13 19:19:06 UTC (rev 24805)
+++ trunk/refman-6.0/optimization.xml	2011-01-13 20:32:41 UTC (rev 24806)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 3; 850 bytes

@@ -5662,9 +5662,9 @@
           <para>
             The
             <literal role="sysvar">optimizer_join_cache_level</literal>
-            system variable controls for which join operations of which
-            types join buffers are supposed to be used. The following
-            table shows the permissible
+            system variable controls for join operations which types of
+            join buffers are supposed to be used. The following table
+            shows the permissible
             <literal role="sysvar">optimizer_join_cache_level</literal>
             values.
           </para>


Thread
svn commit - mysqldoc@docsrva: r24806 - in trunk: . dynamic-docs/command-optvars refman-5.6 refman-6.0paul.dubois13 Jan