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

[paul]

Author: paul
Date: 2006-10-12 16:06:54 +0200 (Thu, 12 Oct 2006)
New Revision: 3620

Log:
 r10878@frost:  paul | 2006-10-12 08:58:45 -0500
 Clarify: Length of VARCHAR is specified in characters, but is subject
 to max row size, which is measured in bytes.


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

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


Modified: trunk/refman-4.1/introduction.xml
===================================================================
--- trunk/refman-4.1/introduction.xml	2006-10-12 14:06:40 UTC (rev 3619)
+++ trunk/refman-4.1/introduction.xml	2006-10-12 14:06:54 UTC (rev 3620)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 1; 949 bytes

@@ -1068,8 +1068,12 @@
           <para>
             <emphasis role="bold"><literal>VARCHAR</literal> Data
             Type</emphasis>: The maximum effective length of a
-            <literal>VARCHAR</literal> column was increased to 65,532
+            <literal>VARCHAR</literal> column was increased to 65,535
             bytes, and stripping of trailing whitespace was eliminated.
+            (The actual maximum length of a <literal>VARCHAR</literal>
+            is determined by the maximum row size and the character set
+            you use. The maximum <emphasis>effective</emphasis> column
+            length is subject to a row size of 65,532 bytes.)
           </para>
         </listitem>
 


Modified: trunk/refman-5.0/data-types.xml
===================================================================
--- trunk/refman-5.0/data-types.xml	2006-10-12 14:06:40 UTC (rev 3619)
+++ trunk/refman-5.0/data-types.xml	2006-10-12 14:06:54 UTC (rev 3620)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 4; 1216 bytes

@@ -1560,8 +1560,8 @@
             5.0.3 and later. (The actual maximum length of a
             <literal>VARCHAR</literal> in MySQL 5.0 is determined by the
             maximum row size and the character set you use. The maximum
-            <emphasis>effective</emphasis> length starting with MySQL
-            5.0.3 is 65,532 bytes.)
+            <emphasis>effective</emphasis> column length starting with
+            MySQL 5.0.3 is subject to a row size of 65,532 bytes.)
           </para>
 
           <para>

@@ -3849,8 +3849,8 @@
         before MySQL 5.0.3, and 0 to 65,535 in 5.0.3 and later versions.
         (The maximum effective length of a <literal>VARCHAR</literal> in
         MySQL 5.0.3 and later is determined by the maximum row size and
-        the character set used. The maximum length overall is 65,532
-        bytes.)
+        the character set used. The maximum column length is subject to
+        a row size of 65,532 bytes.)
       </para>
 
       <para>


Modified: trunk/refman-5.1/data-types.xml
===================================================================
--- trunk/refman-5.1/data-types.xml	2006-10-12 14:06:40 UTC (rev 3619)
+++ trunk/refman-5.1/data-types.xml	2006-10-12 14:06:54 UTC (rev 3620)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 4; 1167 bytes

@@ -1482,8 +1482,8 @@
             <replaceable>M</replaceable> is 0 to 65,535. (The actual
             maximum length of a <literal>VARCHAR</literal> is determined
             by the maximum row size and the character set you use. The
-            maximum <emphasis>effective</emphasis> length is 65,532
-            bytes.)
+            maximum <emphasis>effective</emphasis> column length is
+            subject to a row size of 65,532 bytes.)
           </para>
 
           <para>

@@ -3713,8 +3713,8 @@
         strings. The length can be specified as a value from 0 to
         65,535. (The maximum effective length of a
         <literal>VARCHAR</literal> is determined by the maximum row size
-        and the character set used. The maximum length overall is 65,532
-        bytes.)
+        and the character set used. The maximum column length is subject
+        to a row size of 65,532 bytes.)
       </para>
 
       <para>