Author: paul
Date: 2007-02-06 21:24:13 +0100 (Tue, 06 Feb 2007)
New Revision: 4831
Log:
r19514@polar: paul | 2007-02-06 14:23:39 -0600
Swap two table columns.
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:19512
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:15931
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:19514
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:15931
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-06 20:17:19 UTC (rev 4830)
+++ trunk/refman-4.1/apis-c.xml 2007-02-06 20:24:13 UTC (rev 4831)
Changed blocks: 1, Lines Added: 17, Lines Deleted: 17; 4920 bytes
@@ -8376,88 +8376,88 @@
<colspec colwidth="33*"/>
<tbody>
<row>
+ <entry><emphasis role="bold">SQL
Type</emphasis></entry>
<entry><literal>buffer_type</literal> <emphasis
role="bold">Value</emphasis></entry>
- <entry><emphasis role="bold">SQL
Type</emphasis></entry>
<entry><emphasis role="bold">Recommended C
Type</emphasis></entry>
</row>
<row>
+ <entry><literal>TINYINT</literal></entry>
<entry><literal>MYSQL_TYPE_TINY</literal></entry>
- <entry><literal>TINYINT</literal></entry>
<entry><literal>unsigned char</literal></entry>
</row>
<row>
+ <entry><literal>SMALLINT</literal></entry>
<entry><literal>MYSQL_TYPE_SHORT</literal></entry>
- <entry><literal>SMALLINT</literal></entry>
<entry><literal>short int</literal></entry>
</row>
<row>
+ <entry><literal>INT</literal></entry>
<entry><literal>MYSQL_TYPE_LONG</literal></entry>
- <entry><literal>INT</literal></entry>
<entry><literal>int</literal></entry>
</row>
<row>
+ <entry><literal>BIGINT</literal></entry>
<entry><literal>MYSQL_TYPE_LONGLONG</literal></entry>
- <entry><literal>BIGINT</literal></entry>
<entry><literal>long long int</literal></entry>
</row>
<row>
+ <entry><literal>FLOAT</literal></entry>
<entry><literal>MYSQL_TYPE_FLOAT</literal></entry>
- <entry><literal>FLOAT</literal></entry>
<entry><literal>float</literal></entry>
</row>
<row>
+ <entry><literal>DOUBLE</literal></entry>
<entry><literal>MYSQL_TYPE_DOUBLE</literal></entry>
- <entry><literal>DOUBLE</literal></entry>
<entry><literal>double</literal></entry>
</row>
<row>
+ <entry><literal>TIME</literal></entry>
<entry><literal>MYSQL_TYPE_TIME</literal></entry>
- <entry><literal>TIME</literal></entry>
<entry><literal>MYSQL_TIME</literal></entry>
</row>
<row>
+ <entry><literal>DATE</literal></entry>
<entry><literal>MYSQL_TYPE_DATE</literal></entry>
- <entry><literal>DATE</literal></entry>
<entry><literal>MYSQL_TIME</literal></entry>
</row>
<row>
+ <entry><literal>DATETIME</literal></entry>
<entry><literal>MYSQL_TYPE_DATETIME</literal></entry>
- <entry><literal>DATETIME</literal></entry>
<entry><literal>MYSQL_TIME</literal></entry>
</row>
<row>
+ <entry><literal>TIMESTAMP</literal></entry>
<entry><literal>MYSQL_TYPE_TIMESTAMP</literal></entry>
- <entry><literal>TIMESTAMP</literal></entry>
<entry><literal>MYSQL_TIME</literal></entry>
</row>
<row>
+ <entry><literal>CHAR/BINARY</literal></entry>
<entry><literal>MYSQL_TYPE_STRING</literal></entry>
- <entry><literal>CHAR/BINARY</literal></entry>
<entry><literal>char[]</literal></entry>
</row>
<row>
+ <entry><literal>VARCHAR/VARBINARY</literal></entry>
<entry><literal>MYSQL_TYPE_VAR_STRING</literal></entry>
- <entry><literal>VARCHAR/VARBINARY</literal></entry>
<entry><literal>char[]</literal></entry>
</row>
<row>
+ <entry><literal>TINYBLOB/TINYTEXT</literal></entry>
<entry><literal>MYSQL_TYPE_TINY_BLOB</literal></entry>
- <entry><literal>TINYBLOB/TINYTEXT</literal></entry>
<entry><literal>char[]</literal></entry>
</row>
<row>
+ <entry><literal>BLOB/TEXT</literal></entry>
<entry><literal>MYSQL_TYPE_BLOB</literal></entry>
- <entry><literal>BLOB/TEXT</literal></entry>
<entry><literal>char[]</literal></entry>
</row>
<row>
+
<entry><literal>MEDIUMBLOB/MEDIUMTEXT</literal></entry>
<entry><literal>MYSQL_TYPE_MEDIUM_BLOB</literal></entry>
-
<entry><literal>MEDIUMBLOB/MEDIUMTEXT</literal></entry>
<entry><literal>char[]</literal></entry>
</row>
<row>
+ <entry><literal>LONGBLOB/LONGTEXT</literal></entry>
<entry><literal>MYSQL_TYPE_LONG_BLOB</literal></entry>
- <entry><literal>LONGBLOB/LONGTEXT</literal></entry>
<entry><literal>char[]</literal></entry>
</row>
</tbody>
Modified: trunk/refman-5.0/apis-c.xml
===================================================================
--- trunk/refman-5.0/apis-c.xml 2007-02-06 20:17:19 UTC (rev 4830)
+++ trunk/refman-5.0/apis-c.xml 2007-02-06 20:24:13 UTC (rev 4831)
Changed blocks: 1, Lines Added: 20, Lines Deleted: 20; 5496 bytes
@@ -8492,98 +8492,98 @@
<colspec colwidth="33*"/>
<tbody>
<row>
+ <entry><emphasis role="bold">SQL
Type</emphasis></entry>
<entry><literal>buffer_type</literal> <emphasis
role="bold">Value</emphasis></entry>
- <entry><emphasis role="bold">SQL
Type</emphasis></entry>
<entry><emphasis role="bold">Recommended C
Type</emphasis></entry>
</row>
<row>
+ <entry><literal>BIT</literal></entry>
<entry><literal>MYSQL_TYPE_BIT</literal></entry>
- <entry><literal>BIT</literal></entry>
<entry><literal>unsigned long long
int</literal></entry>
</row>
<row>
+ <entry><literal>TINYINT</literal></entry>
<entry><literal>MYSQL_TYPE_TINY</literal></entry>
- <entry><literal>TINYINT</literal></entry>
- <entry><literal>unsigned char</literal></entry>
+ <entry><literal>char</literal></entry>
</row>
<row>
+ <entry><literal>SMALLINT</literal></entry>
<entry><literal>MYSQL_TYPE_SHORT</literal></entry>
- <entry><literal>SMALLINT</literal></entry>
<entry><literal>short int</literal></entry>
</row>
<row>
+ <entry><literal>INT</literal></entry>
<entry><literal>MYSQL_TYPE_LONG</literal></entry>
- <entry><literal>INT</literal></entry>
<entry><literal>int</literal></entry>
</row>
<row>
+ <entry><literal>BIGINT</literal></entry>
<entry><literal>MYSQL_TYPE_LONGLONG</literal></entry>
- <entry><literal>BIGINT</literal></entry>
<entry><literal>long long int</literal></entry>
</row>
<row>
+ <entry><literal>FLOAT</literal></entry>
<entry><literal>MYSQL_TYPE_FLOAT</literal></entry>
- <entry><literal>FLOAT</literal></entry>
<entry><literal>float</literal></entry>
</row>
<row>
+ <entry><literal>DOUBLE</literal></entry>
<entry><literal>MYSQL_TYPE_DOUBLE</literal></entry>
- <entry><literal>DOUBLE</literal></entry>
<entry><literal>double</literal></entry>
</row>
<row>
+ <entry><literal>DECIMAL</literal></entry>
<entry><literal>MYSQL_TYPE_NEWDECIMAL</literal></entry>
- <entry><literal>DECIMAL</literal></entry>
<entry><literal>char[]</literal></entry>
</row>
<row>
+ <entry><literal>TIME</literal></entry>
<entry><literal>MYSQL_TYPE_TIME</literal></entry>
- <entry><literal>TIME</literal></entry>
<entry><literal>MYSQL_TIME</literal></entry>
</row>
<row>
+ <entry><literal>DATE</literal></entry>
<entry><literal>MYSQL_TYPE_DATE</literal></entry>
- <entry><literal>DATE</literal></entry>
<entry><literal>MYSQL_TIME</literal></entry>
</row>
<row>
+ <entry><literal>DATETIME</literal></entry>
<entry><literal>MYSQL_TYPE_DATETIME</literal></entry>
- <entry><literal>DATETIME</literal></entry>
<entry><literal>MYSQL_TIME</literal></entry>
</row>
<row>
+ <entry><literal>TIMESTAMP</literal></entry>
<entry><literal>MYSQL_TYPE_TIMESTAMP</literal></entry>
- <entry><literal>TIMESTAMP</literal></entry>
<entry><literal>MYSQL_TIME</literal></entry>
</row>
<row>
+ <entry><literal>CHAR/BINARY</literal></entry>
<entry><literal>MYSQL_TYPE_STRING</literal></entry>
- <entry><literal>CHAR/BINARY</literal></entry>
<entry><literal>char[]</literal></entry>
</row>
<row>
+ <entry><literal>VARCHAR/VARBINARY</literal></entry>
<entry><literal>MYSQL_TYPE_VAR_STRING</literal></entry>
- <entry><literal>VARCHAR/VARBINARY</literal></entry>
<entry><literal>char[]</literal></entry>
</row>
<row>
+ <entry><literal>TINYBLOB/TINYTEXT</literal></entry>
<entry><literal>MYSQL_TYPE_TINY_BLOB</literal></entry>
- <entry><literal>TINYBLOB/TINYTEXT</literal></entry>
<entry><literal>char[]</literal></entry>
</row>
<row>
+ <entry><literal>BLOB/TEXT</literal></entry>
<entry><literal>MYSQL_TYPE_BLOB</literal></entry>
- <entry><literal>BLOB/TEXT</literal></entry>
<entry><literal>char[]</literal></entry>
</row>
<row>
+
<entry><literal>MEDIUMBLOB/MEDIUMTEXT</literal></entry>
<entry><literal>MYSQL_TYPE_MEDIUM_BLOB</literal></entry>
-
<entry><literal>MEDIUMBLOB/MEDIUMTEXT</literal></entry>
<entry><literal>char[]</literal></entry>
</row>
<row>
+ <entry><literal>LONGBLOB/LONGTEXT</literal></entry>
<entry><literal>MYSQL_TYPE_LONG_BLOB</literal></entry>
- <entry><literal>LONGBLOB/LONGTEXT</literal></entry>
<entry><literal>char[]</literal></entry>
</row>
</tbody>
Modified: trunk/refman-5.1/apis-c.xml
===================================================================
--- trunk/refman-5.1/apis-c.xml 2007-02-06 20:17:19 UTC (rev 4830)
+++ trunk/refman-5.1/apis-c.xml 2007-02-06 20:24:13 UTC (rev 4831)
Changed blocks: 1, Lines Added: 20, Lines Deleted: 20; 5496 bytes
@@ -8610,98 +8610,98 @@
<colspec colwidth="33*"/>
<tbody>
<row>
+ <entry><emphasis role="bold">SQL
Type</emphasis></entry>
<entry><literal>buffer_type</literal> <emphasis
role="bold">Value</emphasis></entry>
- <entry><emphasis role="bold">SQL
Type</emphasis></entry>
<entry><emphasis role="bold">Recommended C
Type</emphasis></entry>
</row>
<row>
+ <entry><literal>BIT</literal></entry>
<entry><literal>MYSQL_TYPE_BIT</literal></entry>
- <entry><literal>BIT</literal></entry>
<entry><literal>unsigned long long
int</literal></entry>
</row>
<row>
+ <entry><literal>TINYINT</literal></entry>
<entry><literal>MYSQL_TYPE_TINY</literal></entry>
- <entry><literal>TINYINT</literal></entry>
- <entry><literal>unsigned char</literal></entry>
+ <entry><literal>char</literal></entry>
</row>
<row>
+ <entry><literal>SMALLINT</literal></entry>
<entry><literal>MYSQL_TYPE_SHORT</literal></entry>
- <entry><literal>SMALLINT</literal></entry>
<entry><literal>short int</literal></entry>
</row>
<row>
+ <entry><literal>INT</literal></entry>
<entry><literal>MYSQL_TYPE_LONG</literal></entry>
- <entry><literal>INT</literal></entry>
<entry><literal>int</literal></entry>
</row>
<row>
+ <entry><literal>BIGINT</literal></entry>
<entry><literal>MYSQL_TYPE_LONGLONG</literal></entry>
- <entry><literal>BIGINT</literal></entry>
<entry><literal>long long int</literal></entry>
</row>
<row>
+ <entry><literal>FLOAT</literal></entry>
<entry><literal>MYSQL_TYPE_FLOAT</literal></entry>
- <entry><literal>FLOAT</literal></entry>
<entry><literal>float</literal></entry>
</row>
<row>
+ <entry><literal>DOUBLE</literal></entry>
<entry><literal>MYSQL_TYPE_DOUBLE</literal></entry>
- <entry><literal>DOUBLE</literal></entry>
<entry><literal>double</literal></entry>
</row>
<row>
+ <entry><literal>DECIMAL</literal></entry>
<entry><literal>MYSQL_TYPE_NEWDECIMAL</literal></entry>
- <entry><literal>DECIMAL</literal></entry>
<entry><literal>char[]</literal></entry>
</row>
<row>
+ <entry><literal>TIME</literal></entry>
<entry><literal>MYSQL_TYPE_TIME</literal></entry>
- <entry><literal>TIME</literal></entry>
<entry><literal>MYSQL_TIME</literal></entry>
</row>
<row>
+ <entry><literal>DATE</literal></entry>
<entry><literal>MYSQL_TYPE_DATE</literal></entry>
- <entry><literal>DATE</literal></entry>
<entry><literal>MYSQL_TIME</literal></entry>
</row>
<row>
+ <entry><literal>DATETIME</literal></entry>
<entry><literal>MYSQL_TYPE_DATETIME</literal></entry>
- <entry><literal>DATETIME</literal></entry>
<entry><literal>MYSQL_TIME</literal></entry>
</row>
<row>
+ <entry><literal>TIMESTAMP</literal></entry>
<entry><literal>MYSQL_TYPE_TIMESTAMP</literal></entry>
- <entry><literal>TIMESTAMP</literal></entry>
<entry><literal>MYSQL_TIME</literal></entry>
</row>
<row>
+ <entry><literal>CHAR/BINARY</literal></entry>
<entry><literal>MYSQL_TYPE_STRING</literal></entry>
- <entry><literal>CHAR/BINARY</literal></entry>
<entry><literal>char[]</literal></entry>
</row>
<row>
+ <entry><literal>VARCHAR/VARBINARY</literal></entry>
<entry><literal>MYSQL_TYPE_VAR_STRING</literal></entry>
- <entry><literal>VARCHAR/VARBINARY</literal></entry>
<entry><literal>char[]</literal></entry>
</row>
<row>
+ <entry><literal>TINYBLOB/TINYTEXT</literal></entry>
<entry><literal>MYSQL_TYPE_TINY_BLOB</literal></entry>
- <entry><literal>TINYBLOB/TINYTEXT</literal></entry>
<entry><literal>char[]</literal></entry>
</row>
<row>
+ <entry><literal>BLOB/TEXT</literal></entry>
<entry><literal>MYSQL_TYPE_BLOB</literal></entry>
- <entry><literal>BLOB/TEXT</literal></entry>
<entry><literal>char[]</literal></entry>
</row>
<row>
+
<entry><literal>MEDIUMBLOB/MEDIUMTEXT</literal></entry>
<entry><literal>MYSQL_TYPE_MEDIUM_BLOB</literal></entry>
-
<entry><literal>MEDIUMBLOB/MEDIUMTEXT</literal></entry>
<entry><literal>char[]</literal></entry>
</row>
<row>
+ <entry><literal>LONGBLOB/LONGTEXT</literal></entry>
<entry><literal>MYSQL_TYPE_LONG_BLOB</literal></entry>
- <entry><literal>LONGBLOB/LONGTEXT</literal></entry>
<entry><literal>char[]</literal></entry>
</row>
</tbody>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r4831 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 6 Feb |