svn commit - mysqldoc@docsrva: r1132 - in trunk: . refman-5.0 refman-5.1

[paul]

Author: paul
Date: 2006-01-30 18:34:47 +0100 (Mon, 30 Jan 2006)
New Revision: 1132

Log:
 r2694@kite-hub:  paul | 2006-01-30 11:33:08 -0600
 Update VARBINARY storage requirements (length can exceed 255 as of 5.0.3).


Modified:
   trunk/
   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:6940
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2588
   + b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6940
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2694

Modified: trunk/refman-5.0/data-types.xml
===================================================================
--- trunk/refman-5.0/data-types.xml	2006-01-30 17:17:50 UTC (rev 1131)
+++ trunk/refman-5.0/data-types.xml	2006-01-30 17:34:47 UTC (rev 1132)
@@ -5111,11 +5111,21 @@
           </row>
           <row>
             <entry><literal>VARBINARY(<replaceable>M</replaceable>)</literal></entry>
-            <entry><replaceable>L</replaceable>+1 bytes, where
-              <literal><replaceable>L</replaceable> &lt;=
+            <entry><emphasis>Prior to MySQL 5.0.3</emphasis>: <replaceable>L</replaceable>
+              + 1 bytes, where <literal><replaceable>L</replaceable>
+              &lt;= <replaceable>M</replaceable></literal> and 0
+              <literal>&lt;= <replaceable>M</replaceable>
+              &lt;=</literal> 255. <emphasis>MySQL 5.0.3 and
+              later</emphasis>: <replaceable>L</replaceable> + 1 bytes,
+              where <literal><replaceable>L</replaceable> &lt;=
               <replaceable>M</replaceable></literal> and 0
               <literal>&lt;= <replaceable>M</replaceable>
-              &lt;=</literal> 255</entry>
+              &lt;=</literal> 255 <emphasis>or</emphasis>
+              <replaceable>L</replaceable> + 2 bytes, where
+              <literal><replaceable>L</replaceable> &lt;=
+              <replaceable>M</replaceable></literal> and 256
+              <literal>&lt;= <replaceable>M</replaceable>
+              &lt;=</literal> 65535 (see note below).</entry>
           </row>
           <row>
             <entry><literal>TINYBLOB</literal>, <literal>TINYTEXT</literal></entry>
@@ -5178,9 +5188,10 @@
     </indexterm>
 
     <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 these factors:
+      <literal>VARCHAR</literal>, <literal>VARBINARY</literal>, and the
+      <literal>BLOB</literal> and <literal>TEXT</literal> types are
+      variable-length types. For each, the storage requirements depend
+      on these factors:
     </para>
 
     <itemizedlist>
@@ -5236,7 +5247,8 @@
     <para>
       <emphasis role="bold">Note</emphasis>: In MySQL 5.0.3 and later,
       the <emphasis>effective</emphasis> maximum length for a
-      <literal>VARCHAR</literal> column is 65,532 characters.
+      <literal>VARCHAR</literal> or <literal>VARBINARY</literal> column
+      is 65,532.
     </para>
 
     <para>

Modified: trunk/refman-5.1/data-types.xml
===================================================================
--- trunk/refman-5.1/data-types.xml	2006-01-30 17:17:50 UTC (rev 1131)
+++ trunk/refman-5.1/data-types.xml	2006-01-30 17:34:47 UTC (rev 1132)
@@ -4844,6 +4844,16 @@
               <replaceable>M</replaceable></literal> and 0
               <literal>&lt;= <replaceable>M</replaceable>
               &lt;=</literal> 255</entry>
+            <entry><replaceable>L</replaceable> + 1 bytes, where
+              <literal><replaceable>L</replaceable> &lt;=
+              <replaceable>M</replaceable></literal> and 0
+              <literal>&lt;= <replaceable>M</replaceable>
+              &lt;=</literal> 255 (see note below)
+              <emphasis>or</emphasis> <replaceable>L</replaceable> + 2
+              bytes, where <literal><replaceable>L</replaceable> &lt;=
+              <replaceable>M</replaceable></literal> and 256
+              <literal>&lt;= <replaceable>M</replaceable>
+              &lt;=</literal> 65535 (see note below).</entry>
           </row>
           <row>
             <entry><literal>TINYBLOB</literal>, <literal>TINYTEXT</literal></entry>
@@ -4906,9 +4916,10 @@
     </indexterm>
 
     <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 these factors:
+      <literal>VARCHAR</literal>, <literal>VARBINARY</literal>, and the
+      <literal>BLOB</literal> and <literal>TEXT</literal> types are
+      variable-length types. For each, the storage requirements depend
+      on these factors:
     </para>
 
     <itemizedlist>
@@ -4964,7 +4975,8 @@
     <para>
       <emphasis role="bold">Note</emphasis>: The
       <emphasis>effective</emphasis> maximum length for a
-      <literal>VARCHAR</literal> column is 65,532 characters.
+      <literal>VARCHAR</literal> or <literal>VARBINARY</literal> column
+      is 65,532.
     </para>
 
     <para>