List:Commits« Previous MessageNext Message »
From:paul Date:February 12 2007 2:13am
Subject:svn commit - mysqldoc@docsrva: r4896 - in trunk: . refman-4.1 refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2007-02-12 03:13:29 +0100 (Mon, 12 Feb 2007)
New Revision: 4896

Log:
 r16116@frost:  paul | 2007-02-11 20:12:46 -0600
 Minor adjustments.


Modified:
   trunk/refman-4.1/apis-c.xml
   trunk/refman-5.0/apis-c.xml
   trunk/refman-5.1/apis-c.xml

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:19666
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:16114
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:13520
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:19666
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:16116
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:13520


Modified: trunk/refman-4.1/apis-c.xml
===================================================================
--- trunk/refman-4.1/apis-c.xml	2007-02-12 01:45:58 UTC (rev 4895)
+++ trunk/refman-4.1/apis-c.xml	2007-02-12 02:13:29 UTC (rev 4896)
Changed blocks: 4, Lines Added: 14, Lines Deleted: 14; 3907 bytes

@@ -8358,8 +8358,8 @@
     <informaltable>
       <tgroup cols="3">
         <colspec colwidth="30*"/>
-        <colspec colwidth="40*"/>
-        <colspec colwidth="30*"/>
+        <colspec colwidth="35*"/>
+        <colspec colwidth="35*"/>
         <tbody>
           <row>
             <entry><emphasis role="bold">Input Variable C Type</emphasis></entry>

@@ -8448,7 +8448,7 @@
       language variable that you are binding. If the variable is
       <literal>unsigned</literal>, you should also set the
       <literal>is_unsigned</literal> member to true. The table shows the
-      SQL types of recieved values, the corresponding type code that
+      SQL types of received values, the corresponding type code that
       such values have in result set metadata, and the recommended C
       language data types to bind to the <literal>MYSQL_BIND</literal>
       structure to receive the SQL values without conversion. Note that

@@ -8523,32 +8523,32 @@
             <entry><literal>MYSQL_TIME</literal></entry>
           </row>
           <row>
-            <entry><literal>CHAR/BINARY</literal></entry>
+            <entry><literal>CHAR, BINARY</literal></entry>
             <entry><literal>MYSQL_TYPE_STRING</literal></entry>
             <entry><literal>char[]</literal></entry>
           </row>
           <row>
-            <entry><literal>VARCHAR/VARBINARY</literal></entry>
+            <entry><literal>VARCHAR, VARBINARY</literal></entry>
             <entry><literal>MYSQL_TYPE_VAR_STRING</literal></entry>
             <entry><literal>char[]</literal></entry>
           </row>
           <row>
-            <entry><literal>TINYBLOB/TINYTEXT</literal></entry>
+            <entry><literal>TINYBLOB, TINYTEXT</literal></entry>
             <entry><literal>MYSQL_TYPE_TINY_BLOB</literal></entry>
             <entry><literal>char[]</literal></entry>
           </row>
           <row>
-            <entry><literal>BLOB/TEXT</literal></entry>
+            <entry><literal>BLOB, TEXT</literal></entry>
             <entry><literal>MYSQL_TYPE_BLOB</literal></entry>
             <entry><literal>char[]</literal></entry>
           </row>
           <row>
-            <entry><literal>MEDIUMBLOB/MEDIUMTEXT</literal></entry>
+            <entry><literal>MEDIUMBLOB, MEDIUMTEXT</literal></entry>
             <entry><literal>MYSQL_TYPE_MEDIUM_BLOB</literal></entry>
             <entry><literal>char[]</literal></entry>
           </row>
           <row>
-            <entry><literal>LONGBLOB/LONGTEXT</literal></entry>
+            <entry><literal>LONGBLOB, LONGTEXT</literal></entry>
             <entry><literal>MYSQL_TYPE_LONG_BLOB</literal></entry>
             <entry><literal>char[]</literal></entry>
           </row>

@@ -8611,11 +8611,11 @@
 
     <para>
       Before binding variables to the <literal>MYSQL_BIND</literal>
-      structures that are to be used for fetching the column values, you
-      can check the type codes for the columns of a result set. This
-      might be desirable if you want to determine which variable types
-      would be best to use to avoid type conversions. To get the type
-      codes, call <literal>mysql_stmt_result_metadata()</literal> after
+      structures that are to be used for fetching column values, you can
+      check the type codes for each column of the result set. This might
+      be desirable if you want to determine which variable types would
+      be best to use to avoid type conversions. To get the type codes,
+      call <literal>mysql_stmt_result_metadata()</literal> after
       executing the prepared statement with
       <literal>mysql_stmt_execute()</literal>. The metadata provides
       access to the type codes for the result set as described in


Modified: trunk/refman-5.0/apis-c.xml
===================================================================
--- trunk/refman-5.0/apis-c.xml	2007-02-12 01:45:58 UTC (rev 4895)
+++ trunk/refman-5.0/apis-c.xml	2007-02-12 02:13:29 UTC (rev 4896)
Changed blocks: 4, Lines Added: 14, Lines Deleted: 14; 3907 bytes

@@ -8474,8 +8474,8 @@
     <informaltable>
       <tgroup cols="3">
         <colspec colwidth="30*"/>
-        <colspec colwidth="40*"/>
-        <colspec colwidth="30*"/>
+        <colspec colwidth="35*"/>
+        <colspec colwidth="35*"/>
         <tbody>
           <row>
             <entry><emphasis role="bold">Input Variable C Type</emphasis></entry>

@@ -8564,7 +8564,7 @@
       language variable that you are binding. If the variable is
       <literal>unsigned</literal>, you should also set the
       <literal>is_unsigned</literal> member to true. The table shows the
-      SQL types of recieved values, the corresponding type code that
+      SQL types of received values, the corresponding type code that
       such values have in result set metadata, and the recommended C
       language data types to bind to the <literal>MYSQL_BIND</literal>
       structure to receive the SQL values without conversion. Note that

@@ -8649,32 +8649,32 @@
             <entry><literal>MYSQL_TIME</literal></entry>
           </row>
           <row>
-            <entry><literal>CHAR/BINARY</literal></entry>
+            <entry><literal>CHAR, BINARY</literal></entry>
             <entry><literal>MYSQL_TYPE_STRING</literal></entry>
             <entry><literal>char[]</literal></entry>
           </row>
           <row>
-            <entry><literal>VARCHAR/VARBINARY</literal></entry>
+            <entry><literal>VARCHAR, VARBINARY</literal></entry>
             <entry><literal>MYSQL_TYPE_VAR_STRING</literal></entry>
             <entry><literal>char[]</literal></entry>
           </row>
           <row>
-            <entry><literal>TINYBLOB/TINYTEXT</literal></entry>
+            <entry><literal>TINYBLOB, TINYTEXT</literal></entry>
             <entry><literal>MYSQL_TYPE_TINY_BLOB</literal></entry>
             <entry><literal>char[]</literal></entry>
           </row>
           <row>
-            <entry><literal>BLOB/TEXT</literal></entry>
+            <entry><literal>BLOB, TEXT</literal></entry>
             <entry><literal>MYSQL_TYPE_BLOB</literal></entry>
             <entry><literal>char[]</literal></entry>
           </row>
           <row>
-            <entry><literal>MEDIUMBLOB/MEDIUMTEXT</literal></entry>
+            <entry><literal>MEDIUMBLOB, MEDIUMTEXT</literal></entry>
             <entry><literal>MYSQL_TYPE_MEDIUM_BLOB</literal></entry>
             <entry><literal>char[]</literal></entry>
           </row>
           <row>
-            <entry><literal>LONGBLOB/LONGTEXT</literal></entry>
+            <entry><literal>LONGBLOB, LONGTEXT</literal></entry>
             <entry><literal>MYSQL_TYPE_LONG_BLOB</literal></entry>
             <entry><literal>char[]</literal></entry>
           </row>

@@ -8737,11 +8737,11 @@
 
     <para>
       Before binding variables to the <literal>MYSQL_BIND</literal>
-      structures that are to be used for fetching the column values, you
-      can check the type codes for the columns of a result set. This
-      might be desirable if you want to determine which variable types
-      would be best to use to avoid type conversions. To get the type
-      codes, call <literal>mysql_stmt_result_metadata()</literal> after
+      structures that are to be used for fetching column values, you can
+      check the type codes for each column of the result set. This might
+      be desirable if you want to determine which variable types would
+      be best to use to avoid type conversions. To get the type codes,
+      call <literal>mysql_stmt_result_metadata()</literal> after
       executing the prepared statement with
       <literal>mysql_stmt_execute()</literal>. The metadata provides
       access to the type codes for the result set as described in


Modified: trunk/refman-5.1/apis-c.xml
===================================================================
--- trunk/refman-5.1/apis-c.xml	2007-02-12 01:45:58 UTC (rev 4895)
+++ trunk/refman-5.1/apis-c.xml	2007-02-12 02:13:29 UTC (rev 4896)
Changed blocks: 4, Lines Added: 14, Lines Deleted: 14; 3907 bytes

@@ -8592,8 +8592,8 @@
     <informaltable>
       <tgroup cols="3">
         <colspec colwidth="30*"/>
-        <colspec colwidth="40*"/>
-        <colspec colwidth="30*"/>
+        <colspec colwidth="35*"/>
+        <colspec colwidth="35*"/>
         <tbody>
           <row>
             <entry><emphasis role="bold">Input Variable C Type</emphasis></entry>

@@ -8682,7 +8682,7 @@
       language variable that you are binding. If the variable is
       <literal>unsigned</literal>, you should also set the
       <literal>is_unsigned</literal> member to true. The table shows the
-      SQL types of recieved values, the corresponding type code that
+      SQL types of received values, the corresponding type code that
       such values have in result set metadata, and the recommended C
       language data types to bind to the <literal>MYSQL_BIND</literal>
       structure to receive the SQL values without conversion. Note that

@@ -8767,32 +8767,32 @@
             <entry><literal>MYSQL_TIME</literal></entry>
           </row>
           <row>
-            <entry><literal>CHAR/BINARY</literal></entry>
+            <entry><literal>CHAR, BINARY</literal></entry>
             <entry><literal>MYSQL_TYPE_STRING</literal></entry>
             <entry><literal>char[]</literal></entry>
           </row>
           <row>
-            <entry><literal>VARCHAR/VARBINARY</literal></entry>
+            <entry><literal>VARCHAR, VARBINARY</literal></entry>
             <entry><literal>MYSQL_TYPE_VAR_STRING</literal></entry>
             <entry><literal>char[]</literal></entry>
           </row>
           <row>
-            <entry><literal>TINYBLOB/TINYTEXT</literal></entry>
+            <entry><literal>TINYBLOB, TINYTEXT</literal></entry>
             <entry><literal>MYSQL_TYPE_TINY_BLOB</literal></entry>
             <entry><literal>char[]</literal></entry>
           </row>
           <row>
-            <entry><literal>BLOB/TEXT</literal></entry>
+            <entry><literal>BLOB, TEXT</literal></entry>
             <entry><literal>MYSQL_TYPE_BLOB</literal></entry>
             <entry><literal>char[]</literal></entry>
           </row>
           <row>
-            <entry><literal>MEDIUMBLOB/MEDIUMTEXT</literal></entry>
+            <entry><literal>MEDIUMBLOB, MEDIUMTEXT</literal></entry>
             <entry><literal>MYSQL_TYPE_MEDIUM_BLOB</literal></entry>
             <entry><literal>char[]</literal></entry>
           </row>
           <row>
-            <entry><literal>LONGBLOB/LONGTEXT</literal></entry>
+            <entry><literal>LONGBLOB, LONGTEXT</literal></entry>
             <entry><literal>MYSQL_TYPE_LONG_BLOB</literal></entry>
             <entry><literal>char[]</literal></entry>
           </row>

@@ -8855,11 +8855,11 @@
 
     <para>
       Before binding variables to the <literal>MYSQL_BIND</literal>
-      structures that are to be used for fetching the column values, you
-      can check the type codes for the columns of a result set. This
-      might be desirable if you want to determine which variable types
-      would be best to use to avoid type conversions. To get the type
-      codes, call <literal>mysql_stmt_result_metadata()</literal> after
+      structures that are to be used for fetching column values, you can
+      check the type codes for each column of the result set. This might
+      be desirable if you want to determine which variable types would
+      be best to use to avoid type conversions. To get the type codes,
+      call <literal>mysql_stmt_result_metadata()</literal> after
       executing the prepared statement with
       <literal>mysql_stmt_execute()</literal>. The metadata provides
       access to the type codes for the result set as described in


Thread
svn commit - mysqldoc@docsrva: r4896 - in trunk: . refman-4.1 refman-5.0 refman-5.1paul12 Feb