List:Commits« Previous MessageNext Message »
From:paul.dubois Date:October 15 2010 3:15pm
Subject:svn commit - mysqldoc@docsrva: r23158 - in trunk: . refman-5.0 refman-5.1 refman-5.5 refman-5.6 refman-6.0
View as plain text  
Author: paul
Date: 2010-10-15 17:15:18 +0200 (Fri, 15 Oct 2010)
New Revision: 23158

Log:
 r64242@frost:  paul | 2010-10-15 09:23:36 -0500
 Fix docs bug:
 - Bug#57281: Default value for engine_condition_pushdown is wrong in documentation


Modified:
   trunk/refman-5.0/dba-mysqld-server-core.xml
   trunk/refman-5.0/optimization.xml
   trunk/refman-5.1/dba-mysqld-server-core.xml
   trunk/refman-5.1/optimization.xml
   trunk/refman-5.5/dba-mysqld-server-core.xml
   trunk/refman-5.5/optimization.xml
   trunk/refman-5.6/dba-mysqld-server-core.xml
   trunk/refman-5.6/optimization.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:43228
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:64241
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
   + 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:43228
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:64242
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


Modified: trunk/refman-5.0/dba-mysqld-server-core.xml
===================================================================
--- trunk/refman-5.0/dba-mysqld-server-core.xml	2010-10-15 15:15:07 UTC (rev 23157)
+++ trunk/refman-5.0/dba-mysqld-server-core.xml	2010-10-15 15:15:18 UTC (rev 23158)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 2; 705 bytes

@@ -4417,8 +4417,7 @@
           The <literal role="sysvar">engine_condition_pushdown</literal>
           variable controls whether engine condition pushdown is
           enabled. By default, this variable is <literal>OFF</literal>
-          (0). Setting it to <literal>ON</literal> (1), enables
-          pushdown.
+          (0). Setting it to <literal>ON</literal> (1) enables pushdown.
         </para>
 
         <para>


Modified: trunk/refman-5.0/optimization.xml
===================================================================
--- trunk/refman-5.0/optimization.xml	2010-10-15 15:15:07 UTC (rev 23157)
+++ trunk/refman-5.0/optimization.xml	2010-10-15 15:15:18 UTC (rev 23158)
Changed blocks: 3, Lines Added: 5, Lines Deleted: 4; 1236 bytes

@@ -3271,7 +3271,7 @@
 
       <section id="condition-pushdown-optimization">
 
-        <title>Condition Pushdown Optimization</title>
+        <title>Engine Condition Pushdown Optimization</title>
 
         <para>
           This optimization improves the efficiency of direct

@@ -3438,8 +3438,8 @@
         </para>
 
         <para>
-          Condition pushdown is disabled by default. To enable it at
-          server startup, set the
+          Engine condition pushdown is disabled by default. To enable it
+          at server startup, set the
           <literal role="sysvar">engine_condition_pushdown</literal>
           system variable. For example, in a <filename>my.cnf</filename>
           file, use these lines:

@@ -3468,7 +3468,8 @@
           <title>Limitations</title>
 
           <para>
-            Condition pushdown is subject to the following limitations:
+            Engine condition pushdown is subject to the following
+            limitations:
 
             <itemizedlist>
 


Modified: trunk/refman-5.1/dba-mysqld-server-core.xml
===================================================================
--- trunk/refman-5.1/dba-mysqld-server-core.xml	2010-10-15 15:15:07 UTC (rev 23157)
+++ trunk/refman-5.1/dba-mysqld-server-core.xml	2010-10-15 15:15:18 UTC (rev 23158)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 784 bytes

@@ -4952,8 +4952,8 @@
         <para>
           The <literal role="sysvar">engine_condition_pushdown</literal>
           variable controls whether engine condition pushdown is
-          enabled. By default, this variable is <literal>OFF</literal>
-          (0). Setting it to <literal>ON</literal> (1), enables
+          enabled. By default, this variable is <literal>ON</literal>
+          (1). Setting it to <literal>OFF</literal> (0) disables
           pushdown.
         </para>
       </listitem>


Modified: trunk/refman-5.1/optimization.xml
===================================================================
--- trunk/refman-5.1/optimization.xml	2010-10-15 15:15:07 UTC (rev 23157)
+++ trunk/refman-5.1/optimization.xml	2010-10-15 15:15:18 UTC (rev 23158)
Changed blocks: 4, Lines Added: 9, Lines Deleted: 8; 1788 bytes

@@ -3417,7 +3417,7 @@
 
       <section id="condition-pushdown-optimization">
 
-        <title>Condition Pushdown Optimization</title>
+        <title>Engine Condition Pushdown Optimization</title>
 
         <para>
           This optimization improves the efficiency of direct

@@ -3584,8 +3584,8 @@
         </para>
 
         <para>
-          Condition pushdown is disabled by default. To enable it at
-          server startup, set the
+          Engine condition pushdown is enabled by default. To disable it
+          at server startup, set the
           <literal role="sysvar">engine_condition_pushdown</literal>
           system variable. For example, in a <filename>my.cnf</filename>
           file, use these lines:

@@ -3593,20 +3593,20 @@
 
 <programlisting>
 [mysqld]
-engine_condition_pushdown=1
+engine_condition_pushdown=0
 </programlisting>
 
         <para>
-          At runtime, enable condition pushdown with either of the
+          At runtime, disable condition pushdown with either of the
           following statements:
         </para>
 
 <programlisting>
-SET engine_condition_pushdown=ON;
+SET engine_condition_pushdown=OFF;
 </programlisting>
 
 <programlisting>
-SET engine_condition_pushdown=1;
+SET engine_condition_pushdown=0;
 </programlisting>
 
         <formalpara>

@@ -3614,7 +3614,8 @@
           <title>Limitations</title>
 
           <para>
-            Condition pushdown is subject to the following limitations:
+            Engine condition pushdown is subject to the following
+            limitations:
 
             <itemizedlist>
 


Modified: trunk/refman-5.5/dba-mysqld-server-core.xml
===================================================================
--- trunk/refman-5.5/dba-mysqld-server-core.xml	2010-10-15 15:15:07 UTC (rev 23157)
+++ trunk/refman-5.5/dba-mysqld-server-core.xml	2010-10-15 15:15:18 UTC (rev 23158)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 2; 791 bytes

@@ -5015,8 +5015,9 @@
         <para>
           The <literal role="sysvar">engine_condition_pushdown</literal>
           variable controls whether engine condition pushdown is
-          enabled. By default, this variable is <literal>OFF</literal>
-          (0). Setting it to <literal>ON</literal> (1) enables pushdown.
+          enabled. By default, this variable is <literal>ON</literal>
+          (1). Setting it to <literal>OFF</literal> (0) disables
+          pushdown.
         </para>
 
         <para>


Modified: trunk/refman-5.5/optimization.xml
===================================================================
--- trunk/refman-5.5/optimization.xml	2010-10-15 15:15:07 UTC (rev 23157)
+++ trunk/refman-5.5/optimization.xml	2010-10-15 15:15:18 UTC (rev 23158)
Changed blocks: 5, Lines Added: 11, Lines Deleted: 11; 2365 bytes

@@ -7365,7 +7365,7 @@
         <para>
           For information about Index Merge, see
           <xref linkend="index-merge-optimization"/>. For information
-          about condition pushdown, see
+          about engine condition pushdown, see
           <xref linkend="condition-pushdown-optimization"/>.
         </para>
 

@@ -17241,7 +17241,7 @@
 
     <section id="condition-pushdown-optimization">
 
-      <title>Condition Pushdown Optimization</title>
+      <title>Engine Condition Pushdown Optimization</title>
 
       <para>
         This optimization improves the efficiency of direct comparisons

@@ -17417,8 +17417,8 @@
       </para>
 
       <para>
-        Condition pushdown is disabled by default. To enable it at
-        server startup, set the
+        Engine condition pushdown is enabled by default. To disable it
+        at server startup, set the
         <literal role="sysvar">optimizer_switch</literal> system
         variable. For example, in a <filename>my.cnf</filename> file,
         use these lines:

@@ -17426,26 +17426,26 @@
 
 <programlisting>
 [mysqld]
-optimizer_switch=engine_condition_pushdown=on
+optimizer_switch=engine_condition_pushdown=off
 </programlisting>
 
       <para>
-        At runtime, enable condition pushdown like this:
+        At runtime, disable condition pushdown like this:
       </para>
 
 <programlisting>
-SET optimizer_switch='engine_condition_pushdown=on';
+SET optimizer_switch='engine_condition_pushdown=off';
 </programlisting>
 
       <para>
-        Before MySQL 5.5.3, enable condition pushdown using the
+        Before MySQL 5.5.3, disable condition pushdown using the
         <literal role="sysvar">engine_condition_pushdown</literal>
         system variable. At server startup:
       </para>
 
 <programlisting>
 [mysqld]
-engine_condition_pushdown=1
+engine_condition_pushdown=0
 </programlisting>
 
       <para>

@@ -17453,11 +17453,11 @@
       </para>
 
 <programlisting>
-SET engine_condition_pushdown=ON;
+SET engine_condition_pushdown=OFF;
 </programlisting>
 
 <programlisting>
-SET engine_condition_pushdown=1;
+SET engine_condition_pushdown=0;
 </programlisting>
 
       <formalpara>


Modified: trunk/refman-5.6/dba-mysqld-server-core.xml
===================================================================
--- trunk/refman-5.6/dba-mysqld-server-core.xml	2010-10-15 15:15:07 UTC (rev 23157)
+++ trunk/refman-5.6/dba-mysqld-server-core.xml	2010-10-15 15:15:18 UTC (rev 23158)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 2; 791 bytes

@@ -4824,8 +4824,9 @@
         <para>
           The <literal role="sysvar">engine_condition_pushdown</literal>
           variable controls whether engine condition pushdown is
-          enabled. By default, this variable is <literal>OFF</literal>
-          (0). Setting it to <literal>ON</literal> (1) enables pushdown.
+          enabled. By default, this variable is <literal>ON</literal>
+          (1). Setting it to <literal>OFF</literal> (0) disables
+          pushdown.
         </para>
 
         <para>


Modified: trunk/refman-5.6/optimization.xml
===================================================================
--- trunk/refman-5.6/optimization.xml	2010-10-15 15:15:07 UTC (rev 23157)
+++ trunk/refman-5.6/optimization.xml	2010-10-15 15:15:18 UTC (rev 23158)
Changed blocks: 6, Lines Added: 8, Lines Deleted: 7; 1910 bytes

@@ -1976,7 +1976,7 @@
 
       <section id="condition-pushdown-optimization">
 
-        <title>Condition Pushdown Optimization</title>
+        <title>Engine Condition Pushdown Optimization</title>
 
         <para>
           This optimization improves the efficiency of direct

@@ -2155,8 +2155,8 @@
         </para>
 
         <para>
-          Condition pushdown is disabled by default. To enable it at
-          server startup, set the
+          Engine condition pushdown is enabled by default. To disable it
+          at server startup, set the
           <literal role="sysvar">optimizer_switch</literal> system
           variable. For example, in a <filename>my.cnf</filename> file,
           use these lines:

@@ -2164,7 +2164,7 @@
 
 <programlisting>
 [mysqld]
-optimizer_switch=engine_condition_pushdown=on
+optimizer_switch=engine_condition_pushdown=off
 </programlisting>
 
         <para>

@@ -2172,7 +2172,7 @@
         </para>
 
 <programlisting>
-SET optimizer_switch='engine_condition_pushdown=on';
+SET optimizer_switch='engine_condition_pushdown=off';
 </programlisting>
 
         <formalpara>

@@ -2180,7 +2180,8 @@
           <title>Limitations</title>
 
           <para>
-            Condition pushdown is subject to the following limitations:
+            Engine condition pushdown is subject to the following
+            limitations:
 
             <itemizedlist>
 

@@ -9867,7 +9868,7 @@
       <para>
         For information about Index Merge, see
         <xref linkend="index-merge-optimization"/>. For information
-        about condition pushdown, see
+        about engine condition pushdown, see
         <xref linkend="condition-pushdown-optimization"/>.
       </para>
 


Modified: trunk/refman-6.0/dba-mysqld-server-core.xml
===================================================================
--- trunk/refman-6.0/dba-mysqld-server-core.xml	2010-10-15 15:15:07 UTC (rev 23157)
+++ trunk/refman-6.0/dba-mysqld-server-core.xml	2010-10-15 15:15:18 UTC (rev 23158)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 2; 791 bytes

@@ -5301,8 +5301,9 @@
         <para>
           The <literal role="sysvar">engine_condition_pushdown</literal>
           variable controls whether engine condition pushdown is
-          enabled. By default, this variable is <literal>OFF</literal>
-          (0). Setting it to <literal>ON</literal> (1) enables pushdown.
+          enabled. By default, this variable is <literal>ON</literal>
+          (1). Setting it to <literal>OFF</literal> (0) disables
+          pushdown.
         </para>
 
         <para>


Modified: trunk/refman-6.0/optimization.xml
===================================================================
--- trunk/refman-6.0/optimization.xml	2010-10-15 15:15:07 UTC (rev 23157)
+++ trunk/refman-6.0/optimization.xml	2010-10-15 15:15:18 UTC (rev 23158)
Changed blocks: 4, Lines Added: 8, Lines Deleted: 7; 1698 bytes

@@ -3488,7 +3488,7 @@
 
       <section id="condition-pushdown-optimization">
 
-        <title>Condition Pushdown Optimization</title>
+        <title>Engine Condition Pushdown Optimization</title>
 
         <para>
           This optimization improves the efficiency of direct

@@ -3667,8 +3667,8 @@
         </para>
 
         <para>
-          Condition pushdown is disabled by default. To enable it at
-          server startup, set the
+          Engine condition pushdown is enabled by default. To disable it
+          at server startup, set the
           <literal role="sysvar">optimizer_switch</literal> system
           variable. For example, in a <filename>my.cnf</filename> file,
           use these lines:

@@ -3676,15 +3676,15 @@
 
 <programlisting>
 [mysqld]
-optimizer_switch=engine_condition_pushdown=on
+optimizer_switch=engine_condition_pushdown=off
 </programlisting>
 
         <para>
-          At runtime, enable condition pushdown like this:
+          At runtime, disable condition pushdown like this:
         </para>
 
 <programlisting>
-SET optimizer_switch='engine_condition_pushdown=on';
+SET optimizer_switch='engine_condition_pushdown=off';
 </programlisting>
 
         <para>

@@ -3715,7 +3715,8 @@
           <title>Limitations</title>
 
           <para>
-            Condition pushdown is subject to the following limitations:
+            Engine condition pushdown is subject to the following
+            limitations:
 
             <itemizedlist>
 


Thread
svn commit - mysqldoc@docsrva: r23158 - in trunk: . refman-5.0 refman-5.1 refman-5.5 refman-5.6 refman-6.0paul.dubois15 Oct