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

[paul]

Author: paul
Date: 2006-01-18 16:47:31 +0100 (Wed, 18 Jan 2006)
New Revision: 897

Log:
 r6354@frost:  paul | 2006-01-18 09:47:01 -0600
 Off-by-one error. VARCHAR(256) requires two-byte prefix, not one-byte.


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:6353
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2265
   + b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6354
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2265

Modified: trunk/refman-5.0/data-types.xml
===================================================================
--- trunk/refman-5.0/data-types.xml	2006-01-18 15:47:15 UTC (rev 896)
+++ trunk/refman-5.0/data-types.xml	2006-01-18 15:47:31 UTC (rev 897)
@@ -4904,11 +4904,11 @@
               where <literal><replaceable>L</replaceable> &lt;=
               <replaceable>M</replaceable></literal> and 0
               <literal>&lt;= <replaceable>M</replaceable>
-              &lt;=</literal> 256 <emphasis>or</emphasis>
+              &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>
+              <literal>&lt;= <replaceable>M</replaceable> &lt;=</literal>
               65535 (see note below).</entry>
           </row>
           <row>

Modified: trunk/refman-5.1/data-types.xml
===================================================================
--- trunk/refman-5.1/data-types.xml	2006-01-18 15:47:15 UTC (rev 896)
+++ trunk/refman-5.1/data-types.xml	2006-01-18 15:47:31 UTC (rev 897)
@@ -4728,11 +4728,11 @@
               <literal><replaceable>L</replaceable> &lt;=
               <replaceable>M</replaceable></literal> and 0
               <literal>&lt;= <replaceable>M</replaceable>
-              &lt;=</literal> 256 (see note below)
+              &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>
+              <literal>&lt;= <replaceable>M</replaceable> &lt;=</literal>
               65535 (see note below).</entry>
           </row>
           <row>
@@ -4837,7 +4837,7 @@
       <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 256 characters.
+      than 255 characters.
     </para>
 
     <remark role="todo">