List:Commits« Previous MessageNext Message »
From:paul Date:January 5 2006 8:45pm
Subject:svn commit - mysqldoc@docsrva: r693 - in trunk: . refman-4.1 refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2006-01-05 21:45:35 +0100 (Thu, 05 Jan 2006)
New Revision: 693

Log:
 r5878@frost:  paul | 2006-01-05 14:32:57 -0600
 General revisions.


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


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

Modified: trunk/refman-4.1/introduction.xml
===================================================================
--- trunk/refman-4.1/introduction.xml	2006-01-05 20:45:02 UTC (rev 692)
+++ trunk/refman-4.1/introduction.xml	2006-01-05 20:45:35 UTC (rev 693)
@@ -2659,17 +2659,19 @@
           <secondary>comments</secondary>
         </indexterm>
 
+<para>
+Standard SQL uses the C syntax
+          <literal>/* this is a comment */</literal> for comments, and MySQL Server supports this syntax as well.
+MySQL also support extensions to this syntax that allow MySQL-specific SQL to be embedded in the comment, as described in
+          <xref linkend="comments"/>.
+</para>
+
         <para>
-          Some other SQL database systems use
-          &lsquo;<option>--</option>&rsquo; to start comments. MySQL
+          Standard SQL uses
+          &lsquo;<option>--</option>&rsquo; as a start-comment sequence. MySQL
           Server uses &lsquo;<literal>#</literal>&rsquo; as the start
-          comment character. You can also use the C comment style
-          <literal>/* this is a comment */</literal> with MySQL Server.
-          See <xref linkend="comments"/>.
-        </para>
-
-        <para>
-          MySQL Server 3.23.3 and up supports a variant of the
+          comment character.
+          MySQL Server 3.23.3 and up also supports a variant of the
           &lsquo;<literal>--</literal>&rsquo; comment style. That is,
 the
           &lsquo;<literal>--</literal>&rsquo; start-comment sequence must be
@@ -3020,39 +3022,48 @@
         <para>
           <literal>ENUM</literal> and <literal>SET</literal> columns
           provide an efficient way to define columns that can contain
-          only a given set of values. However, in MySQL 4.1 and earlier,
-          <literal>ENUM</literal> and <literal>SET</literal> are not
-          true constraints. This is for the same reasons that
-          <literal>NOT NULL</literal> is not honored. See
-          <xref linkend="constraint-invalid-data"/>.
+          only a given set of values.
+See <xref linkend="enum"/>, and <xref linkend="set"/>.
+However, in MySQL 4.1 and earlier,
+          <literal>ENUM</literal> and <literal>SET</literal> columns do not
+          provide true constraints on entry of invalid data:
         </para>
 
+<itemizedlist>
+<listitem>
         <para>
           <literal>ENUM</literal> columns always have a default value.
-          If you don't specify a default value, then it is
+          If you specify no default value, then it is
           <literal>NULL</literal> for columns that can have
-          <literal>NULL</literal>, otherwise the first enumeration value
-          is used as the default value.
+          <literal>NULL</literal>, otherwise it is the first enumeration value
+          in the column definition.
         </para>
-
+</listitem>
+<listitem>
         <para>
           If you insert an incorrect value into an
           <literal>ENUM</literal> column or if you force a value into an
           <literal>ENUM</literal> column with <literal>IGNORE</literal>,
           it is set to the reserved enumeration value of
           <literal>0</literal>, which is displayed as an empty string in
-          string context. See <xref linkend="enum"/>.
+          string context.
         </para>
-
+</listitem>
+<listitem>
         <para>
           If you insert an incorrect value into a <literal>SET</literal>
           column, the incorrect value is ignored. For example, if the
           column can contain the values <literal>'a'</literal>,
           <literal>'b'</literal>, and <literal>'c'</literal>, an attempt
           to assign <literal>'a,x,b,y'</literal> results in a value of
-          <literal>'a,b'</literal>. See <xref linkend="set"/>.
+          <literal>'a,b'</literal>.
         </para>
+</listitem>
+</itemizedlist>
 
+
+
+
       </section>
 
     </section>

Modified: trunk/refman-5.0/introduction.xml
===================================================================
--- trunk/refman-5.0/introduction.xml	2006-01-05 20:45:02 UTC (rev 692)
+++ trunk/refman-5.0/introduction.xml	2006-01-05 20:45:35 UTC (rev 693)
@@ -2294,17 +2294,19 @@
           <secondary>comments</secondary>
         </indexterm>
 
+<para>
+Standard SQL uses the C syntax
+          <literal>/* this is a comment */</literal> for comments, and MySQL Server supports this syntax as well.
+MySQL also support extensions to this syntax that allow MySQL-specific SQL to be embedded in the comment, as described in
+          <xref linkend="comments"/>.
+</para>
+
         <para>
-          Some other SQL database systems use
-          &lsquo;<option>--</option>&rsquo; to start comments. MySQL
+          Standard SQL uses
+          &lsquo;<option>--</option>&rsquo; as a start-comment sequence. MySQL
           Server uses &lsquo;<literal>#</literal>&rsquo; as the start
-          comment character. You can also use the C comment style
-          <literal>/* this is a comment */</literal> with MySQL Server.
-          See <xref linkend="comments"/>.
-        </para>
-
-        <para>
-          MySQL Server 3.23.3 and up supports a variant of the
+          comment character.
+          MySQL Server 3.23.3 and up also supports a variant of the
           &lsquo;<literal>--</literal>&rsquo; comment style. That is,
 the
           &lsquo;<literal>--</literal>&rsquo; start-comment sequence must be
@@ -2760,43 +2762,48 @@
         <para>
           <literal>ENUM</literal> and <literal>SET</literal> columns
           provide an efficient way to define columns that can contain
-          only a given set of values. However, before MySQL 5.0.2,
-          <literal>ENUM</literal> and <literal>SET</literal> are not
-          real constraints. This is for the same reasons that
-          <literal>NOT NULL</literal> is not honored. See
-          <xref linkend="constraint-invalid-data"/>.
+          only a given set of values.
+See <xref linkend="enum"/>, and <xref linkend="set"/>.
+However, before MySQL 5.0.2,
+          <literal>ENUM</literal> and <literal>SET</literal> columns do not
+          provide true constraints on entry of invalid data:
         </para>
-
+<itemizedlist>
+<listitem>
         <para>
           <literal>ENUM</literal> columns always have a default value.
-          If you don't specify a default value, then it is
+          If you specify no default value, then it is
           <literal>NULL</literal> for columns that can have
-          <literal>NULL</literal>, otherwise the first enumeration value
-          is used as the default value.
+          <literal>NULL</literal>, otherwise it is the first enumeration value
+          in the column definition.
         </para>
-
+</listitem>
+<listitem>
         <para>
           If you insert an incorrect value into an
           <literal>ENUM</literal> column or if you force a value into an
           <literal>ENUM</literal> column with <literal>IGNORE</literal>,
           it is set to the reserved enumeration value of
           <literal>0</literal>, which is displayed as an empty string in
-          string context. See <xref linkend="enum"/>.
+          string context.
         </para>
-
+</listitem>
+<listitem>
         <para>
           If you insert an incorrect value into a <literal>SET</literal>
           column, the incorrect value is ignored. For example, if the
           column can contain the values <literal>'a'</literal>,
           <literal>'b'</literal>, and <literal>'c'</literal>, an attempt
           to assign <literal>'a,x,b,y'</literal> results in a value of
-          <literal>'a,b'</literal>. See <xref linkend="set"/>.
+          <literal>'a,b'</literal>.
         </para>
+</listitem>
+</itemizedlist>
 
         <para>
           As of MySQL 5.0.2, you can configure the server to use strict
-          SQL mode. See <xref linkend="server-sql-mode"/>. When strict
-          mode is enabled, the definition of a <literal>ENUM</literal>
+          SQL mode. See <xref linkend="server-sql-mode"/>. With strict
+          mode enabled, the definition of a <literal>ENUM</literal>
           or <literal>SET</literal> column does act as a constraint on
           values entered into the column. An error occurs for values
           that do not satisfy these conditions:
@@ -2811,7 +2818,7 @@
               equivalent thereof. The value cannot be the error value
               (that is, 0 or the empty string). For a column defined as
               <literal>ENUM('a','b','c')</literal>, values such as
-              <literal>''</literal>, <literal>'d'</literal>, and
+              <literal>''</literal>, <literal>'d'</literal>, or
               <literal>'ax'</literal> are illegal and are rejected.
             </para>
           </listitem>
@@ -2819,10 +2826,10 @@
           <listitem>
             <para>
               A <literal>SET</literal> value must be the empty string or
-              a value consisting of one or more of the values listed in
+              a value consisting only of the values listed in
               the column definition separated by commas. For a column
               defined as <literal>SET('a','b','c')</literal>, values
-              such as <literal>'d'</literal>, and
+              such as <literal>'d'</literal> or
               <literal>'a,b,c,d'</literal> are illegal and are rejected.
             </para>
           </listitem>
@@ -2838,7 +2845,7 @@
           <literal>SET</literal>, the value is inserted as given except
           that any invalid substrings are deleted. For example,
           <literal>'a,x,b,y'</literal> results in a value of
-          <literal>'a,b'</literal>, as described earlier.
+          <literal>'a,b'</literal>.
         </para>
 
       </section>

Modified: trunk/refman-5.1/introduction.xml
===================================================================
--- trunk/refman-5.1/introduction.xml	2006-01-05 20:45:02 UTC (rev 692)
+++ trunk/refman-5.1/introduction.xml	2006-01-05 20:45:35 UTC (rev 693)
@@ -2053,17 +2053,19 @@
           <secondary>comments</secondary>
         </indexterm>
 
+<para>
+Standard SQL uses the C syntax
+          <literal>/* this is a comment */</literal> for comments, and MySQL Server supports this syntax as well.
+MySQL also support extensions to this syntax that allow MySQL-specific SQL to be embedded in the comment, as described in
+          <xref linkend="comments"/>.
+</para>
+
         <para>
-          Some other SQL database systems use
-          &lsquo;<option>--</option>&rsquo; to start comments. MySQL
+          Standard SQL uses
+          &lsquo;<option>--</option>&rsquo; as a start-comment sequence. MySQL
           Server uses &lsquo;<literal>#</literal>&rsquo; as the start
-          comment character. You can also use the C comment style
-          <literal>/* this is a comment */</literal> with MySQL Server.
-          See <xref linkend="comments"/>.
-        </para>
-
-        <para>
-          MySQL Server 3.23.3 and up supports a variant of the
+          comment character.
+          MySQL Server 3.23.3 and up also supports a variant of the
           &lsquo;<literal>--</literal>&rsquo; comment style. That is,
 the
           &lsquo;<literal>--</literal>&rsquo; start-comment sequence must be
@@ -2519,43 +2521,48 @@
         <para>
           <literal>ENUM</literal> and <literal>SET</literal> columns
           provide an efficient way to define columns that can contain
-          only a given set of values. However, before MySQL 5.0.2,
-          <literal>ENUM</literal> and <literal>SET</literal> are not
-          real constraints. This is for the same reasons that
-          <literal>NOT NULL</literal> is not honored. See
-          <xref linkend="constraint-invalid-data"/>.
+          only a given set of values.
+See <xref linkend="enum"/>, and <xref linkend="set"/>.
+However, before MySQL 5.0.2,
+          <literal>ENUM</literal> and <literal>SET</literal> columns do not
+          provide true constraints on entry of invalid data:
         </para>
-
+<itemizedlist>
+<listitem>
         <para>
           <literal>ENUM</literal> columns always have a default value.
-          If you don't specify a default value, then it is
+          If you specify no default value, then it is
           <literal>NULL</literal> for columns that can have
-          <literal>NULL</literal>, otherwise the first enumeration value
-          is used as the default value.
+          <literal>NULL</literal>, otherwise it is the first enumeration value
+          in the column definition.
         </para>
-
+</listitem>
+<listitem>
         <para>
           If you insert an incorrect value into an
           <literal>ENUM</literal> column or if you force a value into an
           <literal>ENUM</literal> column with <literal>IGNORE</literal>,
           it is set to the reserved enumeration value of
           <literal>0</literal>, which is displayed as an empty string in
-          string context. See <xref linkend="enum"/>.
+          string context.
         </para>
-
+</listitem>
+<listitem>
         <para>
           If you insert an incorrect value into a <literal>SET</literal>
           column, the incorrect value is ignored. For example, if the
           column can contain the values <literal>'a'</literal>,
           <literal>'b'</literal>, and <literal>'c'</literal>, an attempt
           to assign <literal>'a,x,b,y'</literal> results in a value of
-          <literal>'a,b'</literal>. See <xref linkend="set"/>.
+          <literal>'a,b'</literal>.
         </para>
+</listitem>
+</itemizedlist>
 
         <para>
           As of MySQL 5.0.2, you can configure the server to use strict
-          SQL mode. See <xref linkend="server-sql-mode"/>. When strict
-          mode is enabled, the definition of a <literal>ENUM</literal>
+          SQL mode. See <xref linkend="server-sql-mode"/>. With strict
+          mode enabled, the definition of a <literal>ENUM</literal>
           or <literal>SET</literal> column does act as a constraint on
           values entered into the column. An error occurs for values
           that do not satisfy these conditions:
@@ -2570,7 +2577,7 @@
               equivalent thereof. The value cannot be the error value
               (that is, 0 or the empty string). For a column defined as
               <literal>ENUM('a','b','c')</literal>, values such as
-              <literal>''</literal>, <literal>'d'</literal>, and
+              <literal>''</literal>, <literal>'d'</literal>, or
               <literal>'ax'</literal> are illegal and are rejected.
             </para>
           </listitem>
@@ -2578,10 +2585,10 @@
           <listitem>
             <para>
               A <literal>SET</literal> value must be the empty string or
-              a value consisting of one or more of the values listed in
+              a value consisting only of the values listed in
               the column definition separated by commas. For a column
               defined as <literal>SET('a','b','c')</literal>, values
-              such as <literal>'d'</literal>, and
+              such as <literal>'d'</literal> or
               <literal>'a,b,c,d'</literal> are illegal and are rejected.
             </para>
           </listitem>
@@ -2597,7 +2604,7 @@
           <literal>SET</literal>, the value is inserted as given except
           that any invalid substrings are deleted. For example,
           <literal>'a,x,b,y'</literal> results in a value of
-          <literal>'a,b'</literal>, as described earlier.
+          <literal>'a,b'</literal>.
         </para>
 
       </section>

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