svn commit - mysqldoc@docsrva: r4438 - in trunk: . refman-4.1 refman-5.0 refman-5.1

[paul]

Author: paul
Date: 2007-01-10 18:47:39 +0100 (Wed, 10 Jan 2007)
New Revision: 4438

Log:
 r17910@polar:  paul | 2007-01-10 11:44:38 -0600
 Clarification re: query cache and FOUND_ROWS(). (Bug #25138)


Modified:
   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
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:17897
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:14371
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:13015
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:17910
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:14371
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:13015


Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml	2007-01-10 17:12:16 UTC (rev 4437)
+++ trunk/refman-4.1/database-administration.xml	2007-01-10 17:47:39 UTC (rev 4438)
Changed blocks: 1, Lines Added: 7, Lines Deleted: 4; 1127 bytes

@@ -24829,10 +24829,13 @@
 
       <para>
         The query cache works for <literal>SELECT SQL_CALC_FOUND_ROWS
-        ...</literal> and <literal>SELECT FOUND_ROWS()</literal> type
-        queries. <literal>FOUND_ROWS()</literal> returns the correct
-        value even if the preceding query was fetched from the cache
-        because the number of found rows is also stored in the cache.
+        ...</literal> type queries and store a value that a following
+        <literal>SELECT FOUND_ROWS()</literal> query will return.
+        <literal>FOUND_ROWS()</literal> returns the correct value even
+        if the preceding query was fetched from the cache because the
+        number of found rows is also stored in the cache. The
+        <literal>SELECT FOUND_ROWS()</literal> query itself cannot be
+        cached.
       </para>
 
       <para>


Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml	2007-01-10 17:12:16 UTC (rev 4437)
+++ trunk/refman-5.0/database-administration.xml	2007-01-10 17:47:39 UTC (rev 4438)
Changed blocks: 1, Lines Added: 7, Lines Deleted: 4; 1127 bytes

@@ -28143,10 +28143,13 @@
 
       <para>
         The query cache works for <literal>SELECT SQL_CALC_FOUND_ROWS
-        ...</literal> and <literal>SELECT FOUND_ROWS()</literal> type
-        queries. <literal>FOUND_ROWS()</literal> returns the correct
-        value even if the preceding query was fetched from the cache
-        because the number of found rows is also stored in the cache.
+        ...</literal> type queries and store a value that a following
+        <literal>SELECT FOUND_ROWS()</literal> query will return.
+        <literal>FOUND_ROWS()</literal> returns the correct value even
+        if the preceding query was fetched from the cache because the
+        number of found rows is also stored in the cache. The
+        <literal>SELECT FOUND_ROWS()</literal> query itself cannot be
+        cached.
       </para>
 
       <para>


Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml	2007-01-10 17:12:16 UTC (rev 4437)
+++ trunk/refman-5.1/database-administration.xml	2007-01-10 17:47:39 UTC (rev 4438)
Changed blocks: 1, Lines Added: 7, Lines Deleted: 4; 1127 bytes

@@ -28968,10 +28968,13 @@
 
       <para>
         The query cache works for <literal>SELECT SQL_CALC_FOUND_ROWS
-        ...</literal> and <literal>SELECT FOUND_ROWS()</literal> type
-        queries. <literal>FOUND_ROWS()</literal> returns the correct
-        value even if the preceding query was fetched from the cache
-        because the number of found rows is also stored in the cache.
+        ...</literal> type queries and store a value that a following
+        <literal>SELECT FOUND_ROWS()</literal> query will return.
+        <literal>FOUND_ROWS()</literal> returns the correct value even
+        if the preceding query was fetched from the cache because the
+        number of found rows is also stored in the cache. The
+        <literal>SELECT FOUND_ROWS()</literal> query itself cannot be
+        cached.
       </para>
 
       <para>