MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:paul.dubois Date:June 15 2010 8:37pm
Subject:svn commit - mysqldoc@docsrva: r21257 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-5.4 refman-5.5 refman-6.0
View as plain text  
Author: paul
Date: 2010-06-15 22:37:43 +0200 (Tue, 15 Jun 2010)
New Revision: 21257

Log:
 r60170@frost:  paul | 2010-06-15 15:34:01 -0500
 Tweak wording


Modified:
   trunk/refman-4.1/apis-c.xml
   trunk/refman-5.0/apis-c.xml
   trunk/refman-5.1/apis-c.xml
   trunk/refman-5.4/apis-c.xml
   trunk/refman-5.5/apis-c.xml
   trunk/refman-6.0/apis-c.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:39186
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:60169
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:39186
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:60170
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-4.1/apis-c.xml
===================================================================
--- trunk/refman-4.1/apis-c.xml	2010-06-15 20:37:36 UTC (rev 21256)
+++ trunk/refman-4.1/apis-c.xml	2010-06-15 20:37:43 UTC (rev 21257)
Changed blocks: 5, Lines Added: 33, Lines Deleted: 16; 3839 bytes

@@ -9804,7 +9804,7 @@
           the client, replaces the parameter markers with the newly
           supplied data, and executes the statement. If the statement
           produces a result set, the server sends the data back to the
-          client. Otherwise, it sends an okay status and total number of
+          client. Otherwise, it sends an okay status and the number of
           rows changed, deleted, or inserted.
         </para>
       </listitem>

@@ -10730,20 +10730,37 @@
       </para>
 
       <para>
-        If the statement is an <literal role="stmt">UPDATE</literal>,
-        <literal role="stmt">DELETE</literal>, or
-        <literal role="stmt">INSERT</literal>, the number of changed,
-        deleted, or inserted rows can be found by calling
-        <literal role="cfunc">mysql_stmt_affected_rows()</literal>. If
-        this is a statement such as
-        <literal role="stmt">SELECT</literal> that generates a result
-        set, you must call
-        <literal role="cfunc">mysql_stmt_fetch()</literal> to fetch the
-        data prior to calling any other functions that result in query
-        processing. For more information on how to fetch the results,
-        refer to <xref linkend="mysql-stmt-fetch"/>.
+        Statement processing following
+        <literal role="cfunc">mysql_stmt_execute()</literal> depends on
+        the type of statement:
       </para>
 
+      <itemizedlist>
+
+        <listitem>
+          <para>
+            For an <literal role="stmt">UPDATE</literal>,
+            <literal role="stmt">DELETE</literal>, or
+            <literal role="stmt">INSERT</literal>, the number of
+            changed, deleted, or inserted rows can be found by calling
+            <literal role="cfunc">mysql_stmt_affected_rows()</literal>.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            For a statement such as
+            <literal role="stmt">SELECT</literal> that generates a
+            result set, you must call
+            <literal role="cfunc">mysql_stmt_fetch()</literal> to fetch
+            the data prior to calling any other functions that result in
+            query processing. For more information on how to fetch the
+            results, refer to <xref linkend="mysql-stmt-fetch"/>.
+          </para>
+        </listitem>
+
+      </itemizedlist>
+
       <para>
         For statements that generate a result set, you can request that
         <literal role="cfunc">mysql_stmt_execute()</literal> open a

@@ -10971,7 +10988,7 @@
   exit(0);
 }
 
-/* Get the total number of affected rows */
+/* Get the number of affected rows */
 affected_rows= mysql_stmt_affected_rows(stmt);
 fprintf(stdout, " total affected rows(insert 1): %lu\n",
                 (unsigned long) affected_rows);

@@ -11054,7 +11071,7 @@
         result set exists; that is, after a call to
         <literal role="cfunc">mysql_stmt_execute()</literal> for a
         statement such as <literal role="stmt">SELECT</literal> that
-        creates a result set.
+        produces a result set.
       </para>
 
       <para>

@@ -12245,7 +12262,7 @@
         <literal role="cfunc">mysql_stmt_result_metadata()</literal>
         returns the result set metadata in the form of a pointer to a
         <literal>MYSQL_RES</literal> structure that can be used to
-        process the meta information such as total number of fields and
+        process the meta information such as number of fields and
         individual field information. This result set pointer can be
         passed as an argument to any of the field-based API functions
         that process result set metadata, such as:


Modified: trunk/refman-5.0/apis-c.xml
===================================================================
--- trunk/refman-5.0/apis-c.xml	2010-06-15 20:37:36 UTC (rev 21256)
+++ trunk/refman-5.0/apis-c.xml	2010-06-15 20:37:43 UTC (rev 21257)
Changed blocks: 5, Lines Added: 33, Lines Deleted: 16; 3841 bytes

@@ -10036,7 +10036,7 @@
           the client, replaces the parameter markers with the newly
           supplied data, and executes the statement. If the statement
           produces a result set, the server sends the data back to the
-          client. Otherwise, it sends an okay status and total number of
+          client. Otherwise, it sends an okay status and the number of
           rows changed, deleted, or inserted.
         </para>
       </listitem>

@@ -10951,20 +10951,37 @@
       </para>
 
       <para>
-        If the statement is an <literal role="stmt">UPDATE</literal>,
-        <literal role="stmt">DELETE</literal>, or
-        <literal role="stmt">INSERT</literal>, the number of changed,
-        deleted, or inserted rows can be found by calling
-        <literal role="cfunc">mysql_stmt_affected_rows()</literal>. If
-        this is a statement such as
-        <literal role="stmt">SELECT</literal> that generates a result
-        set, you must call
-        <literal role="cfunc">mysql_stmt_fetch()</literal> to fetch the
-        data prior to calling any other functions that result in query
-        processing. For more information on how to fetch the results,
-        refer to <xref linkend="mysql-stmt-fetch"/>.
+        Statement processing following
+        <literal role="cfunc">mysql_stmt_execute()</literal> depends on
+        the type of statement:
       </para>
 
+      <itemizedlist>
+
+        <listitem>
+          <para>
+            For an <literal role="stmt">UPDATE</literal>,
+            <literal role="stmt">DELETE</literal>, or
+            <literal role="stmt">INSERT</literal>, the number of
+            changed, deleted, or inserted rows can be found by calling
+            <literal role="cfunc">mysql_stmt_affected_rows()</literal>.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            For a statement such as
+            <literal role="stmt">SELECT</literal> that generates a
+            result set, you must call
+            <literal role="cfunc">mysql_stmt_fetch()</literal> to fetch
+            the data prior to calling any other functions that result in
+            query processing. For more information on how to fetch the
+            results, refer to <xref linkend="mysql-stmt-fetch"/>.
+          </para>
+        </listitem>
+
+      </itemizedlist>
+
       <para>
         For statements that generate a result set, you can request that
         <literal role="cfunc">mysql_stmt_execute()</literal> open a

@@ -11188,7 +11205,7 @@
   exit(0);
 }
 
-/* Get the total number of affected rows */
+/* Get the number of affected rows */
 affected_rows= mysql_stmt_affected_rows(stmt);
 fprintf(stdout, " total affected rows(insert 1): %lu\n",
                 (unsigned long) affected_rows);

@@ -11271,7 +11288,7 @@
         result set exists; that is, after a call to
         <literal role="cfunc">mysql_stmt_execute()</literal> for a
         statement such as <literal role="stmt">SELECT</literal> that
-        creates a result set.
+        produces a result set.
       </para>
 
       <para>

@@ -12426,7 +12443,7 @@
         <literal role="cfunc">mysql_stmt_result_metadata()</literal>
         returns the result set metadata in the form of a pointer to a
         <literal>MYSQL_RES</literal> structure that can be used to
-        process the meta information such as total number of fields and
+        process the meta information such as number of fields and
         individual field information. This result set pointer can be
         passed as an argument to any of the field-based API functions
         that process result set metadata, such as:


Modified: trunk/refman-5.1/apis-c.xml
===================================================================
--- trunk/refman-5.1/apis-c.xml	2010-06-15 20:37:36 UTC (rev 21256)
+++ trunk/refman-5.1/apis-c.xml	2010-06-15 20:37:43 UTC (rev 21257)
Changed blocks: 5, Lines Added: 33, Lines Deleted: 16; 3841 bytes

@@ -10147,7 +10147,7 @@
           the client, replaces the parameter markers with the newly
           supplied data, and executes the statement. If the statement
           produces a result set, the server sends the data back to the
-          client. Otherwise, it sends an okay status and total number of
+          client. Otherwise, it sends an okay status and the number of
           rows changed, deleted, or inserted.
         </para>
       </listitem>

@@ -11045,20 +11045,37 @@
       </para>
 
       <para>
-        If the statement is an <literal role="stmt">UPDATE</literal>,
-        <literal role="stmt">DELETE</literal>, or
-        <literal role="stmt">INSERT</literal>, the number of changed,
-        deleted, or inserted rows can be found by calling
-        <literal role="cfunc">mysql_stmt_affected_rows()</literal>. If
-        this is a statement such as
-        <literal role="stmt">SELECT</literal> that generates a result
-        set, you must call
-        <literal role="cfunc">mysql_stmt_fetch()</literal> to fetch the
-        data prior to calling any other functions that result in query
-        processing. For more information on how to fetch the results,
-        refer to <xref linkend="mysql-stmt-fetch"/>.
+        Statement processing following
+        <literal role="cfunc">mysql_stmt_execute()</literal> depends on
+        the type of statement:
       </para>
 
+      <itemizedlist>
+
+        <listitem>
+          <para>
+            For an <literal role="stmt">UPDATE</literal>,
+            <literal role="stmt">DELETE</literal>, or
+            <literal role="stmt">INSERT</literal>, the number of
+            changed, deleted, or inserted rows can be found by calling
+            <literal role="cfunc">mysql_stmt_affected_rows()</literal>.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            For a statement such as
+            <literal role="stmt">SELECT</literal> that generates a
+            result set, you must call
+            <literal role="cfunc">mysql_stmt_fetch()</literal> to fetch
+            the data prior to calling any other functions that result in
+            query processing. For more information on how to fetch the
+            results, refer to <xref linkend="mysql-stmt-fetch"/>.
+          </para>
+        </listitem>
+
+      </itemizedlist>
+
       <para>
         For statements that generate a result set, you can request that
         <literal role="cfunc">mysql_stmt_execute()</literal> open a

@@ -11289,7 +11306,7 @@
   exit(0);
 }
 
-/* Get the total number of affected rows */
+/* Get the number of affected rows */
 affected_rows= mysql_stmt_affected_rows(stmt);
 fprintf(stdout, " total affected rows(insert 1): %lu\n",
                 (unsigned long) affected_rows);

@@ -11372,7 +11389,7 @@
         result set exists; that is, after a call to
         <literal role="cfunc">mysql_stmt_execute()</literal> for a
         statement such as <literal role="stmt">SELECT</literal> that
-        creates a result set.
+        produces a result set.
       </para>
 
       <para>

@@ -12527,7 +12544,7 @@
         <literal role="cfunc">mysql_stmt_result_metadata()</literal>
         returns the result set metadata in the form of a pointer to a
         <literal>MYSQL_RES</literal> structure that can be used to
-        process the meta information such as total number of fields and
+        process the meta information such as number of fields and
         individual field information. This result set pointer can be
         passed as an argument to any of the field-based API functions
         that process result set metadata, such as:


Modified: trunk/refman-5.4/apis-c.xml
===================================================================
--- trunk/refman-5.4/apis-c.xml	2010-06-15 20:37:36 UTC (rev 21256)
+++ trunk/refman-5.4/apis-c.xml	2010-06-15 20:37:43 UTC (rev 21257)
Changed blocks: 5, Lines Added: 33, Lines Deleted: 16; 3841 bytes

@@ -10097,7 +10097,7 @@
           the client, replaces the parameter markers with the newly
           supplied data, and executes the statement. If the statement
           produces a result set, the server sends the data back to the
-          client. Otherwise, it sends an okay status and total number of
+          client. Otherwise, it sends an okay status and the number of
           rows changed, deleted, or inserted.
         </para>
       </listitem>

@@ -10984,20 +10984,37 @@
       </para>
 
       <para>
-        If the statement is an <literal role="stmt">UPDATE</literal>,
-        <literal role="stmt">DELETE</literal>, or
-        <literal role="stmt">INSERT</literal>, the number of changed,
-        deleted, or inserted rows can be found by calling
-        <literal role="cfunc">mysql_stmt_affected_rows()</literal>. If
-        this is a statement such as
-        <literal role="stmt">SELECT</literal> that generates a result
-        set, you must call
-        <literal role="cfunc">mysql_stmt_fetch()</literal> to fetch the
-        data prior to calling any other functions that result in query
-        processing. For more information on how to fetch the results,
-        refer to <xref linkend="mysql-stmt-fetch"/>.
+        Statement processing following
+        <literal role="cfunc">mysql_stmt_execute()</literal> depends on
+        the type of statement:
       </para>
 
+      <itemizedlist>
+
+        <listitem>
+          <para>
+            For an <literal role="stmt">UPDATE</literal>,
+            <literal role="stmt">DELETE</literal>, or
+            <literal role="stmt">INSERT</literal>, the number of
+            changed, deleted, or inserted rows can be found by calling
+            <literal role="cfunc">mysql_stmt_affected_rows()</literal>.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            For a statement such as
+            <literal role="stmt">SELECT</literal> that generates a
+            result set, you must call
+            <literal role="cfunc">mysql_stmt_fetch()</literal> to fetch
+            the data prior to calling any other functions that result in
+            query processing. For more information on how to fetch the
+            results, refer to <xref linkend="mysql-stmt-fetch"/>.
+          </para>
+        </listitem>
+
+      </itemizedlist>
+
       <para>
         For statements that generate a result set, you can request that
         <literal role="cfunc">mysql_stmt_execute()</literal> open a

@@ -11228,7 +11245,7 @@
   exit(0);
 }
 
-/* Get the total number of affected rows */
+/* Get the number of affected rows */
 affected_rows= mysql_stmt_affected_rows(stmt);
 fprintf(stdout, " total affected rows(insert 1): %lu\n",
                 (unsigned long) affected_rows);

@@ -11311,7 +11328,7 @@
         result set exists; that is, after a call to
         <literal role="cfunc">mysql_stmt_execute()</literal> for a
         statement such as <literal role="stmt">SELECT</literal> that
-        creates a result set.
+        produces a result set.
       </para>
 
       <para>

@@ -12473,7 +12490,7 @@
         <literal role="cfunc">mysql_stmt_result_metadata()</literal>
         returns the result set metadata in the form of a pointer to a
         <literal>MYSQL_RES</literal> structure that can be used to
-        process the meta information such as total number of fields and
+        process the meta information such as number of fields and
         individual field information. This result set pointer can be
         passed as an argument to any of the field-based API functions
         that process result set metadata, such as:


Modified: trunk/refman-5.5/apis-c.xml
===================================================================
--- trunk/refman-5.5/apis-c.xml	2010-06-15 20:37:36 UTC (rev 21256)
+++ trunk/refman-5.5/apis-c.xml	2010-06-15 20:37:43 UTC (rev 21257)
Changed blocks: 5, Lines Added: 33, Lines Deleted: 16; 3841 bytes

@@ -10133,7 +10133,7 @@
           the client, replaces the parameter markers with the newly
           supplied data, and executes the statement. If the statement
           produces a result set, the server sends the data back to the
-          client. Otherwise, it sends an okay status and total number of
+          client. Otherwise, it sends an okay status and the number of
           rows changed, deleted, or inserted.
         </para>
       </listitem>

@@ -11020,20 +11020,37 @@
       </para>
 
       <para>
-        If the statement is an <literal role="stmt">UPDATE</literal>,
-        <literal role="stmt">DELETE</literal>, or
-        <literal role="stmt">INSERT</literal>, the number of changed,
-        deleted, or inserted rows can be found by calling
-        <literal role="cfunc">mysql_stmt_affected_rows()</literal>. If
-        this is a statement such as
-        <literal role="stmt">SELECT</literal> that generates a result
-        set, you must call
-        <literal role="cfunc">mysql_stmt_fetch()</literal> to fetch the
-        data prior to calling any other functions that result in query
-        processing. For more information on how to fetch the results,
-        refer to <xref linkend="mysql-stmt-fetch"/>.
+        Statement processing following
+        <literal role="cfunc">mysql_stmt_execute()</literal> depends on
+        the type of statement:
       </para>
 
+      <itemizedlist>
+
+        <listitem>
+          <para>
+            For an <literal role="stmt">UPDATE</literal>,
+            <literal role="stmt">DELETE</literal>, or
+            <literal role="stmt">INSERT</literal>, the number of
+            changed, deleted, or inserted rows can be found by calling
+            <literal role="cfunc">mysql_stmt_affected_rows()</literal>.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            For a statement such as
+            <literal role="stmt">SELECT</literal> that generates a
+            result set, you must call
+            <literal role="cfunc">mysql_stmt_fetch()</literal> to fetch
+            the data prior to calling any other functions that result in
+            query processing. For more information on how to fetch the
+            results, refer to <xref linkend="mysql-stmt-fetch"/>.
+          </para>
+        </listitem>
+
+      </itemizedlist>
+
       <para>
         For statements that generate a result set, you can request that
         <literal role="cfunc">mysql_stmt_execute()</literal> open a

@@ -11264,7 +11281,7 @@
   exit(0);
 }
 
-/* Get the total number of affected rows */
+/* Get the number of affected rows */
 affected_rows= mysql_stmt_affected_rows(stmt);
 fprintf(stdout, " total affected rows(insert 1): %lu\n",
                 (unsigned long) affected_rows);

@@ -11347,7 +11364,7 @@
         result set exists; that is, after a call to
         <literal role="cfunc">mysql_stmt_execute()</literal> for a
         statement such as <literal role="stmt">SELECT</literal> that
-        creates a result set.
+        produces a result set.
       </para>
 
       <para>

@@ -12665,7 +12682,7 @@
         <literal role="cfunc">mysql_stmt_result_metadata()</literal>
         returns the result set metadata in the form of a pointer to a
         <literal>MYSQL_RES</literal> structure that can be used to
-        process the meta information such as total number of fields and
+        process the meta information such as number of fields and
         individual field information. This result set pointer can be
         passed as an argument to any of the field-based API functions
         that process result set metadata, such as:


Modified: trunk/refman-6.0/apis-c.xml
===================================================================
--- trunk/refman-6.0/apis-c.xml	2010-06-15 20:37:36 UTC (rev 21256)
+++ trunk/refman-6.0/apis-c.xml	2010-06-15 20:37:43 UTC (rev 21257)
Changed blocks: 5, Lines Added: 33, Lines Deleted: 16; 3841 bytes

@@ -10405,7 +10405,7 @@
           the client, replaces the parameter markers with the newly
           supplied data, and executes the statement. If the statement
           produces a result set, the server sends the data back to the
-          client. Otherwise, it sends an okay status and total number of
+          client. Otherwise, it sends an okay status and the number of
           rows changed, deleted, or inserted.
         </para>
       </listitem>

@@ -11302,20 +11302,37 @@
       </para>
 
       <para>
-        If the statement is an <literal role="stmt">UPDATE</literal>,
-        <literal role="stmt">DELETE</literal>, or
-        <literal role="stmt">INSERT</literal>, the number of changed,
-        deleted, or inserted rows can be found by calling
-        <literal role="cfunc">mysql_stmt_affected_rows()</literal>. If
-        this is a statement such as
-        <literal role="stmt">SELECT</literal> that generates a result
-        set, you must call
-        <literal role="cfunc">mysql_stmt_fetch()</literal> to fetch the
-        data prior to calling any other functions that result in query
-        processing. For more information on how to fetch the results,
-        refer to <xref linkend="mysql-stmt-fetch"/>.
+        Statement processing following
+        <literal role="cfunc">mysql_stmt_execute()</literal> depends on
+        the type of statement:
       </para>
 
+      <itemizedlist>
+
+        <listitem>
+          <para>
+            For an <literal role="stmt">UPDATE</literal>,
+            <literal role="stmt">DELETE</literal>, or
+            <literal role="stmt">INSERT</literal>, the number of
+            changed, deleted, or inserted rows can be found by calling
+            <literal role="cfunc">mysql_stmt_affected_rows()</literal>.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            For a statement such as
+            <literal role="stmt">SELECT</literal> that generates a
+            result set, you must call
+            <literal role="cfunc">mysql_stmt_fetch()</literal> to fetch
+            the data prior to calling any other functions that result in
+            query processing. For more information on how to fetch the
+            results, refer to <xref linkend="mysql-stmt-fetch"/>.
+          </para>
+        </listitem>
+
+      </itemizedlist>
+
       <para>
         For statements that generate a result set, you can request that
         <literal role="cfunc">mysql_stmt_execute()</literal> open a

@@ -11546,7 +11563,7 @@
   exit(0);
 }
 
-/* Get the total number of affected rows */
+/* Get the number of affected rows */
 affected_rows= mysql_stmt_affected_rows(stmt);
 fprintf(stdout, " total affected rows(insert 1): %lu\n",
                 (unsigned long) affected_rows);

@@ -11629,7 +11646,7 @@
         result set exists; that is, after a call to
         <literal role="cfunc">mysql_stmt_execute()</literal> for a
         statement such as <literal role="stmt">SELECT</literal> that
-        creates a result set.
+        produces a result set.
       </para>
 
       <para>

@@ -12947,7 +12964,7 @@
         <literal role="cfunc">mysql_stmt_result_metadata()</literal>
         returns the result set metadata in the form of a pointer to a
         <literal>MYSQL_RES</literal> structure that can be used to
-        process the meta information such as total number of fields and
+        process the meta information such as number of fields and
         individual field information. This result set pointer can be
         passed as an argument to any of the field-based API functions
         that process result set metadata, such as:


Thread
svn commit - mysqldoc@docsrva: r21257 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-5.4 refman-5.5 refman-6.0paul.dubois15 Jun