List:Commits« Previous MessageNext Message »
From:paul Date:May 9 2008 9:00pm
Subject:svn commit - mysqldoc@docsrva: r10705 - in trunk: . it/refman-5.1 pt/refman-5.1 refman-4.1 refman-5.0 refman-5.1 refman-6.0
View as plain text  
Author: paul
Date: 2008-05-09 21:00:41 +0200 (Fri, 09 May 2008)
New Revision: 10705

Log:
 r31285@frost:  paul | 2008-05-09 13:53:44 -0500
 Better description of what MYSQL_FIELD->charsetnr means and how
 to interpret the values.


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

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


Modified: trunk/it/refman-5.1/apis-c.xml
===================================================================
--- trunk/it/refman-5.1/apis-c.xml	2008-05-09 18:43:02 UTC (rev 10704)
+++ trunk/it/refman-5.1/apis-c.xml	2008-05-09 19:00:41 UTC (rev 10705)
Changed blocks: 2, Lines Added: 30, Lines Deleted: 1; 1930 bytes

@@ -652,7 +652,8 @@
         </para>
 
         <para>
-          The character set number for the field.
+          An ID number that indicates the character set/collation pair
+          for the field.
         </para>
 
         <para>

@@ -666,6 +667,34 @@
           and the <literal>BLOB</literal> types from the
           <literal>TEXT</literal> types.
         </para>
+
+        <para>
+          <literal>charsetnr</literal> values are the same as those
+          displayed in the <literal>Id</literal> column of the
+          <literal>SHOW COLLATION</literal> statement or the
+          <literal>ID</literal> column of the
+          <literal>INFORMATION_SCHEMA</literal>
+          <literal>COLLATIONS</literal> table. You can use those
+          information sources to see which character set and collation
+          specific <literal>charsetnr</literal> values indicate:
+        </para>
+
+<programlisting>
+mysql&gt; <userinput>SHOW COLLATION WHERE Id = 63;</userinput>
++-----------+---------+----+---------+----------+---------+
+| Collation | Charset | Id | Default | Compiled | Sortlen |
++-----------+---------+----+---------+----------+---------+
+| binary    | binary  | 63 | Yes     | Yes      |       1 | 
++-----------+---------+----+---------+----------+---------+
+
+mysql&gt; <userinput>SELECT COLLATION_NAME,
CHARACTER_SET_NAME</userinput>
+    -&gt; <userinput>FROM INFORMATION_SCHEMA.COLLATIONS WHERE ID =
33;</userinput>
++-----------------+--------------------+
+| COLLATION_NAME  | CHARACTER_SET_NAME |
++-----------------+--------------------+
+| utf8_general_ci | utf8               | 
++-----------------+--------------------+
+</programlisting>
       </listitem>
 
       <listitem>


Modified: trunk/pt/refman-5.1/apis-c.xml
===================================================================
--- trunk/pt/refman-5.1/apis-c.xml	2008-05-09 18:43:02 UTC (rev 10704)
+++ trunk/pt/refman-5.1/apis-c.xml	2008-05-09 19:00:41 UTC (rev 10705)
Changed blocks: 2, Lines Added: 30, Lines Deleted: 1; 1930 bytes

@@ -652,7 +652,8 @@
         </para>
 
         <para>
-          The character set number for the field.
+          An ID number that indicates the character set/collation pair
+          for the field.
         </para>
 
         <para>

@@ -666,6 +667,34 @@
           and the <literal>BLOB</literal> types from the
           <literal>TEXT</literal> types.
         </para>
+
+        <para>
+          <literal>charsetnr</literal> values are the same as those
+          displayed in the <literal>Id</literal> column of the
+          <literal>SHOW COLLATION</literal> statement or the
+          <literal>ID</literal> column of the
+          <literal>INFORMATION_SCHEMA</literal>
+          <literal>COLLATIONS</literal> table. You can use those
+          information sources to see which character set and collation
+          specific <literal>charsetnr</literal> values indicate:
+        </para>
+
+<programlisting>
+mysql&gt; <userinput>SHOW COLLATION WHERE Id = 63;</userinput>
++-----------+---------+----+---------+----------+---------+
+| Collation | Charset | Id | Default | Compiled | Sortlen |
++-----------+---------+----+---------+----------+---------+
+| binary    | binary  | 63 | Yes     | Yes      |       1 | 
++-----------+---------+----+---------+----------+---------+
+
+mysql&gt; <userinput>SELECT COLLATION_NAME,
CHARACTER_SET_NAME</userinput>
+    -&gt; <userinput>FROM INFORMATION_SCHEMA.COLLATIONS WHERE ID =
33;</userinput>
++-----------------+--------------------+
+| COLLATION_NAME  | CHARACTER_SET_NAME |
++-----------------+--------------------+
+| utf8_general_ci | utf8               | 
++-----------------+--------------------+
+</programlisting>
       </listitem>
 
       <listitem>


Modified: trunk/refman-4.1/apis-c.xml
===================================================================
--- trunk/refman-4.1/apis-c.xml	2008-05-09 18:43:02 UTC (rev 10704)
+++ trunk/refman-4.1/apis-c.xml	2008-05-09 19:00:41 UTC (rev 10705)
Changed blocks: 2, Lines Added: 23, Lines Deleted: 2; 1621 bytes

@@ -646,8 +646,8 @@
         </para>
 
         <para>
-          The character set number for the field. This member was added
-          in MySQL 4.1.0.
+          An ID number that indicates the character set/collation pair
+          for the field. This member was added in MySQL 4.1.0.
         </para>
 
         <para>

@@ -661,6 +661,27 @@
           and the <literal>BLOB</literal> types from the
           <literal>TEXT</literal> types.
         </para>
+
+        <para>
+          <literal>charsetnr</literal> values are the same as those
+          displayed in the <literal>Id</literal> column of the
+          <literal>SHOW COLLATION</literal> statement. You can use this
+          statement to see which character set and collation specific
+          <literal>charsetnr</literal> values indicate:
+        </para>
+
+<programlisting>
+mysql&gt; <userinput>SHOW COLLATION;</userinput>
++----------------------+----------+-----+---------+----------+---------+
+| Collation            | Charset  | Id  | Default | Compiled | Sortlen |
++----------------------+----------+-----+---------+----------+---------+
+...
+| utf8_general_ci      | utf8     |  33 | Yes     | Yes      |       1 | 
+...
+| binary               | binary   |  63 | Yes     | Yes      |       1 | 
+...
++----------------------+----------+-----+---------+----------+---------+
+</programlisting>
       </listitem>
 
       <listitem>


Modified: trunk/refman-5.0/apis-c.xml
===================================================================
--- trunk/refman-5.0/apis-c.xml	2008-05-09 18:43:02 UTC (rev 10704)
+++ trunk/refman-5.0/apis-c.xml	2008-05-09 19:00:41 UTC (rev 10705)
Changed blocks: 2, Lines Added: 30, Lines Deleted: 1; 1921 bytes

@@ -658,7 +658,8 @@
         </para>
 
         <para>
-          The character set number for the field.
+          An ID number that indicates the character set/collation pair
+          for the field.
         </para>
 
         <para>

@@ -672,6 +673,34 @@
           and the <literal>BLOB</literal> types from the
           <literal>TEXT</literal> types.
         </para>
+
+        <para>
+          <literal>charsetnr</literal> values are the same as those
+          displayed in the <literal>Id</literal> column of the
+          <literal>SHOW COLLATION</literal> statement or the
+          <literal>ID</literal> column of the
+          <literal>INFORMATION_SCHEMA</literal>
+          <literal>COLLATIONS</literal> table. You can use those
+          information sources to see which character set and collation
+          specific <literal>charsetnr</literal> values indicate:
+        </para>
+
+<programlisting>
+mysql&gt; <userinput>SHOW COLLATION WHERE Id = 63;</userinput>
++-----------+---------+----+---------+----------+---------+
+| Collation | Charset | Id | Default | Compiled | Sortlen |
++-----------+---------+----+---------+----------+---------+
+| binary    | binary  | 63 | Yes     | Yes      |       1 | 
++-----------+---------+----+---------+----------+---------+
+
+mysql&gt; <userinput>SELECT COLLATION_NAME,
CHARACTER_SET_NAME</userinput>
+    -&gt; <userinput>FROM INFORMATION_SCHEMA.COLLATIONS WHERE ID =
33;</userinput>
++-----------------+--------------------+
+| COLLATION_NAME  | CHARACTER_SET_NAME |
++-----------------+--------------------+
+| utf8_general_ci | utf8               | 
++-----------------+--------------------+
+</programlisting>
       </listitem>
 
       <listitem>


Modified: trunk/refman-5.1/apis-c.xml
===================================================================
--- trunk/refman-5.1/apis-c.xml	2008-05-09 18:43:02 UTC (rev 10704)
+++ trunk/refman-5.1/apis-c.xml	2008-05-09 19:00:41 UTC (rev 10705)
Changed blocks: 2, Lines Added: 30, Lines Deleted: 1; 1921 bytes

@@ -652,7 +652,8 @@
         </para>
 
         <para>
-          The character set number for the field.
+          An ID number that indicates the character set/collation pair
+          for the field.
         </para>
 
         <para>

@@ -666,6 +667,34 @@
           and the <literal>BLOB</literal> types from the
           <literal>TEXT</literal> types.
         </para>
+
+        <para>
+          <literal>charsetnr</literal> values are the same as those
+          displayed in the <literal>Id</literal> column of the
+          <literal>SHOW COLLATION</literal> statement or the
+          <literal>ID</literal> column of the
+          <literal>INFORMATION_SCHEMA</literal>
+          <literal>COLLATIONS</literal> table. You can use those
+          information sources to see which character set and collation
+          specific <literal>charsetnr</literal> values indicate:
+        </para>
+
+<programlisting>
+mysql&gt; <userinput>SHOW COLLATION WHERE Id = 63;</userinput>
++-----------+---------+----+---------+----------+---------+
+| Collation | Charset | Id | Default | Compiled | Sortlen |
++-----------+---------+----+---------+----------+---------+
+| binary    | binary  | 63 | Yes     | Yes      |       1 | 
++-----------+---------+----+---------+----------+---------+
+
+mysql&gt; <userinput>SELECT COLLATION_NAME,
CHARACTER_SET_NAME</userinput>
+    -&gt; <userinput>FROM INFORMATION_SCHEMA.COLLATIONS WHERE ID =
33;</userinput>
++-----------------+--------------------+
+| COLLATION_NAME  | CHARACTER_SET_NAME |
++-----------------+--------------------+
+| utf8_general_ci | utf8               | 
++-----------------+--------------------+
+</programlisting>
       </listitem>
 
       <listitem>


Modified: trunk/refman-6.0/apis-c.xml
===================================================================
--- trunk/refman-6.0/apis-c.xml	2008-05-09 18:43:02 UTC (rev 10704)
+++ trunk/refman-6.0/apis-c.xml	2008-05-09 19:00:41 UTC (rev 10705)
Changed blocks: 2, Lines Added: 30, Lines Deleted: 1; 1921 bytes

@@ -636,7 +636,8 @@
         </para>
 
         <para>
-          The character set number for the field.
+          An ID number that indicates the character set/collation pair
+          for the field.
         </para>
 
         <para>

@@ -650,6 +651,34 @@
           and the <literal>BLOB</literal> types from the
           <literal>TEXT</literal> types.
         </para>
+
+        <para>
+          <literal>charsetnr</literal> values are the same as those
+          displayed in the <literal>Id</literal> column of the
+          <literal>SHOW COLLATION</literal> statement or the
+          <literal>ID</literal> column of the
+          <literal>INFORMATION_SCHEMA</literal>
+          <literal>COLLATIONS</literal> table. You can use those
+          information sources to see which character set and collation
+          specific <literal>charsetnr</literal> values indicate:
+        </para>
+
+<programlisting>
+mysql&gt; <userinput>SHOW COLLATION WHERE Id = 63;</userinput>
++-----------+---------+----+---------+----------+---------+
+| Collation | Charset | Id | Default | Compiled | Sortlen |
++-----------+---------+----+---------+----------+---------+
+| binary    | binary  | 63 | Yes     | Yes      |       1 | 
++-----------+---------+----+---------+----------+---------+
+
+mysql&gt; <userinput>SELECT COLLATION_NAME,
CHARACTER_SET_NAME</userinput>
+    -&gt; <userinput>FROM INFORMATION_SCHEMA.COLLATIONS WHERE ID =
33;</userinput>
++-----------------+--------------------+
+| COLLATION_NAME  | CHARACTER_SET_NAME |
++-----------------+--------------------+
+| utf8_general_ci | utf8               | 
++-----------------+--------------------+
+</programlisting>
       </listitem>
 
       <listitem>


Thread
svn commit - mysqldoc@docsrva: r10705 - in trunk: . it/refman-5.1 pt/refman-5.1 refman-4.1 refman-5.0 refman-5.1 refman-6.0paul9 May 2008