List:Commits« Previous MessageNext Message »
From:paul Date:January 18 2006 11:47pm
Subject:svn commit - mysqldoc@docsrva: r910 - in trunk: . refman-4.1 refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2006-01-19 00:47:28 +0100 (Thu, 19 Jan 2006)
New Revision: 910

Log:
 r6372@frost:  paul | 2006-01-18 16:48:00 -0600
 General revisions.


Modified:
   trunk/
   trunk/refman-4.1/data-types.xml
   trunk/refman-5.0/data-types.xml
   trunk/refman-5.1/data-types.xml


Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6354
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2309
   + b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6372
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2309

Modified: trunk/refman-4.1/data-types.xml
===================================================================
--- trunk/refman-4.1/data-types.xml	2006-01-18 21:30:47 UTC (rev 909)
+++ trunk/refman-4.1/data-types.xml	2006-01-18 23:47:28 UTC (rev 910)
@@ -4612,8 +4612,8 @@
         <literal>ENUM</literal> column, use <literal>SHOW COLUMNS FROM
         <replaceable>tbl_name</replaceable> LIKE
         <replaceable>enum_col</replaceable></literal> and parse the
-        <literal>ENUM</literal> definition in the second column of the
-        output.
+        <literal>ENUM</literal> definition in the
+        <literal>Type</literal> column of the output.
       </para>
 
     </section>
@@ -4872,8 +4872,8 @@
         <literal>SET</literal> column, use <literal>SHOW COLUMNS FROM
         <replaceable>tbl_name</replaceable> LIKE
         <replaceable>set_col</replaceable></literal> and parse the
-        <literal>SET</literal> definition in the second column of the
-        output.
+        <literal>SET</literal> definition in the <literal>Type</literal>
+        column of the output.
       </para>
 
     </section>
@@ -4896,7 +4896,7 @@
 
     <para>
       The storage requirements for each of the data types supported by
-      MySQL are listed by category.
+      MySQL are listed here by category.
     </para>
 
     <indexterm>
@@ -4911,15 +4911,6 @@
       bytes toward this size.
     </para>
 
-    <para>
-      If a <literal>MyISAM</literal> or <literal>ISAM</literal> table
-      includes any variable-length data types, the row format is also
-      variable length. When a table is created, MySQL may, under certain
-      conditions, change a column from a variable-length type to a
-      fixed-length type or vice versa. See
-      <xref linkend="silent-column-changes"/>.
-    </para>
-
     <indexterm>
       <primary>numeric types</primary>
     </indexterm>
@@ -4973,7 +4964,7 @@
             <entry>4 bytes</entry>
           </row>
           <row>
-            <entry><literal>DOUBLE [PRECISION]</literal>, item <literal>REAL</literal></entry>
+            <entry><literal>DOUBLE [PRECISION]</literal>, <literal>REAL</literal></entry>
             <entry>8 bytes</entry>
           </row>
           <row>
@@ -5001,24 +4992,18 @@
       </listitem>
 
       <listitem>
-        <itemizedlist>
+        <para>
+          <literal><replaceable>M</replaceable>+1</literal> bytes, if
+          <replaceable>D</replaceable> = 0
+        </para>
+      </listitem>
 
-          <listitem>
-            <para>
-              <literal><replaceable>M</replaceable>+1</literal> bytes,
-              if <replaceable>D</replaceable> = 0
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              <replaceable>D</replaceable>+2, if
-              <literal><replaceable>M</replaceable> &lt;
-              <replaceable>D</replaceable></literal>
-            </para>
-          </listitem>
-
-        </itemizedlist>
+      <listitem>
+        <para>
+          <replaceable>D</replaceable>+2, if
+          <literal><replaceable>M</replaceable> &lt;
+          <replaceable>D</replaceable></literal>
+        </para>
       </listitem>
 
     </itemizedlist>
@@ -5153,6 +5138,21 @@
       </tgroup>
     </informaltable>
 
+    <para>
+      For the <literal>CHAR</literal>, <literal>VARCHAR</literal>, and
+      <literal>TEXT</literal> types, <replaceable>L</replaceable> and
+      <replaceable>M</replaceable> in the preceding table should be
+      interpreted as number of bytes before MySQL 4.1 and as number of
+      characters thereafter. Lengths for these types in columns
+      specifications indicate number of characters from MySQL 4.1 on.
+      The number of extra bytes for recording lengths for
+      variable-length data types is unchanged. For example,
+      <replaceable>L</replaceable>+1 bytes to store a
+      <literal>TINYTEXT</literal> value before MySQL 4.1 becomes
+      <replaceable>L</replaceable> characters + 1 byte to store the
+      length as of MySQL 4.1.
+    </para>
+
     <indexterm>
       <primary><literal>BLOB</literal></primary>
       <secondary>size</secondary>
@@ -5176,36 +5176,22 @@
       preceding table), rather than on the type's maximum possible size.
       For example, a <literal>VARCHAR(10)</literal> column can hold a
       string with a maximum length of 10. The actual storage required is
-      the length of the string (<replaceable>L</replaceable>), plus 1
+      the length of the string (<replaceable>L</replaceable>), plus one
       byte to record the length of the string. For the string
       <literal>'abcd'</literal>, <replaceable>L</replaceable> is 4 and
-      the storage requirement is 5 bytes.
+      the storage requirement is five bytes.
     </para>
 
     <para>
-      For the <literal>CHAR</literal>, <literal>VARCHAR</literal>, and
-      <literal>TEXT</literal> types, <replaceable>L</replaceable> and
-      <replaceable>M</replaceable> in the preceding table should be
-      interpreted as number of bytes before MySQL 4.1 and as number of
-      characters thereafter. Lengths for these types in columns
-      specifications indicate number of characters from MySQL 4.1 on.
-      The number of extra bytes for recording lengths for
-      variable-length data types is unchanged. For example,
-      <replaceable>L</replaceable>+1 bytes to store a
-      <literal>TINYTEXT</literal> value before MySQL 4.1 becomes
-      <replaceable>L</replaceable> characters + 1 byte to store the
-      length as of MySQL 4.1.
-    </para>
-
-    <para>
-      To calculate the number of <emphasis>bytes</emphasis> used to
-      store a particular <literal>CHAR</literal>,
-      <literal>VARCHAR</literal>, or <literal>TEXT</literal> column
-      value in MySQL 4.1 (and later), you will need to take into account
-      the character set in use for that column. In particular, when
-      using Unicode, you must keep in mind that not all Unicode
-      characters use the same number of bytes. For a breakdown of the
-      storage used for different categories of Unicode characters, see
+      As of MySQL 4.1, to calculate the number of
+      <emphasis>bytes</emphasis> used to store a particular
+      <literal>CHAR</literal>, <literal>VARCHAR</literal>, or
+      <literal>TEXT</literal> column value, you must take into account
+      the character set used for that column. In particular, when using
+      the <literal>utf8</literal> Unicode character set, you must keep
+      in mind that not all <literal>utf8</literal> characters use the
+      same number of bytes. For a breakdown of the storage used for
+      different categories of <literal>utf8</literal> characters, see
       <xref linkend="charset-unicode"/>.
     </para>
 
@@ -5255,8 +5241,8 @@
       The size of an <literal>ENUM</literal> object is determined by the
       number of different enumeration values. One byte is used for
       enumerations with up to 255 possible values. Two bytes are used
-      for enumerations with up to 65,535 values. See
-      <xref linkend="enum"/>.
+      for enumerations having between 256 and 65,535 possible values.
+      See <xref linkend="enum"/>.
     </para>
 
     <indexterm>
@@ -5350,7 +5336,7 @@
       To make it easier to use code written for SQL implementations from
       other vendors, MySQL maps data types as shown in the following
       table. These mappings make it easier to import table definitions
-      from other database engines into MySQL:
+      from other database systems into MySQL:
     </para>
 
     <informaltable>
@@ -5457,9 +5443,29 @@
       with types used by other vendors and then issue a
       <literal>DESCRIBE <replaceable>tbl_name</replaceable></literal>
       statement, MySQL reports the table structure using the equivalent
-      MySQL types.
+      MySQL types. For example:
     </para>
 
+<programlisting>
+<!--
+mysql> DROP TABLE IF EXISTS t;
+Query OK, 0 rows affected (0.00 sec)
+-->
+mysql&gt; <userinput>CREATE TABLE t (a BOOL, b FLOAT8, c LONG VARCHAR, d NUMERIC);</userinput>
+Query OK, 0 rows affected (0.00 sec)
+
+mysql&gt; <userinput>DESCRIBE t;</userinput>
++-------+---------------+------+-----+---------+-------+
+| Field | Type          | Null | Key | Default | Extra |
++-------+---------------+------+-----+---------+-------+
+| a     | tinyint(1)    | YES  |     | NULL    |       |
+| b     | double        | YES  |     | NULL    |       |
+| c     | mediumtext    | YES  |     | NULL    |       |
+| d     | decimal(10,0) | YES  |     | NULL    |       |
++-------+---------------+------+-----+---------+-------+
+4 rows in set (0.01 sec)
+</programlisting>
+
   </section>
 
 </chapter>

Modified: trunk/refman-5.0/data-types.xml
===================================================================
--- trunk/refman-5.0/data-types.xml	2006-01-18 21:30:47 UTC (rev 909)
+++ trunk/refman-5.0/data-types.xml	2006-01-18 23:47:28 UTC (rev 910)
@@ -4354,8 +4354,8 @@
         <literal>ENUM</literal> column, use <literal>SHOW COLUMNS FROM
         <replaceable>tbl_name</replaceable> LIKE
         <replaceable>enum_col</replaceable></literal> and parse the
-        <literal>ENUM</literal> definition in the second column of the
-        output.
+        <literal>ENUM</literal> definition in the
+        <literal>Type</literal> column of the output.
       </para>
 
     </section>
@@ -4611,8 +4611,8 @@
         <literal>SET</literal> column, use <literal>SHOW COLUMNS FROM
         <replaceable>tbl_name</replaceable> LIKE
         <replaceable>set_col</replaceable></literal> and parse the
-        <literal>SET</literal> definition in the second column of the
-        output.
+        <literal>SET</literal> definition in the <literal>Type</literal>
+        column of the output.
       </para>
 
     </section>
@@ -4635,7 +4635,7 @@
 
     <para>
       The storage requirements for each of the data types supported by
-      MySQL are listed by category.
+      MySQL are listed here by category.
     </para>
 
     <indexterm>
@@ -4650,14 +4650,6 @@
       bytes toward this size.
     </para>
 
-    <para>
-      If a <literal>MyISAM</literal> table includes any variable-length
-      data types, the row format is also variable length. When a table
-      is created, MySQL may, under certain conditions, change a column
-      from a variable-length type to a fixed-length type or vice versa.
-      See <xref linkend="silent-column-changes"/>, for more information.
-    </para>
-
     <indexterm>
       <primary>numeric types</primary>
     </indexterm>
@@ -4711,7 +4703,7 @@
             <entry>4 bytes</entry>
           </row>
           <row>
-            <entry><literal>DOUBLE [PRECISION]</literal>, item <literal>REAL</literal></entry>
+            <entry><literal>DOUBLE [PRECISION]</literal>, <literal>REAL</literal></entry>
             <entry>8 bytes</entry>
           </row>
           <row>
@@ -4749,14 +4741,10 @@
         <colspec colwidth="25*"/>
         <tbody>
           <row>
-            <entry><emphasis role="bold">Leftover</emphasis></entry>
-            <entry><emphasis role="bold">Number</emphasis></entry>
+            <entry><emphasis role="bold">Leftover Digits</emphasis></entry>
+            <entry><emphasis role="bold">Number of Bytes</emphasis></entry>
           </row>
           <row>
-            <entry><emphasis role="bold">Digits</emphasis></entry>
-            <entry><emphasis role="bold">of Bytes</emphasis></entry>
-          </row>
-          <row>
             <entry>0</entry>
             <entry>0</entry>
           </row>
@@ -4951,6 +4939,17 @@
       </tgroup>
     </informaltable>
 
+    <para>
+      For the <literal>CHAR</literal>, <literal>VARCHAR</literal>, and
+      <literal>TEXT</literal> types, the values
+      <replaceable>L</replaceable> and <replaceable>M</replaceable> in
+      the preceding table should be interpreted as number of characters,
+      and lengths for these types in column specifications indicate the
+      number of characters. For example, to store a
+      <literal>TINYTEXT</literal> value requires
+      <replaceable>L</replaceable> characters plus one byte.
+    </para>
+
     <indexterm>
       <primary><literal>BLOB</literal></primary>
       <secondary>size</secondary>
@@ -4969,44 +4968,57 @@
     <para>
       <literal>VARCHAR</literal> and the <literal>BLOB</literal> and
       <literal>TEXT</literal> types are variable-length types. For each,
-      the storage requirements depend on the actual length of column
-      values (represented by <replaceable>L</replaceable> in the
-      preceding table), rather than on the type's maximum possible size.
-      For example, a <literal>VARCHAR(10)</literal> column can hold a
-      string with a maximum length of 10. The actual storage required is
-      the length of the string (<replaceable>L</replaceable>), plus 1
-      byte to record the length of the string. For the string
-      <literal>'abcd'</literal>, <replaceable>L</replaceable> is 4 and
-      the storage requirement is 5 bytes.
+      the storage requirements depend on these factors:
     </para>
 
-    <remark role="todo">
-      Can be worded better?
-    </remark>
+    <itemizedlist>
 
+      <listitem>
+        <para>
+          The actual length of the column value
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          The column's maximum possible length
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          The character set used for the column
+        </para>
+      </listitem>
+
+    </itemizedlist>
+
     <para>
-      For the <literal>CHAR</literal>, <literal>VARCHAR</literal>, and
-      <literal>TEXT</literal> types, the values
-      <replaceable>L</replaceable> and <replaceable>M</replaceable> in
-      the preceding table should be interpreted as number of characters,
-      and lengths for these types in column specifications indicate the
-      number of characters. For example, to store a
-      <literal>TINYTEXT</literal> value requires
-      <replaceable>L</replaceable> characters + 1 byte.
+      For example, a <literal>VARCHAR(10)</literal> column can hold a
+      string with a maximum length of 10. Assuming that the column uses
+      the <literal>latin1</literal> character set (one byte per
+      character), the actual storage required is the length of the
+      string (<replaceable>L</replaceable>), plus one byte to record the
+      length of the string. For the string <literal>'abcd'</literal>,
+      <replaceable>L</replaceable> is 4 and the storage requirement is
+      five bytes. If the same column was instead declared as
+      <literal>VARCHAR(500)</literal>, the string
+      <literal>'abcd'</literal> requires 4 &plus; 2 = 6 bytes. Two bytes
+      rather than one are required for the prefix because the length of
+      the column is greater than 255 characters.
     </para>
 
     <para>
       To calculate the number of <emphasis>bytes</emphasis> used to
       store a particular <literal>CHAR</literal>,
       <literal>VARCHAR</literal>, or <literal>TEXT</literal> column
-      value, you will need to take into account the character set in use
-      for that column. In particular, when using Unicode, you must keep
-      in mind that not all Unicode characters use the same number of
-      bytes. For a breakdown of the storage used for different
-      categories of Unicode characters, see
-      <xref linkend="charset-unicode"/>. You can also obtain this
-      information from the <literal>Maxlen</literal> column in the
-      output of <literal>SHOW CHARSET</literal>.
+      value, you must take into account the character set used for that
+      column. In particular, when using the <literal>utf8</literal>
+      Unicode character set, you must keep in mind that not all
+      <literal>utf8</literal> characters use the same number of bytes.
+      For a breakdown of the storage used for different categories of
+      <literal>utf8</literal> characters, see
+      <xref linkend="charset-unicode"/>.
     </para>
 
     <para>
@@ -5185,7 +5197,7 @@
       To facilitate the use of code written for SQL implementations from
       other vendors, MySQL maps data types as shown in the following
       table. These mappings make it easier to import table definitions
-      from other database engines into MySQL:
+      from other database systems into MySQL:
     </para>
 
     <informaltable>
@@ -5279,8 +5291,12 @@
     </para>
 
 <programlisting>
-mysql&gt; <userinput>CREATE TABLE t (a BOOL, b FLOAT8, c LONG, d NUMERIC);</userinput>
-Query OK, 0 rows affected (0.08 sec)
+<!--
+mysql> DROP TABLE IF EXISTS t;
+Query OK, 0 rows affected (0.00 sec)
+-->
+mysql&gt; <userinput>CREATE TABLE t (a BOOL, b FLOAT8, c LONG VARCHAR, d NUMERIC);</userinput>
+Query OK, 0 rows affected (0.00 sec)
 
 mysql&gt; <userinput>DESCRIBE t;</userinput>
 +-------+---------------+------+-----+---------+-------+
@@ -5291,7 +5307,7 @@
 | c     | mediumtext    | YES  |     | NULL    |       |
 | d     | decimal(10,0) | YES  |     | NULL    |       |
 +-------+---------------+------+-----+---------+-------+
-4 rows in set (0.00 sec)
+4 rows in set (0.01 sec)
 </programlisting>
 
   </section>

Modified: trunk/refman-5.1/data-types.xml
===================================================================
--- trunk/refman-5.1/data-types.xml	2006-01-18 21:30:47 UTC (rev 909)
+++ trunk/refman-5.1/data-types.xml	2006-01-18 23:47:28 UTC (rev 910)
@@ -4166,8 +4166,8 @@
         <literal>ENUM</literal> column, use <literal>SHOW COLUMNS FROM
         <replaceable>tbl_name</replaceable> LIKE
         <replaceable>enum_col</replaceable></literal> and parse the
-        <literal>ENUM</literal> definition in the second column of the
-        output.
+        <literal>ENUM</literal> definition in the
+        <literal>Type</literal> column of the output.
       </para>
 
     </section>
@@ -4423,8 +4423,8 @@
         <literal>SET</literal> column, use <literal>SHOW COLUMNS FROM
         <replaceable>tbl_name</replaceable> LIKE
         <replaceable>set_col</replaceable></literal> and parse the
-        <literal>SET</literal> definition in the second column of the
-        output.
+        <literal>SET</literal> definition in the <literal>Type</literal>
+        column of the output.
       </para>
 
     </section>
@@ -4447,7 +4447,7 @@
 
     <para>
       The storage requirements for each of the data types supported by
-      MySQL are listed by category.
+      MySQL are listed here by category.
     </para>
 
     <indexterm>
@@ -4462,14 +4462,6 @@
       bytes toward this size.
     </para>
 
-    <para>
-      If a <literal>MyISAM</literal> table includes any variable-length
-      data types, the row format is also variable length. When a table
-      is created, MySQL may, under certain conditions, change a column
-      from a variable-length type to a fixed-length type or vice versa.
-      See <xref linkend="silent-column-changes"/>, for more information.
-    </para>
-
     <indexterm>
       <primary>numeric types</primary>
     </indexterm>
@@ -4523,7 +4515,7 @@
             <entry>4 bytes</entry>
           </row>
           <row>
-            <entry><literal>DOUBLE [PRECISION]</literal>, item <literal>REAL</literal></entry>
+            <entry><literal>DOUBLE [PRECISION]</literal>, <literal>REAL</literal></entry>
             <entry>8 bytes</entry>
           </row>
           <row>
@@ -4540,34 +4532,26 @@
     </informaltable>
 
     <para>
-      The storage requirements for <literal>DECIMAL</literal> (and
-      <literal>NUMERIC</literal>) are version-specific:
+      Values for <literal>DECIMAL</literal> (and
+      <literal>NUMERIC</literal>) columns are represented using a binary
+      format that packs nine decimal (base 10) digits into four bytes.
+      Storage for the integer and fractional parts of each value are
+      determined separately. Each multiple of nine digits requires four
+      bytes, and the <quote>leftover</quote> digits require some
+      fraction of four bytes. The storage required for excess digits is
+      given by the following table:
     </para>
 
-    <para>
-      Values for <literal>DECIMAL</literal> columns are represented
-      using a binary format that packs nine decimal (base 10) digits
-      into four bytes. Storage for the integer and fractional parts of
-      each value are determined separately. Each multiple of nine digits
-      requires four bytes, and the <quote>leftover</quote> digits
-      require some fraction of four bytes. The storage required for
-      excess digits is given by the following table:
-    </para>
-
     <informaltable>
       <tgroup cols="2">
         <colspec colwidth="25*"/>
         <colspec colwidth="25*"/>
         <tbody>
           <row>
-            <entry><emphasis role="bold">Leftover</emphasis></entry>
-            <entry><emphasis role="bold">Number</emphasis></entry>
+            <entry><emphasis role="bold">Leftover Digits</emphasis></entry>
+            <entry><emphasis role="bold">Number of Bytes</emphasis></entry>
           </row>
           <row>
-            <entry><emphasis role="bold">Digits</emphasis></entry>
-            <entry><emphasis role="bold">of Bytes</emphasis></entry>
-          </row>
-          <row>
             <entry>0</entry>
             <entry>0</entry>
           </row>
@@ -4746,6 +4730,17 @@
       </tgroup>
     </informaltable>
 
+    <para>
+      For the <literal>CHAR</literal>, <literal>VARCHAR</literal>, and
+      <literal>TEXT</literal> types, the values
+      <replaceable>L</replaceable> and <replaceable>M</replaceable> in
+      the preceding table should be interpreted as number of characters,
+      and lengths for these types in column specifications indicate the
+      number of characters. For example, to store a
+      <literal>TINYTEXT</literal> value requires
+      <replaceable>L</replaceable> characters plus one byte.
+    </para>
+
     <indexterm>
       <primary><literal>BLOB</literal></primary>
       <secondary>size</secondary>
@@ -4771,13 +4766,13 @@
 
       <listitem>
         <para>
-          The actual actual length of the column value
+          The actual length of the column value
         </para>
       </listitem>
 
       <listitem>
         <para>
-          The column's maximum possible size
+          The column's maximum possible length
         </para>
       </listitem>
 
@@ -4792,45 +4787,29 @@
     <para>
       For example, a <literal>VARCHAR(10)</literal> column can hold a
       string with a maximum length of 10. Assuming that the column uses
-      the <literal>latin1</literal> character set (1 byte per
+      the <literal>latin1</literal> character set (one byte per
       character), the actual storage required is the length of the
-      string (<replaceable>L</replaceable>), plus 1 byte to record the
+      string (<replaceable>L</replaceable>), plus one byte to record the
       length of the string. For the string <literal>'abcd'</literal>,
-      <replaceable>L</replaceable> is 4 and the storage requirement is 5
-      bytes. If the same column was instead declared as
+      <replaceable>L</replaceable> is 4 and the storage requirement is
+      five bytes. If the same column was instead declared as
       <literal>VARCHAR(500)</literal>, the string
-      <literal>'abcd'</literal> requires 4 &plus; 2 = 6 bytes &mdash; 2
-      bytes rather than 1 because the length of the column is greater
-      than 255 characters.
+      <literal>'abcd'</literal> requires 4 &plus; 2 = 6 bytes. Two bytes
+      rather than one are required for the prefix because the length of
+      the column is greater than 255 characters.
     </para>
 
-    <remark role="todo">
-      Can be worded better?
-    </remark>
-
     <para>
-      For the <literal>CHAR</literal>, <literal>VARCHAR</literal>, and
-      <literal>TEXT</literal> types, the values
-      <replaceable>L</replaceable> and <replaceable>M</replaceable> in
-      the preceding table should be interpreted as number of characters,
-      and lengths for these types in column specifications indicate the
-      number of characters. For example, to store a
-      <literal>TINYTEXT</literal> value requires
-      <replaceable>L</replaceable> characters + 1 byte.
-    </para>
-
-    <para>
       To calculate the number of <emphasis>bytes</emphasis> used to
       store a particular <literal>CHAR</literal>,
       <literal>VARCHAR</literal>, or <literal>TEXT</literal> column
-      value, you will need to take into account the character set in use
-      for that column. In particular, when using Unicode, you must keep
-      in mind that not all Unicode characters use the same number of
-      bytes. For a breakdown of the storage used for different
-      categories of Unicode characters, see
-      <xref linkend="charset-unicode"/>. You can also obtain this
-      information from the <literal>Maxlen</literal> column in the
-      output of <literal>SHOW CHARSET</literal>.
+      value, you must take into account the character set used for that
+      column. In particular, when using the <literal>utf8</literal>
+      Unicode character set, you must keep in mind that not all
+      <literal>utf8</literal> characters use the same number of bytes.
+      For a breakdown of the storage used for different categories of
+      <literal>utf8</literal> characters, see
+      <xref linkend="charset-unicode"/>.
     </para>
 
     <para>
@@ -4840,8 +4819,8 @@
     </para>
 
     <para>
-      The <literal>NDBCLUSTER</literal> engine in MySQL 5.1 supports
-      true variable-width columns. This means that a
+      The <literal>NDBCLUSTER</literal> storage engine in MySQL 5.1
+      supports true variable-width columns. This means that a
       <literal>VARCHAR</literal> column in a MySQL Cluster table
       requires the same amount of storage as it would using any other
       storage engine. This represents a change in behavior from earlier
@@ -4975,7 +4954,7 @@
       To facilitate the use of code written for SQL implementations from
       other vendors, MySQL maps data types as shown in the following
       table. These mappings make it easier to import table definitions
-      from other database engines into MySQL:
+      from other database systems into MySQL:
     </para>
 
     <informaltable>
@@ -5069,8 +5048,12 @@
     </para>
 
 <programlisting>
-mysql&gt; <userinput>CREATE TABLE t (a BOOL, b FLOAT8, c LONG, d NUMERIC);</userinput>
-Query OK, 0 rows affected (0.08 sec)
+<!--
+mysql> DROP TABLE IF EXISTS t;
+Query OK, 0 rows affected (0.00 sec)
+-->
+mysql&gt; <userinput>CREATE TABLE t (a BOOL, b FLOAT8, c LONG VARCHAR, d NUMERIC);</userinput>
+Query OK, 0 rows affected (0.00 sec)
 
 mysql&gt; <userinput>DESCRIBE t;</userinput>
 +-------+---------------+------+-----+---------+-------+
@@ -5081,7 +5064,7 @@
 | c     | mediumtext    | YES  |     | NULL    |       |
 | d     | decimal(10,0) | YES  |     | NULL    |       |
 +-------+---------------+------+-----+---------+-------+
-4 rows in set (0.00 sec)
+4 rows in set (0.01 sec)
 </programlisting>
 
   </section>

Thread
svn commit - mysqldoc@docsrva: r910 - in trunk: . refman-4.1 refman-5.0 refman-5.1paul19 Jan