List:Commits« Previous MessageNext Message »
From:paul Date:January 17 2006 1:06am
Subject:svn commit - mysqldoc@docsrva: r861 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-common
View as plain text  
Author: paul
Date: 2006-01-17 02:06:29 +0100 (Tue, 17 Jan 2006)
New Revision: 861

Log:
 r6268@frost:  paul | 2006-01-16 19:04:31 -0600
 General revisions.


Modified:
   trunk/
   trunk/refman-4.1/client-utility-programs.xml
   trunk/refman-4.1/data-types.xml
   trunk/refman-4.1/language-structure.xml
   trunk/refman-5.0/client-utility-programs.xml
   trunk/refman-5.0/data-types.xml
   trunk/refman-5.0/language-structure.xml
   trunk/refman-5.1/client-utility-programs.xml
   trunk/refman-5.1/data-types.xml
   trunk/refman-5.1/language-structure.xml
   trunk/refman-common/titles.en.ent


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

Modified: trunk/refman-4.1/client-utility-programs.xml
===================================================================
--- trunk/refman-4.1/client-utility-programs.xml	2006-01-16 22:44:30 UTC (rev 860)
+++ trunk/refman-4.1/client-utility-programs.xml	2006-01-17 01:06:29 UTC (rev 861)
@@ -6274,8 +6274,7 @@
             <para>
               Quote database, table, and column names within
               &lsquo;<literal>`</literal>&rsquo; characters. If the
-              server SQL mode includes the
-              <literal>ANSI_QUOTES</literal> option, names are quoted
+              <literal>ANSI_QUOTES</literal> SQL mode is enabled, names are quoted
               within &lsquo;<literal>"</literal>&rsquo; characters. As
               of MySQL 4.1.1, <option>--quote-names</option> is on by
               default. It can be disabled with

Modified: trunk/refman-4.1/data-types.xml
===================================================================
--- trunk/refman-4.1/data-types.xml	2006-01-16 22:44:30 UTC (rev 860)
+++ trunk/refman-4.1/data-types.xml	2006-01-17 01:06:29 UTC (rev 861)
@@ -682,9 +682,8 @@
 
           <para>
             These are synonyms for <literal>DOUBLE</literal>. Exception:
-            If the server SQL mode includes the
-            <literal>REAL_AS_FLOAT</literal> option,
-            <literal>REAL</literal> is a synonym for
+            If the <literal>REAL_AS_FLOAT</literal> SQL mode is
+            enabled,, <literal>REAL</literal> is a synonym for
             <literal>FLOAT</literal> rather than
             <literal>DOUBLE</literal>.
           </para>
@@ -2034,8 +2033,7 @@
       <literal>DOUBLE PRECISION</literal> (a non-standard extension).
       MySQL also treats <literal>REAL</literal> as a synonym for
       <literal>DOUBLE PRECISION</literal> (a non-standard variation),
-      unless the server SQL mode includes the
-      <literal>REAL_AS_FLOAT</literal> option.
+      unless the <literal>REAL_AS_FLOAT</literal> SQL mode is enabled.
     </para>
 
     <para>

Modified: trunk/refman-4.1/language-structure.xml
===================================================================
--- trunk/refman-4.1/language-structure.xml	2006-01-16 22:44:30 UTC (rev 860)
+++ trunk/refman-4.1/language-structure.xml	2006-01-17 01:06:29 UTC (rev 861)
@@ -30,13 +30,13 @@
 
     <listitem>
       <para>
-        Identifiers such as table and column names
+        Identifiers such as database, table, and column names
       </para>
     </listitem>
 
     <listitem>
       <para>
-        User and system variables
+        User-defined and system variables
       </para>
     </listitem>
 
@@ -94,7 +94,7 @@
       <title>&title-string-syntax;</title>
 
       <para>
-        A string is a sequence of characters, surrounded by either
+        A string is a sequence of characters, enclosed within either
         single quote (&lsquo;<literal>'</literal>&rsquo;) or double
         quote (&lsquo;<literal>"</literal>&rsquo;) characters. Examples:
       </para>
@@ -105,9 +105,9 @@
 </programlisting>
 
       <para>
-        If the server SQL mode has <literal>ANSI_QUOTES</literal>
-        enabled, string literals can be quoted only with single quotes.
-        A string quoted with double quotes is interpreted as an
+        If the <literal>ANSI_QUOTES</literal> SQL mode is enabled,
+        string literals can be quoted only within single quotes. A
+        string quoted within double quotes is interpreted as an
         identifier.
       </para>
 
@@ -267,12 +267,7 @@
                 <indexterm type="function">
                   <primary>(Control-Z) \Z</primary>
                 </indexterm></entry>
-              <entry>ASCII 26 (Control-Z). This character can be encoded as
-                &lsquo;<literal>\Z</literal>&rsquo; to allow you to work
-                around the problem that ASCII 26 stands for END-OF-FILE
-                on Windows. (ASCII 26 causes problems if you try to use
-                <literal>mysql <replaceable>db_name</replaceable> &lt;
-                <replaceable>file_name</replaceable></literal>.)</entry>
+              <entry>ASCII 26 (Control-Z). See note following the table.</entry>
             </row>
             <row>
               <entry><literal>\\</literal>
@@ -296,7 +291,7 @@
                 <indexterm type="function">
                   <primary>Wildcard character (%)</primary>
                 </indexterm></entry>
-              <entry>A &lsquo;<literal>%</literal>&rsquo; character. See note following
+              <entry>A &lsquo;<literal>%</literal>&rsquo; character. See note following the
                 table.</entry>
             </row>
             <row>
@@ -309,7 +304,7 @@
                 <indexterm type="function">
                   <primary>Wildcard character (_)</primary>
                 </indexterm></entry>
-              <entry>A &lsquo;<literal>_</literal>&rsquo; character. See note following
+              <entry>A &lsquo;<literal>_</literal>&rsquo; character. See note following the
                 table.</entry>
             </row>
           </tbody>
@@ -324,23 +319,36 @@
       </para>
 
       <para>
+        The ASCII 26 character can be encoded as
+        &lsquo;<literal>\Z</literal>&rsquo; to enable you to work around
+        the problem that ASCII 26 stands for END-OF-FILE on Windows.
+        ASCII 26 within a file causes problems if you try to use
+        <literal>mysql <replaceable>db_name</replaceable> &lt;
+        <replaceable>file_name</replaceable></literal>.
+      </para>
+
+      <para>
         The &lsquo;<literal>\%</literal>&rsquo; and
         &lsquo;<literal>\_</literal>&rsquo; sequences are used to search
         for literal instances of &lsquo;<literal>%</literal>&rsquo; and
         &lsquo;<literal>_</literal>&rsquo; in pattern-matching contexts
         where they would otherwise be interpreted as wildcard
-        characters. See <xref linkend="string-comparison-functions"/>.
-        Note that if you use &lsquo;<literal>\%</literal>&rsquo; or
-        &lsquo;<literal>\_</literal>&rsquo; in other contexts, they
-        return the strings &lsquo;<literal>\%</literal>&rsquo; and
-        &lsquo;<literal>\_</literal>&rsquo; and not
+        characters. See the description of the <literal>LIKE</literal>
+        operator in <xref linkend="string-comparison-functions"/>. If
+        you use &lsquo;<literal>\%</literal>&rsquo; or
+        &lsquo;<literal>\_</literal>&rsquo; in non-pattern-matching
+        contexts, they evaluate to the strings
+        &lsquo;<literal>\%</literal>&rsquo; and
+        &lsquo;<literal>\_</literal>&rsquo;, not to
         &lsquo;<literal>%</literal>&rsquo; and
         &lsquo;<literal>_</literal>&rsquo;.
       </para>
 
       <para>
-        In all other escape sequences, backslash is ignored. That is,
+        For all other escape sequences, backslash is ignored. That is,
         the escaped character is interpreted as if it was not escaped.
+        For example, &lsquo;<literal>\x</literal>&rsquo; is just
+        &lsquo;<literal>x</literal>&rsquo;.
       </para>
 
       <indexterm>
@@ -349,7 +357,8 @@
       </indexterm>
 
       <para>
-        There are several ways to include quotes within a string:
+        There are several ways to include quote characters within a
+        string:
       </para>
 
       <itemizedlist>
@@ -372,7 +381,7 @@
 
         <listitem>
           <para>
-            You can precede the quote character with an escape character
+            Precede the quote character by an escape character
             (&lsquo;<literal>\</literal>&rsquo;).
           </para>
         </listitem>
@@ -426,8 +435,8 @@
 
       <para>
         If you want to insert binary data into a string column (such as
-        a <literal>BLOB</literal>), the following characters must be
-        represented by escape sequences:
+        a <literal>BLOB</literal> column), the following characters must
+        be represented by escape sequences:
       </para>
 
       <informaltable>
@@ -490,24 +499,25 @@
         <listitem>
           <para>
             Process the string with a function that escapes the special
-            characters. For example, in a C program, you can use the
+            characters. In a C program, you can use the
             <literal>mysql_real_escape_string()</literal> C API function
             to escape characters. See
             <xref linkend="mysql-real-escape-string"/>. The Perl DBI
             interface provides a <literal>quote</literal> method to
             convert special characters to the proper escape sequences.
-            See <xref linkend="perl"/>.
+            See <xref linkend="perl"/>. Other language interfaces may
+            provide a similar capability.
           </para>
         </listitem>
 
         <listitem>
           <para>
             As an alternative to explicitly escaping special characters,
-            many MySQL APIs provide a placeholder capability that allows
-            you to insert special markers into a query string, and then
-            bind data values to them when you issue the query. In this
-            case, the API takes care of escaping special characters in
-            the values for you.
+            many MySQL APIs provide a placeholder capability that
+            enables you to insert special markers into a statement
+            string, and then bind data values to them when you issue the
+            statement. In this case, the API takes care of escaping
+            special characters in the values for you.
           </para>
         </listitem>
 
@@ -552,7 +562,9 @@
         Integers are represented as a sequence of digits. Floats use
         &lsquo;<literal>.</literal>&rsquo; as a decimal separator.
         Either type of number may be preceded by
-        &lsquo;<literal>-</literal>&rsquo; to indicate a negative value.
+        &lsquo;<literal>-</literal>&rsquo; or
+        &lsquo;<literal>+</literal>&rsquo; to indicate a negative or
+        positive value, respectively
       </para>
 
       <para>
@@ -620,11 +632,11 @@
 </programlisting>
 
       <para>
-        The <literal>0x</literal> syntax is based on ODBC. Hexadecimal
+        The <literal>x'<replaceable>hexstring</replaceable>'</literal>
+        syntax is new in 4.0 and is based on standard SQL. The
+        <literal>0x</literal> syntax is based on ODBC. Hexadecimal
         strings are often used by ODBC to supply values for
-        <literal>BLOB</literal> columns. The
-        <literal>x'hexstring'</literal> syntax is new in 4.0 and is
-        based on standard SQL.
+        <literal>BLOB</literal> columns.
       </para>
 
       <para>
@@ -646,6 +658,14 @@
 
       <title>&title-boolean-values;</title>
 
+      <indexterm>
+        <primary><literal>TRUE</literal></primary>
+      </indexterm>
+
+      <indexterm>
+        <primary><literal>FALSE</literal></primary>
+      </indexterm>
+
       <remark role="help-topic" condition="TRUE FALSE"/>
 
       <remark role="help-keywords">
@@ -655,10 +675,10 @@
       <remark role="help-description-begin"/>
 
       <para>
-        Beginning with MySQL 4.1, the constant <literal>TRUE</literal>
-        evaluates to <literal>1</literal> and the constant
-        <literal>FALSE</literal> evaluates to <literal>0</literal>. The
-        constant names can be written in any lettercase.
+        Beginning with MySQL 4.1, The constants <literal>TRUE</literal>
+        and <literal>FALSE</literal> evaluate to <literal>1</literal>
+        and <literal>0</literal>, respectively. The constant names can
+        be written in any lettercase.
       </para>
 
 <programlisting>
@@ -840,11 +860,13 @@
     <para>
       An identifier may be quoted or unquoted. If an identifier is a
       reserved word or contains special characters, you
-      <emphasis>must</emphasis> quote it whenever you refer to it. For a
-      list of reserved words, see <xref linkend="reserved-words"/>.
-      Special characters are those outside the set of alphanumeric
-      characters from the current character set,
-      &lsquo;<literal>_</literal>&rsquo;, and
+      <emphasis>must</emphasis> quote it whenever you refer to it.
+      (Exception: A word that follows a period in a qualified name must
+      be an identifier, so it is not necessary to quote it, even if it
+      is a reserved word.) For a list of reserved words, see
+      <xref linkend="reserved-words"/>. Special characters are those
+      outside the set of alphanumeric characters from the current
+      character set, &lsquo;<literal>_</literal>&rsquo;, and
       &lsquo;<literal>$</literal>&rsquo;.
     </para>
 
@@ -858,9 +880,8 @@
 </programlisting>
 
     <para>
-      If the server SQL mode includes the <literal>ANSI_QUOTES</literal>
-      mode option, it is also allowable to quote identifiers with double
-      quotes:
+      If the <literal>ANSI_QUOTES</literal> SQL mode is enabled, it is
+      also allowable to quote identifiers within double quotes:
     </para>
 
 <programlisting>
@@ -872,10 +893,19 @@
 </programlisting>
 
     <para>
-      See <xref linkend="server-sql-mode"/>.
+      Note: Because <literal>ANSI_QUOTES</literal> causes the server to
+      interpret double-quoted strings as identifiers, string literals
+      must be enclosed within single quotes. They cannot be enclosed
+      within double quotes when <literal>ANSI_QUOTES</literal> is
+      enabled.
     </para>
 
     <para>
+      The server SQL mode is controlled as described in
+      <xref linkend="server-sql-mode"/>.
+    </para>
+
+    <para>
       As of MySQL 4.1, identifier quote characters can be included
       within an identifier if you quote the identifier. If the character
       to be included within the identifier is the same as that used to
@@ -930,18 +960,20 @@
     </itemizedlist>
 
     <para>
-      It is recommended that you do not use names of the pattern
-      <literal><replaceable>X</replaceable>e<replaceable>X</replaceable></literal>,
+      It is recommended that you do not use names of the form
+      <literal><replaceable>M</replaceable>e</literal> or
+      <literal><replaceable>M</replaceable>e<replaceable>N</replaceable></literal>,
       such as <literal>1e</literal> or <literal>2e2</literal>, because
-      an expression like <literal>1e+1</literal> is ambiguous. It might
-      be interpreted as the expression <literal>1e + 1</literal> or as
-      the number <literal>1e+1</literal>, depending on context.
+      an expression such as <literal>1e+3</literal> is ambiguous.
+      Depending on context, it might be interpreted as the expression
+      <literal>1e + 3</literal> or as the number
+      <literal>1e+3</literal>.
     </para>
 
     <para>
-      Be careful when using <literal>MD5</literal> to produce table
-      names, as it can produce illegal tables names such as the ones
-      listed above.
+      Be careful when using <literal>MD5()</literal> to produce table
+      names because it can produce names in illegal or ambiguous formats
+      such as those just described.
     </para>
 
     <section id="identifier-qualifiers">
@@ -974,7 +1006,7 @@
             <row>
               <entry><replaceable>col_name</replaceable></entry>
               <entry>The column <replaceable>col_name</replaceable> from whichever table used
-                in the query contains a column of that name.</entry>
+                in the statement contains a column of that name.</entry>
             </row>
             <row>
               <entry><replaceable>tbl_name.col_name</replaceable></entry>
@@ -1091,26 +1123,29 @@
 
       <para>
         In MySQL, databases correspond to directories within the data
-        directory. Tables within a database correspond to at least one
-        file within the database directory (and possibly more, depending
-        on the storage engine). Consequently, the case sensitivity of
-        the underlying operating system determines the case sensitivity
-        of database and table names. This means database and table names
-        are not case sensitive in Windows, and case sensitive in most
-        varieties of Unix. One notable exception is Mac OS X, which is
-        Unix-based but uses a default filesystem type (HFS+) that is not
-        case sensitive. However, Mac OS X also supports UFS volumes,
-        which are case sensitive just as on any Unix. See
-        <xref linkend="extensions-to-ansi"/>.
+        directory. Each table within a database corresponds to at least
+        one file within the database directory (and possibly more,
+        depending on the storage engine). Consequently, the case
+        sensitivity of the underlying operating system determines the
+        case sensitivity of database and table names. This means
+        database and table names are not case sensitive in Windows, and
+        case sensitive in most varieties of Unix. One notable exception
+        is Mac OS X, which is Unix-based but uses a default filesystem
+        type (HFS+) that is not case sensitive. However, Mac OS X also
+        supports UFS volumes, which are case sensitive just as on any
+        Unix. See <xref linkend="extensions-to-ansi"/>. The
+        <literal>lower_case_table_names</literal> system variable also
+        affects how the server handles identifier case sensitivity, as
+        described later in this section.
       </para>
 
       <para>
         <emphasis role="bold">Note</emphasis>: Although database and
         table names are not case sensitive on some platforms, you should
         not refer to a given database or table using different cases
-        within the same query. The following query would not work
-        because it refers to a table both as <literal>my_table</literal>
-        and as <literal>MY_TABLE</literal>:
+        within the same statement. The following statement would not
+        work because it refers to a table both as
+        <literal>my_table</literal> and as <literal>MY_TABLE</literal>:
       </para>
 
 <programlisting>
@@ -1135,17 +1170,22 @@
 
       <para>
         If you have trouble remembering the allowable lettercase for
-        database and table names, adopt a consistent convention, such as
-        always creating databases and tables using lowercase names.
+        database and table names, it is best to adopt a consistent
+        convention, such as always creating and referring to databases
+        and tables using lowercase names. This convention is recommended
+        for maximum portability and ease of use.
       </para>
 
       <para>
         How table and database names are stored on disk and used in
-        MySQL is defined by the
+        MySQL is affected by the
         <literal>lower_case_table_names</literal> system variable, which
         you can set when starting <command>mysqld</command>.
-        <literal>lower_case_table_names</literal> can take one of the
-        following values:
+        <literal>lower_case_table_names</literal> can take the values
+        shown in the following table. On Unix, the default value of
+        <literal>lower_case_table_names</literal> is 0. On Windows, the
+        default value is 1. On Mac OS X, the default is 1 before MySQL
+        4.0.18 and 2 as of 4.0.18.
       </para>
 
       <informaltable>
@@ -1162,8 +1202,8 @@
               <entry>Table and database names are stored on disk using the lettercase
                 specified in the <literal>CREATE TABLE</literal> or
                 <literal>CREATE DATABASE</literal> statement. Name
-                comparisons are case sensitive. This is the default on
-                Unix systems. Note that if you force this to 0 with
+                comparisons are case sensitive. Note that if you force
+                this variable to 0 with
                 <option>--lower-case-table-names=0</option> on a
                 case-insensitive filesystem and access
                 <literal>MyISAM</literal> tablenames using different
@@ -1175,8 +1215,7 @@
                 case sensitive. MySQL converts all table names to
                 lowercase on storage and lookup. This behavior also
                 applies to database names as of MySQL 4.0.2, and to
-                table aliases as of 4.1.1. This value is the default on
-                Windows and Mac OS X systems.</entry>
+                table aliases as of 4.1.1.</entry>
             </row>
             <row>
               <entry><literal>2</literal></entry>
@@ -1198,12 +1237,6 @@
       </informaltable>
 
       <para>
-        On Windows, the default value of
-        <literal>lower_case_table_names</literal> is 1. On Mac OS X, the
-        default is 1 before MySQL 4.0.18 and 2 as of 4.0.18.
-      </para>
-
-      <para>
         If you are using MySQL on only one platform, you don't normally
         have to change the <literal>lower_case_table_names</literal>
         variable. However, you may encounter difficulties if you want to
@@ -1211,8 +1244,9 @@
         sensitivity. For example, on Unix, you can have two different
         tables named <literal>my_table</literal> and
         <literal>MY_TABLE</literal>, but on Windows those names are
-        considered the same. To avoid data transfer problems stemming
-        from database or table name lettercase, you have two options:
+        considered identical. To avoid data transfer problems stemming
+        from lettercase of database or table names, you have two
+        options:
       </para>
 
       <itemizedlist>
@@ -1233,9 +1267,9 @@
             <literal>lower_case_table_names=2</literal> on Windows. This
             preserves the lettercase of database and table names. The
             disadvantage of this is that you must ensure that your
-            queries always refer to your database and table names with
-            the correct lettercase on Windows. If you transfer your
-            queries to Unix, where lettercase is significant, they do
+            statements always refer to your database and table names
+            with the correct lettercase on Windows. If you transfer your
+            statements to Unix, where lettercase is significant, they do
             not work if the lettercase is incorrect.
           </para>
 
@@ -1250,10 +1284,11 @@
       </itemizedlist>
 
       <para>
-        Note that before setting
-        <literal>lower_case_table_names</literal> to 1 on Unix, you must
-        first convert your old database and table names to lowercase
-        before restarting <command>mysqld</command>.
+        Note that if you plan to set the
+        <literal>lower_case_table_names</literal> system variable to 1
+        on Unix, you must first convert your old database and table
+        names to lowercase before restarting <command>mysqld</command>
+        with the new variable setting.
       </para>
 
     </section>
@@ -1280,11 +1315,13 @@
 
     <para>
       MySQL supports user variables as of version 3.23.6. You can store
-      a value in a user variable and refer to it later, which allows you
-      to pass values from one statement to another. User variables are
-      connection-specific. That is, a variable defined by one client
-      cannot be seen or used by other clients. All variables for a
-      client connection are automatically freed when the client exits.
+      a value in a user-defined variable and then refer to it later.
+      This enables you to pass values from one statement to another.
+      <emphasis>User-defined variables are
+      connection-specific</emphasis>. That is, a user variable defined
+      by one client cannot be seen or used by other clients. All
+      variables for a given client connection are automatically freed
+      when that client exits.
     </para>
 
     <para>
@@ -1298,8 +1335,12 @@
       <literal>latin1</literal> (cp1252 West European). This may be
       changed with the <option>--default-character-set</option> option
       to <command>mysqld</command>. See
-      <xref linkend="character-sets"/>. User variable names are case
-      sensitive prior to MySQL 5.0.
+      <xref linkend="character-sets"/>.
+      <xref linkend="character-sets"/>. A user variable name can contain
+      other characters if you quote it as a string or identifier (for
+      example, <literal>@'my-var'</literal>,
+      <literal>@"my-var"</literal>, or <literal>@`my-var`</literal>).
+      User variable names are case sensitive prior to MySQL 5.0.
     </para>
 
     <para>
@@ -1338,20 +1379,15 @@
 </programlisting>
 
     <para>
-      User variables may be used where expressions are allowed. This
-      does not currently include contexts that explicitly require a
-      literal value, such as in the <literal>LIMIT</literal> clause of a
-      <literal>SELECT</literal> statement, or the <literal>IGNORE number
-      LINES</literal> clause of a <literal>LOAD DATA</literal>
-      statement.
+      User variables may be used in contexts where expressions are
+      allowed. This does not currently include contexts that explicitly
+      require a literal value, such as in the <literal>LIMIT</literal>
+      clause of a <literal>SELECT</literal> statement, or the
+      <literal>IGNORE <replaceable>N</replaceable> LINES</literal>
+      clause of a <literal>LOAD DATA</literal> statement.
     </para>
 
     <para>
-      If you refer to a variable that has not been initialized, its
-      value is <literal>NULL</literal>.
-    </para>
-
-    <para>
       Beginning with MySQL 4.1.1, if a user variable is assigned a
       string value, it also has the same character set and collation as
       the string. The coercibility of user variables is
@@ -1379,9 +1415,8 @@
       <literal>HAVING</literal> clause refers to an alias for an
       expression in the <literal>SELECT</literal> list that uses
       <literal>@aa</literal>. This does not work as expected:
-      <literal>@aa</literal> does not contain the value of the current
-      row, but the value of <literal>id</literal> from the previous
-      selected row.
+      <literal>@aa</literal> contains the value of <literal>id</literal>
+      from the previous selected row, not from the current row.
     </para>
 
     <para>
@@ -1420,8 +1455,8 @@
     </para>
 
     <para>
-      An unassigned variable has a value of <literal>NULL</literal> with
-      a type of string.
+      If you refer to a variable that has not been initialized, it has a
+      value of <literal>NULL</literal> and a type of string.
     </para>
 
   </section>
@@ -1446,8 +1481,9 @@
     <para>
       Starting from MySQL 4.0.3, we provide better access to a lot of
       system and connection variables. Many variables can be changed
-      dynamically while the server is running. This allows you to modify
-      server operation without having to stop and restart it.
+      dynamically while the server is running, which enables you to
+      modify operation of the server without having to stop and restart
+      it.
     </para>
 
     <remark role="note">
@@ -1496,8 +1532,8 @@
     </para>
 
     <para>
-      Global or session variables may be set or retrieved using several
-      syntax forms. The following examples use
+      Global or session variables may be set or retrieved in several
+      ways. The following examples use
       <literal>sort_buffer_size</literal> as a sample variable name.
     </para>
 
@@ -1579,9 +1615,9 @@
     <para>
       The reason for requiring the <literal>GLOBAL</literal> keyword
       when setting <literal>GLOBAL</literal>-only variables but not when
-      retrieving them is to prevent problems in the future. If we remove
-      a <literal>SESSION</literal> variable with the same name as a
-      <literal>GLOBAL</literal> variable, a client with the
+      retrieving them is to prevent problems in the future. If we were
+      to remove a <literal>SESSION</literal> variable that has the same
+      name as a <literal>GLOBAL</literal> variable, a client with the
       <literal>SUPER</literal> privilege might accidentally change the
       <literal>GLOBAL</literal> variable rather than just the
       <literal>SESSION</literal> variable for its own connection. If we
@@ -1674,7 +1710,7 @@
       <para>
         To refer to a component of a structured variable instance, you
         can use a compound name in
-        <literal>instance_name.component_name</literal> format.
+        <replaceable>instance_name.component_name</replaceable> format.
         Examples:
       </para>
 
@@ -1695,8 +1731,8 @@
       </para>
 
       <para>
-        The naming rules for structured variable instances and
-        components are as follows:
+        Structured variable instances and components follow these naming
+        rules:
       </para>
 
       <itemizedlist>
@@ -1750,8 +1786,8 @@
       <para>
         At the moment, the first two rules have no possibility of being
         violated because the only structured variable type is the one
-        for key caches. These rules assume greater significance if some
-        other type of structured variable is created in the future.
+        for key caches. These rules will assume greater significance if
+        some other type of structured variable is created in the future.
       </para>
 
       <para>
@@ -1766,7 +1802,7 @@
 </programlisting>
 
       <para>
-        In an option file, do this:
+        In an option file, use this syntax:
       </para>
 
 <programlisting>
@@ -1881,11 +1917,11 @@
         <para>
           From a &lsquo;<literal>-- </literal>&rsquo; sequence to the
           end of the line. This style is supported as of MySQL 3.23.3.
-          Note that the &lsquo;<literal>-- </literal>&rsquo;
+          In MySQL, the &lt;squo;<literal>-- </literal>&rsquo;
           (double-dash) comment style requires the second dash to be
-          followed by at least one space (or by a control character such
-          as a newline). This syntax differs slightly from standard SQL
-          comment syntax, as discussed in
+          followed by at least one whitespace or control character (such
+          as a space, tab, newline, and so on). This syntax differs
+          slightly from standard SQL comment syntax, as discussed in
           <xref linkend="ansi-diff-comments"/>.
         </para>
       </listitem>
@@ -1893,9 +1929,10 @@
       <listitem>
         <para>
           From a <literal>/*</literal> sequence to the following
-          &lsquo;<literal>*/</literal>&rsquo; sequence. The closing
-          sequence need not be on the same line, so this syntax allows a
-          comment to extend over multiple lines.
+          <literal>*/</literal> sequence, as in the C programming
+          language. This syntax allows a comment to extend over multiple
+          lines because the beginning and closing sequences need not be
+          on the same line.
         </para>
       </listitem>
 
@@ -1910,11 +1947,11 @@
 mysql&gt; <userinput>SELECT 1+1;     -- This comment continues to the end of line</userinput>
 mysql&gt; <userinput>SELECT 1 /* this is an in-line comment */ + 1;</userinput>
 mysql&gt; <userinput>SELECT 1+</userinput>
-/*
-this is a
-multiple-line comment
-*/
-1;
+<userinput>/*</userinput>
+<userinput>this is a</userinput>
+<userinput>multiple-line comment</userinput>
+<userinput>*/</userinput>
+<userinput>1;</userinput>
 </programlisting>
 
     <para>
@@ -1956,11 +1993,11 @@
       The comment syntax just described applies to how the
       <command>mysqld</command> server parses SQL statements. The
       <command>mysql</command> client program also performs some parsing
-      of statements before sending them to the server. (For example, it
-      does this to determine statement boundaries within a
-      multiple-statement input line.) However, there are some
-      limitations on the way that <command>mysql</command> parses
-      <literal>/* ... */</literal> comments:
+      of statements before sending them to the server. (It does this to
+      determine statement boundaries within a multiple-statement input
+      line.) However, there are some limitations on the way that
+      <command>mysql</command> parses <literal>/* ... */</literal>
+      comments:
     </para>
 
     <itemizedlist>
@@ -1989,15 +2026,6 @@
         </para>
       </listitem>
 
-      <listitem>
-        <para>
-          An exclamation point used with this style of comment delimiter
-          (such as <literal>/*! ... */</literal>) marks portions of SQL
-          statements for conditional execution. For more information and
-          examples, see <xref linkend="extensions-to-ansi"/>.
-        </para>
-      </listitem>
-
     </itemizedlist>
 
     <para>
@@ -2025,12 +2053,24 @@
 
     <para>
       A common problem stems from trying to use an identifier such as a
-      table or column name that is the name of a built-in MySQL data
-      type or function, such as <literal>TIMESTAMP</literal> or
-      <literal>GROUP</literal>. You're allowed to do this (for example,
-      <literal>ABS</literal> is allowed as a column name). However, by
-      default, no whitespace is allowed in function invocations between
-      the function name and the following
+      table or column name that is a reserved word such as
+      <literal>SELECT</literal> or the name of a built-in MySQL data
+      type or function such as <literal>TIMESTAMP</literal> or
+      <literal>GROUP</literal>.
+    </para>
+
+    <para>
+      If an identifier is a reserved word, you must quote it as
+      described in <xref linkend="legal-names"/>. Exception: A word that
+      follows a period in a qualified name must be an identifier, so it
+      is not necessary to quote it, even if it is a reserved word.
+    </para>
+
+    <para>
+      You are permitted to use function names as identifiers. For
+      example, <literal>ABS</literal> is acceptable as a column name.
+      However, by default, no whitespace is allowed in function
+      invocations between the function name and the following
       &lsquo;<literal>(</literal>&rsquo; character. This requirement
       allows a function call to be distinguished from a reference to a
       column name.
@@ -2054,27 +2094,22 @@
 
 <programlisting>
 mysql&gt; <userinput>CREATE TABLE abs(val INT);</userinput>
+ERROR 1064 (42000) at line 2: You have an error in your SQL
+syntax &hellip; near 'abs(val INT)'
 </programlisting>
 
     <para>
-      If the server SQL mode includes the
-      <literal>IGNORE_SPACE</literal> mode value, the server allows
-      function invocations to have whitespace between a function name
-      and the following &lsquo;<literal>(</literal>&rsquo; character.
-      This causes function names to be treated as reserved words. As a
-      result, identifiers that are the same as function names must be
-      quoted as described in <xref linkend="legal-names"/>. The server
-      SQL mode is controlled as described in
-      <xref linkend="server-sql-mode"/>.
+      If the <literal>IGNORE_SPACE</literal> SQL mode is enabled, the
+      server allows function invocations to have whitespace between a
+      function name and the following &lsquo;<literal>(</literal>&rsquo;
+      character. This causes function names to be treated as reserved
+      words. As a result, identifiers that are the same as function
+      names must be quoted as described in
+      <xref linkend="legal-names"/>. The server SQL mode is controlled
+      as described in <xref linkend="server-sql-mode"/>.
     </para>
 
     <para>
-      A word that follows a period in a qualified name must be an
-      identifier, so it is not necessary to quote it, even if it is a
-      reserved word.
-    </para>
-
-    <para>
       The words in the following table are explicitly reserved in MySQL
       &current-series;. At some point, you might update to a higher
       version, so it's a good idea to have a look at future reserved

Modified: trunk/refman-5.0/client-utility-programs.xml
===================================================================
--- trunk/refman-5.0/client-utility-programs.xml	2006-01-16 22:44:30 UTC (rev 860)
+++ trunk/refman-5.0/client-utility-programs.xml	2006-01-17 01:06:29 UTC (rev 861)
@@ -6327,10 +6327,9 @@
             <para>
               Quote database, table, and column names within
               &lsquo;<literal>`</literal>&rsquo; characters. If the
-              server SQL mode includes the
-              <literal>ANSI_QUOTES</literal> option, names are quoted
-              within &lsquo;<literal>"</literal>&rsquo; characters. It
-              is on by default. It can be disabled with
+              <literal>ANSI_QUOTES</literal> SQL mode is enabled, names
+              are quoted within &lsquo;<literal>"</literal>&rsquo;
+              characters. It is on by default. It can be disabled with
               <option>--skip-quote-names</option>, but this option
               should be given after any option such as
               <option>--compatible</option> that may enable

Modified: trunk/refman-5.0/data-types.xml
===================================================================
--- trunk/refman-5.0/data-types.xml	2006-01-16 22:44:30 UTC (rev 860)
+++ trunk/refman-5.0/data-types.xml	2006-01-17 01:06:29 UTC (rev 861)
@@ -698,9 +698,8 @@
 
           <para>
             These are synonyms for <literal>DOUBLE</literal>. Exception:
-            If the server SQL mode includes the
-            <literal>REAL_AS_FLOAT</literal> option,
-            <literal>REAL</literal> is a synonym for
+            If the <literal>REAL_AS_FLOAT</literal> SQL mode is
+            enabled,, <literal>REAL</literal> is a synonym for
             <literal>FLOAT</literal> rather than
             <literal>DOUBLE</literal>.
           </para>
@@ -2055,8 +2054,7 @@
       <literal>DOUBLE PRECISION</literal> (a non-standard extension).
       MySQL also treats <literal>REAL</literal> as a synonym for
       <literal>DOUBLE PRECISION</literal> (a non-standard variation),
-      unless the server SQL mode includes the
-      <literal>REAL_AS_FLOAT</literal> option.
+      unless the <literal>REAL_AS_FLOAT</literal> SQL mode is enabled.
     </para>
 
     <para>

Modified: trunk/refman-5.0/language-structure.xml
===================================================================
--- trunk/refman-5.0/language-structure.xml	2006-01-16 22:44:30 UTC (rev 860)
+++ trunk/refman-5.0/language-structure.xml	2006-01-17 01:06:29 UTC (rev 861)
@@ -30,13 +30,13 @@
 
     <listitem>
       <para>
-        Identifiers such as table and column names
+        Identifiers such as database, table, and column names
       </para>
     </listitem>
 
     <listitem>
       <para>
-        User and system variables
+        User-defined and system variables
       </para>
     </listitem>
 
@@ -94,7 +94,7 @@
       <title>&title-string-syntax;</title>
 
       <para>
-        A string is a sequence of characters, surrounded by either
+        A string is a sequence of characters, enclosed within either
         single quote (&lsquo;<literal>'</literal>&rsquo;) or double
         quote (&lsquo;<literal>"</literal>&rsquo;) characters. Examples:
       </para>
@@ -105,9 +105,9 @@
 </programlisting>
 
       <para>
-        If the server SQL mode has <literal>ANSI_QUOTES</literal>
-        enabled, string literals can be quoted only with single quotes.
-        A string quoted with double quotes is interpreted as an
+        If the <literal>ANSI_QUOTES</literal> SQL mode is enabled,
+        string literals can be quoted only within single quotes. A
+        string quoted within double quotes is interpreted as an
         identifier.
       </para>
 
@@ -267,12 +267,7 @@
                 <indexterm type="function">
                   <primary>(Control-Z) \Z</primary>
                 </indexterm></entry>
-              <entry>ASCII 26 (Control-Z). This character can be encoded as
-                &lsquo;<literal>\Z</literal>&rsquo; to allow you to work
-                around the problem that ASCII 26 stands for END-OF-FILE
-                on Windows. (ASCII 26 causes problems if you try to use
-                <literal>mysql <replaceable>db_name</replaceable> &lt;
-                <replaceable>file_name</replaceable></literal>.)</entry>
+              <entry>ASCII 26 (Control-Z). See note following the table.</entry>
             </row>
             <row>
               <entry><literal>\\</literal>
@@ -296,7 +291,7 @@
                 <indexterm type="function">
                   <primary>Wildcard character (%)</primary>
                 </indexterm></entry>
-              <entry>A &lsquo;<literal>%</literal>&rsquo; character. See note following
+              <entry>A &lsquo;<literal>%</literal>&rsquo; character. See note following the
                 table.</entry>
             </row>
             <row>
@@ -309,7 +304,7 @@
                 <indexterm type="function">
                   <primary>Wildcard character (_)</primary>
                 </indexterm></entry>
-              <entry>A &lsquo;<literal>_</literal>&rsquo; character. See note following
+              <entry>A &lsquo;<literal>_</literal>&rsquo; character. See note following the
                 table.</entry>
             </row>
           </tbody>
@@ -324,23 +319,36 @@
       </para>
 
       <para>
+        The ASCII 26 character can be encoded as
+        &lsquo;<literal>\Z</literal>&rsquo; to enable you to work around
+        the problem that ASCII 26 stands for END-OF-FILE on Windows.
+        ASCII 26 within a file causes problems if you try to use
+        <literal>mysql <replaceable>db_name</replaceable> &lt;
+        <replaceable>file_name</replaceable></literal>.
+      </para>
+
+      <para>
         The &lsquo;<literal>\%</literal>&rsquo; and
         &lsquo;<literal>\_</literal>&rsquo; sequences are used to search
         for literal instances of &lsquo;<literal>%</literal>&rsquo; and
         &lsquo;<literal>_</literal>&rsquo; in pattern-matching contexts
         where they would otherwise be interpreted as wildcard
-        characters. See <xref linkend="string-comparison-functions"/>.
-        Note that if you use &lsquo;<literal>\%</literal>&rsquo; or
-        &lsquo;<literal>\_</literal>&rsquo; in other contexts, they
-        return the strings &lsquo;<literal>\%</literal>&rsquo; and
-        &lsquo;<literal>\_</literal>&rsquo; and not
+        characters. See the description of the <literal>LIKE</literal>
+        operator in <xref linkend="string-comparison-functions"/>. If
+        you use &lsquo;<literal>\%</literal>&rsquo; or
+        &lsquo;<literal>\_</literal>&rsquo; in non-pattern-matching
+        contexts, they evaluate to the strings
+        &lsquo;<literal>\%</literal>&rsquo; and
+        &lsquo;<literal>\_</literal>&rsquo;, not to
         &lsquo;<literal>%</literal>&rsquo; and
         &lsquo;<literal>_</literal>&rsquo;.
       </para>
 
       <para>
-        In all other escape sequences, backslash is ignored. That is,
+        For all other escape sequences, backslash is ignored. That is,
         the escaped character is interpreted as if it was not escaped.
+        For example, &lsquo;<literal>\x</literal>&rsquo; is just
+        &lsquo;<literal>x</literal>&rsquo;.
       </para>
 
       <indexterm>
@@ -349,7 +357,8 @@
       </indexterm>
 
       <para>
-        There are several ways to include quotes within a string:
+        There are several ways to include quote characters within a
+        string:
       </para>
 
       <itemizedlist>
@@ -372,7 +381,7 @@
 
         <listitem>
           <para>
-            You can precede the quote character with an escape character
+            Precede the quote character by an escape character
             (&lsquo;<literal>\</literal>&rsquo;).
           </para>
         </listitem>
@@ -426,8 +435,8 @@
 
       <para>
         If you want to insert binary data into a string column (such as
-        a <literal>BLOB</literal>), the following characters must be
-        represented by escape sequences:
+        a <literal>BLOB</literal> column), the following characters must
+        be represented by escape sequences:
       </para>
 
       <informaltable>
@@ -490,24 +499,25 @@
         <listitem>
           <para>
             Process the string with a function that escapes the special
-            characters. For example, in a C program, you can use the
+            characters. In a C program, you can use the
             <literal>mysql_real_escape_string()</literal> C API function
             to escape characters. See
             <xref linkend="mysql-real-escape-string"/>. The Perl DBI
             interface provides a <literal>quote</literal> method to
             convert special characters to the proper escape sequences.
-            See <xref linkend="perl"/>.
+            See <xref linkend="perl"/>. Other language interfaces may
+            provide a similar capability.
           </para>
         </listitem>
 
         <listitem>
           <para>
             As an alternative to explicitly escaping special characters,
-            many MySQL APIs provide a placeholder capability that allows
-            you to insert special markers into a query string, and then
-            bind data values to them when you issue the query. In this
-            case, the API takes care of escaping special characters in
-            the values for you.
+            many MySQL APIs provide a placeholder capability that
+            enables you to insert special markers into a statement
+            string, and then bind data values to them when you issue the
+            statement. In this case, the API takes care of escaping
+            special characters in the values for you.
           </para>
         </listitem>
 
@@ -552,7 +562,9 @@
         Integers are represented as a sequence of digits. Floats use
         &lsquo;<literal>.</literal>&rsquo; as a decimal separator.
         Either type of number may be preceded by
-        &lsquo;<literal>-</literal>&rsquo; to indicate a negative value.
+        &lsquo;<literal>-</literal>&rsquo; or
+        &lsquo;<literal>+</literal>&rsquo; to indicate a negative or
+        positive value, respectively
       </para>
 
       <para>
@@ -618,10 +630,10 @@
 </programlisting>
 
       <para>
-        The <literal>0x</literal> syntax is based on ODBC. Hexadecimal
-        strings are often used by ODBC to supply values for
-        <literal>BLOB</literal> columns. The
-        <literal>x'hexstring'</literal> syntax is based on standard SQL.
+        The <literal>x'<replaceable>hexstring</replaceable>'</literal>
+        syntax is based on standard SQL. The <literal>0x</literal>
+        syntax is based on ODBC. Hexadecimal strings are often used by
+        ODBC to supply values for <literal>BLOB</literal> columns.
       </para>
 
       <para>
@@ -642,6 +654,14 @@
 
       <title>&title-boolean-values;</title>
 
+      <indexterm>
+        <primary><literal>TRUE</literal></primary>
+      </indexterm>
+
+      <indexterm>
+        <primary><literal>FALSE</literal></primary>
+      </indexterm>
+
       <remark role="help-topic" condition="TRUE FALSE"/>
 
       <remark role="help-keywords">
@@ -651,9 +671,9 @@
       <remark role="help-description-begin"/>
 
       <para>
-        The constant <literal>TRUE</literal> evaluates to
-        <literal>1</literal> and the constant <literal>FALSE</literal>
-        evaluates to <literal>0</literal>. The constant names can be
+        The constants <literal>TRUE</literal> and
+        <literal>FALSE</literal> evaluate to <literal>1</literal> and
+        <literal>0</literal>, respectively. The constant names can be
         written in any lettercase.
       </para>
 
@@ -720,7 +740,7 @@
         For text file import or export operations performed with
         <literal>LOAD DATA INFILE</literal> or <literal>SELECT ... INTO
         OUTFILE</literal>, <literal>NULL</literal> is represented by the
-        sequence <literal>\N</literal>. See <xref linkend="load-data"/>.
+        <literal>\N</literal> sequence. See <xref linkend="load-data"/>.
       </para>
 
     </section>
@@ -839,8 +859,8 @@
       <filename>.frm</filename> files and to identifiers stored in the
       grant tables in the <literal>mysql</literal> database. The sizes
       of the string columns in the grant tables (and in any other
-      tables) in MySQL &current-series; equate to numbers of characters;
-      this means that (unlike the case for some earlier versions of
+      tables) in MySQL &current-series; are given as number of
+      characters. This means that (unlike some earlier versions of
       MySQL) you can use multi-byte characters without reducing the
       number of characters allowed for values stored in these columns.
     </para>
@@ -865,11 +885,13 @@
     <para>
       An identifier may be quoted or unquoted. If an identifier is a
       reserved word or contains special characters, you
-      <emphasis>must</emphasis> quote it whenever you refer to it. For a
-      list of reserved words, see <xref linkend="reserved-words"/>.
-      Special characters are those outside the set of alphanumeric
-      characters from the current character set,
-      &lsquo;<literal>_</literal>&rsquo;, and
+      <emphasis>must</emphasis> quote it whenever you refer to it.
+      (Exception: A word that follows a period in a qualified name must
+      be an identifier, so it is not necessary to quote it, even if it
+      is a reserved word.) For a list of reserved words, see
+      <xref linkend="reserved-words"/>. Special characters are those
+      outside the set of alphanumeric characters from the current
+      character set, &lsquo;<literal>_</literal>&rsquo;, and
       &lsquo;<literal>$</literal>&rsquo;.
     </para>
 
@@ -883,9 +905,8 @@
 </programlisting>
 
     <para>
-      If the server SQL mode includes the <literal>ANSI_QUOTES</literal>
-      mode option, it is also allowable to quote identifiers with double
-      quotes:
+      If the <literal>ANSI_QUOTES</literal> SQL mode is enabled, it is
+      also allowable to quote identifiers within double quotes:
     </para>
 
 <programlisting>
@@ -897,10 +918,19 @@
 </programlisting>
 
     <para>
-      See <xref linkend="server-sql-mode"/>.
+      Note: Because <literal>ANSI_QUOTES</literal> causes the server to
+      interpret double-quoted strings as identifiers, string literals
+      must be enclosed within single quotes. They cannot be enclosed
+      within double quotes when <literal>ANSI_QUOTES</literal> is
+      enabled.
     </para>
 
     <para>
+      The server SQL mode is controlled as described in
+      <xref linkend="server-sql-mode"/>.
+    </para>
+
+    <para>
       Identifier quote characters can be included within an identifier
       <emphasis>if you quote the identifier</emphasis>. If the character
       to be included within the identifier is the same as that used to
@@ -915,18 +945,20 @@
 </programlisting>
 
     <para>
-      It is recommended that you do not use names of the pattern
-      <literal><replaceable>X</replaceable>e<replaceable>X</replaceable></literal>,
+      It is recommended that you do not use names of the form
+      <literal><replaceable>M</replaceable>e</literal> or
+      <literal><replaceable>M</replaceable>e<replaceable>N</replaceable></literal>,
       such as <literal>1e</literal> or <literal>2e2</literal>, because
-      an expression like <literal>1e+1</literal> is ambiguous. It might
-      be interpreted as the expression <literal>1e + 1</literal> or as
-      the number <literal>1e+1</literal>, depending on context.
+      an expression such as <literal>1e+3</literal> is ambiguous.
+      Depending on context, it might be interpreted as the expression
+      <literal>1e + 3</literal> or as the number
+      <literal>1e+3</literal>.
     </para>
 
     <para>
-      Be careful when using <literal>MD5</literal> to produce table
-      names, as it can produce illegal table names such as the ones
-      listed above.
+      Be careful when using <literal>MD5()</literal> to produce table
+      names because it can produce names in illegal or ambiguous formats
+      such as those just described.
     </para>
 
     <section id="identifier-qualifiers">
@@ -959,7 +991,7 @@
             <row>
               <entry><replaceable>col_name</replaceable></entry>
               <entry>The column <replaceable>col_name</replaceable> from whichever table used
-                in the query contains a column of that name.</entry>
+                in the statement contains a column of that name.</entry>
             </row>
             <row>
               <entry><replaceable>tbl_name.col_name</replaceable></entry>
@@ -1075,7 +1107,7 @@
 
       <para>
         In MySQL, databases correspond to directories within the data
-        directory. Each tables within a database corresponds to at least
+        directory. Each table within a database corresponds to at least
         one file within the database directory (and possibly more,
         depending on the storage engine). Consequently, the case
         sensitivity of the underlying operating system determines the
@@ -1085,16 +1117,19 @@
         is Mac OS X, which is Unix-based but uses a default filesystem
         type (HFS+) that is not case sensitive. However, Mac OS X also
         supports UFS volumes, which are case sensitive just as on any
-        Unix. See <xref linkend="extensions-to-ansi"/>.
+        Unix. See <xref linkend="extensions-to-ansi"/>. The
+        <literal>lower_case_table_names</literal> system variable also
+        affects how the server handles identifier case sensitivity, as
+        described later in this section.
       </para>
 
       <para>
         <emphasis role="bold">Note</emphasis>: Although database and
         table names are not case sensitive on some platforms, you should
         not refer to a given database or table using different cases
-        within the same query. The following query would not work
-        because it refers to a table both as <literal>my_table</literal>
-        and as <literal>MY_TABLE</literal>:
+        within the same statement. The following statement would not
+        work because it refers to a table both as
+        <literal>my_table</literal> and as <literal>MY_TABLE</literal>:
       </para>
 
 <programlisting>
@@ -1108,8 +1143,8 @@
 
       <para>
         By default, table aliases are case sensitive on Unix, but not so
-        on Windows or Mac OS X. The following query would not work on
-        Unix, because it refers to the alias both as
+        on Windows or Mac OS X. The following statement would not work
+        on Unix, because it refers to the alias both as
         <literal>a</literal> and as <literal>A</literal>:
       </para>
 
@@ -1119,20 +1154,22 @@
 </programlisting>
 
       <para>
-        However, this same query is permitted on Windows. To avoid being
-        caught out by such differences, best to adopt a consistent
-        convention, such as always creating and referring to databases
-        and tables using lowercase names. This convention is recommended
-        for maximum portability and ease of use.
+        However, this same statement is permitted on Windows. To avoid
+        being caught out by such differences, it is best to adopt a
+        consistent convention, such as always creating and referring to
+        databases and tables using lowercase names. This convention is
+        recommended for maximum portability and ease of use.
       </para>
 
       <para>
         How table and database names are stored on disk and used in
-        MySQL is defined by the
+        MySQL is affected by the
         <literal>lower_case_table_names</literal> system variable, which
         you can set when starting <command>mysqld</command>.
-        <literal>lower_case_table_names</literal> can take one of the
-        following values:
+        <literal>lower_case_table_names</literal> can take the values
+        shown in the following table. On Unix, the default value of
+        <literal>lower_case_table_names</literal> is 0. On both Windows
+        and Mac OS X, the default value is 1.
       </para>
 
       <informaltable>
@@ -1149,20 +1186,19 @@
               <entry>Table and database names are stored on disk using the lettercase
                 specified in the <literal>CREATE TABLE</literal> or
                 <literal>CREATE DATABASE</literal> statement. Name
-                comparisons are case sensitive. This is the default on
-                Unix systems. Note that if you force this to 0 with
+                comparisons are case sensitive. Note that if you force
+                this variable to 0 with
                 <option>--lower-case-table-names=0</option> on a
                 case-insensitive filesystem and access
                 <literal>MyISAM</literal> tablenames using different
-                lettercases, this may lead to index corruption.</entry>
+                lettercases, index corruption may result.</entry>
             </row>
             <row>
               <entry><literal>1</literal></entry>
               <entry>Table names are stored in lowercase on disk and name comparisons are not
                 case sensitive. MySQL converts all table names to
                 lowercase on storage and lookup. This behavior also
-                applies to database names and table aliases. This value
-                is the default on Windows and Mac OS X systems.</entry>
+                applies to database names and table aliases.</entry>
             </row>
             <row>
               <entry><literal>2</literal></entry>
@@ -1182,11 +1218,6 @@
       </informaltable>
 
       <para>
-        On both Windows and Mac OS X, the default value of
-        <literal>lower_case_table_names</literal> is 1.
-      </para>
-
-      <para>
         If you are using MySQL on only one platform, you don't normally
         have to change the <literal>lower_case_table_names</literal>
         variable. However, you may encounter difficulties if you want to
@@ -1195,7 +1226,8 @@
         tables named <literal>my_table</literal> and
         <literal>MY_TABLE</literal>, but on Windows these two names are
         considered identical. To avoid data transfer problems stemming
-        from database or table name lettercase, you have two options:
+        from lettercase of database or table names, you have two
+        options:
       </para>
 
       <itemizedlist>
@@ -1216,9 +1248,9 @@
             <literal>lower_case_table_names=2</literal> on Windows. This
             preserves the lettercase of database and table names. The
             disadvantage of this is that you must ensure that your
-            queries always refer to your database and table names with
-            the correct lettercase on Windows. If you transfer your
-            queries to Unix, where lettercase is significant, they do
+            statements always refer to your database and table names
+            with the correct lettercase on Windows. If you transfer your
+            statements to Unix, where lettercase is significant, they do
             not work if the lettercase is incorrect.
           </para>
 
@@ -1233,10 +1265,11 @@
       </itemizedlist>
 
       <para>
-        Note that before setting
-        <literal>lower_case_table_names</literal> to 1 on Unix, you must
-        first convert your old database and table names to lowercase
-        before restarting <command>mysqld</command>.
+        Note that if you plan to set the
+        <literal>lower_case_table_names</literal> system variable to 1
+        on Unix, you must first convert your old database and table
+        names to lowercase before restarting <command>mysqld</command>
+        with the new variable setting.
       </para>
 
     </section>
@@ -1262,13 +1295,13 @@
     </indexterm>
 
     <para>
-      You can store a value in a user variable and then refer to it
-      later; this allows you to pass values from one statement to
-      another. <emphasis>User variables are
-      connection-specific</emphasis>. That is, a variable defined by one
-      client cannot be seen or used by other clients. All variables for
-      a given client connection are automatically freed when that client
-      exits.
+      You can store a value in a user-defined variable and then refer to
+      it later. This enables you to pass values from one statement to
+      another. <emphasis>User-defined variables are
+      connection-specific</emphasis>. That is, a user variable defined
+      by one client cannot be seen or used by other clients. All
+      variables for a given client connection are automatically freed
+      when that client exits.
     </para>
 
     <para>
@@ -1282,12 +1315,15 @@
       <literal>latin1</literal> (cp1252 West European). This may be
       changed with the <option>--default-character-set</option> option
       to <command>mysqld</command>. See
-      <xref linkend="character-sets"/>. User variable names are not case
-      sensitive.
+      <xref linkend="character-sets"/>. A user variable name can contain
+      other characters if you quote it as a string or identifier (for
+      example, <literal>@'my-var'</literal>,
+      <literal>@"my-var"</literal>, or <literal>@`my-var`</literal>).
+      User variable names are not case sensitive.
     </para>
 
     <para>
-      One way to set a user variable is by issuing a
+      One way to set a user-defined variable is by issuing a
       <literal>SET</literal> statement:
     </para>
 
@@ -1322,20 +1358,15 @@
 </programlisting>
 
     <para>
-      User variables may be used where expressions are allowed. This
-      does not currently include contexts that explicitly require a
-      literal value, such as in the <literal>LIMIT</literal> clause of a
-      <literal>SELECT</literal> statement, or the <literal>IGNORE number
-      LINES</literal> clause of a <literal>LOAD DATA</literal>
-      statement.
+      User variables may be used in contexts where expressions are
+      allowed. This does not currently include contexts that explicitly
+      require a literal value, such as in the <literal>LIMIT</literal>
+      clause of a <literal>SELECT</literal> statement, or the
+      <literal>IGNORE <replaceable>N</replaceable> LINES</literal>
+      clause of a <literal>LOAD DATA</literal> statement.
     </para>
 
     <para>
-      If you refer to a variable that has not been initialized, its
-      value is <literal>NULL</literal>.
-    </para>
-
-    <para>
       If a user variable is assigned a string value, it also has the
       same character set and collation as the string. The coercibility
       of user variables is implicit as of MySQL 5.0.3. (This is the same
@@ -1362,9 +1393,8 @@
       <literal>HAVING</literal> clause refers to an alias for an
       expression in the <literal>SELECT</literal> list that uses
       <literal>@aa</literal>. This does not work as expected:
-      <literal>@aa</literal> does not contain the value of the current
-      row, but the value of <literal>id</literal> from the previous
-      selected row.
+      <literal>@aa</literal> contains the value of <literal>id</literal>
+      from the previous selected row, not from the current row.
     </para>
 
     <para>
@@ -1408,8 +1438,8 @@
     </para>
 
     <para>
-      An unassigned variable has a value of <literal>NULL</literal> with
-      a type of string.
+      If you refer to a variable that has not been initialized, it has a
+      value of <literal>NULL</literal> and a type of string.
     </para>
 
   </section>
@@ -1434,8 +1464,8 @@
     <para>
       MySQL provides access to many system and connection variables.
       Many variables can be changed dynamically while the server is
-      running. This often allows you to modify server operation without
-      having to stop and restart it.
+      running, which enables you to modify operation of the server
+      without having to stop and restart it.
     </para>
 
     <remark role="note">
@@ -1484,8 +1514,8 @@
     </para>
 
     <para>
-      Global or session variables may be set or retrieved using several
-      syntax forms. The following examples use
+      Global or session variables may be set or retrieved in several
+      ways. The following examples use
       <literal>sort_buffer_size</literal> as a sample variable name.
     </para>
 
@@ -1567,9 +1597,9 @@
     <para>
       The reason for requiring the <literal>GLOBAL</literal> keyword
       when setting <literal>GLOBAL</literal>-only variables but not when
-      retrieving them is to prevent problems in the future. If we remove
-      a <literal>SESSION</literal> variable with the same name as a
-      <literal>GLOBAL</literal> variable, a client with the
+      retrieving them is to prevent problems in the future. If we were
+      to remove a <literal>SESSION</literal> variable that has the same
+      name as a <literal>GLOBAL</literal> variable, a client with the
       <literal>SUPER</literal> privilege might accidentally change the
       <literal>GLOBAL</literal> variable rather than just the
       <literal>SESSION</literal> variable for its own connection. If we
@@ -1659,7 +1689,7 @@
       <para>
         To refer to a component of a structured variable instance, you
         can use a compound name in
-        <literal>instance_name.component_name</literal> format.
+        <replaceable>instance_name.component_name</replaceable> format.
         Examples:
       </para>
 
@@ -1680,8 +1710,8 @@
       </para>
 
       <para>
-        The naming rules for structured variable instances and
-        components are as follows:
+        Structured variable instances and components follow these naming
+        rules:
       </para>
 
       <itemizedlist>
@@ -1735,8 +1765,8 @@
       <para>
         Currently, the first two rules have no possibility of being
         violated because the only structured variable type is the one
-        for key caches. These rules assume greater significance if some
-        other type of structured variable is created in the future.
+        for key caches. These rules will assume greater significance if
+        some other type of structured variable is created in the future.
       </para>
 
       <para>
@@ -1751,7 +1781,7 @@
 </programlisting>
 
       <para>
-        In an option file, use this:
+        In an option file, use this syntax:
       </para>
 
 <programlisting>
@@ -1850,7 +1880,7 @@
     </indexterm>
 
     <para>
-      MySQL server supports three comment styles:
+      MySQL Server supports three comment styles:
     </para>
 
     <itemizedlist>
@@ -1865,21 +1895,22 @@
       <listitem>
         <para>
           From a &lsquo;<literal>-- </literal>&rsquo; sequence to the
-          end of the line. Note that the &lsquo;<literal>--
+          end of the line. In MySQL, the &lsquo;<literal>--
           </literal>&rsquo; (double-dash) comment style requires the
-          second dash to be followed by at least one whitespace
-          character (such as a space, tab, newline, and so on). This
-          syntax differs slightly from standard SQL comment syntax, as
-          discussed in <xref linkend="ansi-diff-comments"/>.
+          second dash to be followed by at least one whitespace or
+          control character (such as a space, tab, newline, and so on).
+          This syntax differs slightly from standard SQL comment syntax,
+          as discussed in <xref linkend="ansi-diff-comments"/>.
         </para>
       </listitem>
 
       <listitem>
         <para>
           From a <literal>/*</literal> sequence to the following
-          <literal>*/</literal> sequence. The closing sequence need not
-          be on the same line, so this syntax allows a comment to extend
-          over multiple lines.
+          <literal>*/</literal> sequence, as in the C programming
+          language. This syntax allows a comment to extend over multiple
+          lines because the beginning and closing sequences need not be
+          on the same line.
         </para>
       </listitem>
 
@@ -1894,11 +1925,11 @@
 mysql&gt; <userinput>SELECT 1+1;     -- This comment continues to the end of line</userinput>
 mysql&gt; <userinput>SELECT 1 /* this is an in-line comment */ + 1;</userinput>
 mysql&gt; <userinput>SELECT 1+</userinput>
-/*
-this is a
-multiple-line comment
-*/
-1;
+<userinput>/*</userinput>
+<userinput>this is a</userinput>
+<userinput>multiple-line comment</userinput>
+<userinput>*/</userinput>
+<userinput>1;</userinput>
 </programlisting>
 
     <para>
@@ -1940,25 +1971,11 @@
       The comment syntax just described applies to how the
       <command>mysqld</command> server parses SQL statements. The
       <command>mysql</command> client program also performs some parsing
-      of statements before sending them to the server. (For example, it
-      does this to determine statement boundaries within a
-      multiple-statement input line.)
+      of statements before sending them to the server. (It does this to
+      determine statement boundaries within a multiple-statement input
+      line.)
     </para>
 
-    <para>
-      In MySQL &current-series;, the only limitation on the way that
-      <command>mysql</command> parses <literal>/* ... */</literal>
-      comments is that an exclamation point used with this style of
-      comment delimiter marks portions of SQL statements for conditional
-      execution. This applies both when you run <command>mysql</command>
-      interactively and when you put commands in a file and use
-      <command>mysql</command> in batch mode to process the file with
-      <command>mysql &lt;
-      <replaceable>file_name</replaceable></command>. For more
-      information and examples, see
-      <xref linkend="extensions-to-ansi"/>.
-    </para>
-
   </section>
 
   <section id="reserved-words">
@@ -1976,10 +1993,22 @@
 
     <para>
       A common problem stems from trying to use an identifier such as a
-      table or column name that is the name of a built-in MySQL data
-      type or function, such as <literal>TIMESTAMP</literal> or
-      <literal>GROUP</literal>. You are permitted to do this (for
-      example, <literal>ABS</literal> is acceptable as a column name).
+      table or column name that is a reserved word such as
+      <literal>SELECT</literal> or the name of a built-in MySQL data
+      type or function such as <literal>TIMESTAMP</literal> or
+      <literal>GROUP</literal>.
+    </para>
+
+    <para>
+      If an identifier is a reserved word, you must quote it as
+      described in <xref linkend="legal-names"/>. Exception: A word that
+      follows a period in a qualified name must be an identifier, so it
+      is not necessary to quote it, even if it is a reserved word.
+    </para>
+
+    <para>
+      You are permitted to use function names as identifiers. For
+      example, <literal>ABS</literal> is acceptable as a column name.
       However, by default, no whitespace is allowed in function
       invocations between the function name and the following
       &lsquo;<literal>(</literal>&rsquo; character. This requirement
@@ -2005,27 +2034,22 @@
 
 <programlisting>
 mysql&gt; <userinput>CREATE TABLE abs(val INT);</userinput>
+ERROR 1064 (42000) at line 2: You have an error in your SQL
+syntax &hellip; near 'abs(val INT)'
 </programlisting>
 
     <para>
-      If the server SQL mode includes the
-      <literal>IGNORE_SPACE</literal> mode value, the server allows
-      function invocations to have whitespace between a function name
-      and the following &lsquo;<literal>(</literal>&rsquo; character.
-      This causes function names to be treated as reserved words. As a
-      result, identifiers that are the same as function names must be
-      quoted as described in <xref linkend="legal-names"/>. The server
-      SQL mode is controlled as described in
-      <xref linkend="server-sql-mode"/>.
+      If the <literal>IGNORE_SPACE</literal> SQL mode is enabled, the
+      server allows function invocations to have whitespace between a
+      function name and the following &lsquo;<literal>(</literal>&rsquo;
+      character. This causes function names to be treated as reserved
+      words. As a result, identifiers that are the same as function
+      names must be quoted as described in
+      <xref linkend="legal-names"/>. The server SQL mode is controlled
+      as described in <xref linkend="server-sql-mode"/>.
     </para>
 
     <para>
-      A word that follows a period in a qualified name must be an
-      identifier, so it is not necessary to quote it, even if it is a
-      reserved word.
-    </para>
-
-    <para>
       The words in the following table are explicitly reserved in MySQL
       &current-series;. At some point, you might update to a higher
       version, so it's a good idea to have a look at future reserved

Modified: trunk/refman-5.1/client-utility-programs.xml
===================================================================
--- trunk/refman-5.1/client-utility-programs.xml	2006-01-16 22:44:30 UTC (rev 860)
+++ trunk/refman-5.1/client-utility-programs.xml	2006-01-17 01:06:29 UTC (rev 861)
@@ -6366,10 +6366,9 @@
             <para>
               Quote database, table, and column names within
               &lsquo;<literal>`</literal>&rsquo; characters. If the
-              server SQL mode includes the
-              <literal>ANSI_QUOTES</literal> option, names are quoted
-              within &lsquo;<literal>"</literal>&rsquo; characters. It
-              is on by default. It can be disabled with
+              <literal>ANSI_QUOTES</literal> SQL mode is enabled, names
+              are quoted within &lsquo;<literal>"</literal>&rsquo;
+              characters. It is on by default. It can be disabled with
               <option>--skip-quote-names</option>, but this option
               should be given after any option such as
               <option>--compatible</option> that may enable

Modified: trunk/refman-5.1/data-types.xml
===================================================================
--- trunk/refman-5.1/data-types.xml	2006-01-16 22:44:30 UTC (rev 860)
+++ trunk/refman-5.1/data-types.xml	2006-01-17 01:06:29 UTC (rev 861)
@@ -690,9 +690,8 @@
 
           <para>
             These are synonyms for <literal>DOUBLE</literal>. Exception:
-            If the server SQL mode includes the
-            <literal>REAL_AS_FLOAT</literal> option,
-            <literal>REAL</literal> is a synonym for
+            If the <literal>REAL_AS_FLOAT</literal> SQL mode is
+            enabled,, <literal>REAL</literal> is a synonym for
             <literal>FLOAT</literal> rather than
             <literal>DOUBLE</literal>.
           </para>
@@ -1980,8 +1979,7 @@
       <literal>DOUBLE PRECISION</literal> (a non-standard extension).
       MySQL also treats <literal>REAL</literal> as a synonym for
       <literal>DOUBLE PRECISION</literal> (a non-standard variation),
-      unless the server SQL mode includes the
-      <literal>REAL_AS_FLOAT</literal> option.
+      unless the <literal>REAL_AS_FLOAT</literal> SQL mode is enabled.
     </para>
 
     <para>

Modified: trunk/refman-5.1/language-structure.xml
===================================================================
--- trunk/refman-5.1/language-structure.xml	2006-01-16 22:44:30 UTC (rev 860)
+++ trunk/refman-5.1/language-structure.xml	2006-01-17 01:06:29 UTC (rev 861)
@@ -30,13 +30,13 @@
 
     <listitem>
       <para>
-        Identifiers such as table and column names
+        Identifiers such as database, table, and column names
       </para>
     </listitem>
 
     <listitem>
       <para>
-        User and system variables
+        User-defined and system variables
       </para>
     </listitem>
 
@@ -94,7 +94,7 @@
       <title>&title-string-syntax;</title>
 
       <para>
-        A string is a sequence of characters, surrounded by either
+        A string is a sequence of characters, enclosed within either
         single quote (&lsquo;<literal>'</literal>&rsquo;) or double
         quote (&lsquo;<literal>"</literal>&rsquo;) characters. Examples:
       </para>
@@ -105,9 +105,9 @@
 </programlisting>
 
       <para>
-        If the server SQL mode has <literal>ANSI_QUOTES</literal>
-        enabled, string literals can be quoted only with single quotes.
-        A string quoted with double quotes is interpreted as an
+        If the <literal>ANSI_QUOTES</literal> SQL mode is enabled,
+        string literals can be quoted only within single quotes. A
+        string quoted within double quotes is interpreted as an
         identifier.
       </para>
 
@@ -267,12 +267,7 @@
                 <indexterm type="function">
                   <primary>(Control-Z) \Z</primary>
                 </indexterm></entry>
-              <entry>ASCII 26 (Control-Z). This character can be encoded as
-                &lsquo;<literal>\Z</literal>&rsquo; to allow you to work
-                around the problem that ASCII 26 stands for END-OF-FILE
-                on Windows. (ASCII 26 causes problems if you try to use
-                <literal>mysql <replaceable>db_name</replaceable> &lt;
-                <replaceable>file_name</replaceable></literal>.)</entry>
+              <entry>ASCII 26 (Control-Z). See note following the table.</entry>
             </row>
             <row>
               <entry><literal>\\</literal>
@@ -296,7 +291,7 @@
                 <indexterm type="function">
                   <primary>Wildcard character (%)</primary>
                 </indexterm></entry>
-              <entry>A &lsquo;<literal>%</literal>&rsquo; character. See note following
+              <entry>A &lsquo;<literal>%</literal>&rsquo; character. See note following the
                 table.</entry>
             </row>
             <row>
@@ -309,7 +304,7 @@
                 <indexterm type="function">
                   <primary>Wildcard character (_)</primary>
                 </indexterm></entry>
-              <entry>A &lsquo;<literal>_</literal>&rsquo; character. See note following
+              <entry>A &lsquo;<literal>_</literal>&rsquo; character. See note following the
                 table.</entry>
             </row>
           </tbody>
@@ -324,23 +319,36 @@
       </para>
 
       <para>
+        The ASCII 26 character can be encoded as
+        &lsquo;<literal>\Z</literal>&rsquo; to enable you to work around
+        the problem that ASCII 26 stands for END-OF-FILE on Windows.
+        ASCII 26 within a file causes problems if you try to use
+        <literal>mysql <replaceable>db_name</replaceable> &lt;
+        <replaceable>file_name</replaceable></literal>.
+      </para>
+
+      <para>
         The &lsquo;<literal>\%</literal>&rsquo; and
         &lsquo;<literal>\_</literal>&rsquo; sequences are used to search
         for literal instances of &lsquo;<literal>%</literal>&rsquo; and
         &lsquo;<literal>_</literal>&rsquo; in pattern-matching contexts
         where they would otherwise be interpreted as wildcard
-        characters. See <xref linkend="string-comparison-functions"/>.
-        Note that if you use &lsquo;<literal>\%</literal>&rsquo; or
-        &lsquo;<literal>\_</literal>&rsquo; in other contexts, they
-        return the strings &lsquo;<literal>\%</literal>&rsquo; and
-        &lsquo;<literal>\_</literal>&rsquo; and not
+        characters. See the description of the <literal>LIKE</literal>
+        operator in <xref linkend="string-comparison-functions"/>. If
+        you use &lsquo;<literal>\%</literal>&rsquo; or
+        &lsquo;<literal>\_</literal>&rsquo; in non-pattern-matching
+        contexts, they evaluate to the strings
+        &lsquo;<literal>\%</literal>&rsquo; and
+        &lsquo;<literal>\_</literal>&rsquo;, not to
         &lsquo;<literal>%</literal>&rsquo; and
         &lsquo;<literal>_</literal>&rsquo;.
       </para>
 
       <para>
-        In all other escape sequences, backslash is ignored. That is,
+        For all other escape sequences, backslash is ignored. That is,
         the escaped character is interpreted as if it was not escaped.
+        For example, &lsquo;<literal>\x</literal>&rsquo; is just
+        &lsquo;<literal>x</literal>&rsquo;.
       </para>
 
       <indexterm>
@@ -349,7 +357,8 @@
       </indexterm>
 
       <para>
-        There are several ways to include quotes within a string:
+        There are several ways to include quote characters within a
+        string:
       </para>
 
       <itemizedlist>
@@ -372,7 +381,7 @@
 
         <listitem>
           <para>
-            You can precede the quote character with an escape character
+            Precede the quote character by an escape character
             (&lsquo;<literal>\</literal>&rsquo;).
           </para>
         </listitem>
@@ -426,8 +435,8 @@
 
       <para>
         If you want to insert binary data into a string column (such as
-        a <literal>BLOB</literal>), the following characters must be
-        represented by escape sequences:
+        a <literal>BLOB</literal> column), the following characters must
+        be represented by escape sequences:
       </para>
 
       <informaltable>
@@ -490,24 +499,25 @@
         <listitem>
           <para>
             Process the string with a function that escapes the special
-            characters. For example, in a C program, you can use the
+            characters. In a C program, you can use the
             <literal>mysql_real_escape_string()</literal> C API function
             to escape characters. See
             <xref linkend="mysql-real-escape-string"/>. The Perl DBI
             interface provides a <literal>quote</literal> method to
             convert special characters to the proper escape sequences.
-            See <xref linkend="perl"/>.
+            See <xref linkend="perl"/>. Other language interfaces may
+            provide a similar capability.
           </para>
         </listitem>
 
         <listitem>
           <para>
             As an alternative to explicitly escaping special characters,
-            many MySQL APIs provide a placeholder capability that allows
-            you to insert special markers into a query string, and then
-            bind data values to them when you issue the query. In this
-            case, the API takes care of escaping special characters in
-            the values for you.
+            many MySQL APIs provide a placeholder capability that
+            enables you to insert special markers into a statement
+            string, and then bind data values to them when you issue the
+            statement. In this case, the API takes care of escaping
+            special characters in the values for you.
           </para>
         </listitem>
 
@@ -552,7 +562,9 @@
         Integers are represented as a sequence of digits. Floats use
         &lsquo;<literal>.</literal>&rsquo; as a decimal separator.
         Either type of number may be preceded by
-        &lsquo;<literal>-</literal>&rsquo; to indicate a negative value.
+        &lsquo;<literal>-</literal>&rsquo; or
+        &lsquo;<literal>+</literal>&rsquo; to indicate a negative or
+        positive value, respectively
       </para>
 
       <para>
@@ -618,10 +630,10 @@
 </programlisting>
 
       <para>
-        The <literal>0x</literal> syntax is based on ODBC. Hexadecimal
-        strings are often used by ODBC to supply values for
-        <literal>BLOB</literal> columns. The
-        <literal>x'hexstring'</literal> syntax is based on standard SQL.
+        The <literal>x'<replaceable>hexstring</replaceable>'</literal>
+        syntax is based on standard SQL. The <literal>0x</literal>
+        syntax is based on ODBC. Hexadecimal strings are often used by
+        ODBC to supply values for <literal>BLOB</literal> columns.
       </para>
 
       <para>
@@ -642,6 +654,14 @@
 
       <title>&title-boolean-values;</title>
 
+      <indexterm>
+        <primary><literal>TRUE</literal></primary>
+      </indexterm>
+
+      <indexterm>
+        <primary><literal>FALSE</literal></primary>
+      </indexterm>
+
       <remark role="help-topic" condition="TRUE FALSE"/>
 
       <remark role="help-keywords">
@@ -651,9 +671,9 @@
       <remark role="help-description-begin"/>
 
       <para>
-        The constant <literal>TRUE</literal> evaluates to
-        <literal>1</literal> and the constant <literal>FALSE</literal>
-        evaluates to <literal>0</literal>. The constant names can be
+        The constants <literal>TRUE</literal> and
+        <literal>FALSE</literal> evaluate to <literal>1</literal> and
+        <literal>0</literal>, respectively. The constant names can be
         written in any lettercase.
       </para>
 
@@ -720,7 +740,7 @@
         For text file import or export operations performed with
         <literal>LOAD DATA INFILE</literal> or <literal>SELECT ... INTO
         OUTFILE</literal>, <literal>NULL</literal> is represented by the
-        sequence <literal>\N</literal>. See <xref linkend="load-data"/>.
+        <literal>\N</literal> sequence. See <xref linkend="load-data"/>.
       </para>
 
     </section>
@@ -839,8 +859,8 @@
       <filename>.frm</filename> files and to identifiers stored in the
       grant tables in the <literal>mysql</literal> database. The sizes
       of the string columns in the grant tables (and in any other
-      tables) in MySQL &current-series; equate to numbers of characters;
-      this means that (unlike the case for some earlier versions of
+      tables) in MySQL &current-series; are given as number of
+      characters. This means that (unlike some earlier versions of
       MySQL) you can use multi-byte characters without reducing the
       number of characters allowed for values stored in these columns.
     </para>
@@ -865,11 +885,13 @@
     <para>
       An identifier may be quoted or unquoted. If an identifier is a
       reserved word or contains special characters, you
-      <emphasis>must</emphasis> quote it whenever you refer to it. For a
-      list of reserved words, see <xref linkend="reserved-words"/>.
-      Special characters are those outside the set of alphanumeric
-      characters from the current character set,
-      &lsquo;<literal>_</literal>&rsquo;, and
+      <emphasis>must</emphasis> quote it whenever you refer to it.
+      (Exception: A word that follows a period in a qualified name must
+      be an identifier, so it is not necessary to quote it, even if it
+      is a reserved word.) For a list of reserved words, see
+      <xref linkend="reserved-words"/>. Special characters are those
+      outside the set of alphanumeric characters from the current
+      character set, &lsquo;<literal>_</literal>&rsquo;, and
       &lsquo;<literal>$</literal>&rsquo;.
     </para>
 
@@ -883,9 +905,8 @@
 </programlisting>
 
     <para>
-      If the server SQL mode includes the <literal>ANSI_QUOTES</literal>
-      mode option, it is also allowable to quote identifiers with double
-      quotes:
+      If the <literal>ANSI_QUOTES</literal> SQL mode is enabled, it is
+      also allowable to quote identifiers within double quotes:
     </para>
 
 <programlisting>
@@ -897,10 +918,19 @@
 </programlisting>
 
     <para>
-      See <xref linkend="server-sql-mode"/>.
+      Note: Because <literal>ANSI_QUOTES</literal> causes the server to
+      interpret double-quoted strings as identifiers, string literals
+      must be enclosed within single quotes. They cannot be enclosed
+      within double quotes when <literal>ANSI_QUOTES</literal> is
+      enabled.
     </para>
 
     <para>
+      The server SQL mode is controlled as described in
+      <xref linkend="server-sql-mode"/>.
+    </para>
+
+    <para>
       Identifier quote characters can be included within an identifier
       <emphasis>if you quote the identifier</emphasis>. If the character
       to be included within the identifier is the same as that used to
@@ -915,18 +945,20 @@
 </programlisting>
 
     <para>
-      It is recommended that you do not use names of the pattern
-      <literal><replaceable>X</replaceable>e<replaceable>X</replaceable></literal>,
+      It is recommended that you do not use names of the form
+      <literal><replaceable>M</replaceable>e</literal> or
+      <literal><replaceable>M</replaceable>e<replaceable>N</replaceable></literal>,
       such as <literal>1e</literal> or <literal>2e2</literal>, because
-      an expression like <literal>1e+1</literal> is ambiguous. It might
-      be interpreted as the expression <literal>1e + 1</literal> or as
-      the number <literal>1e+1</literal>, depending on context.
+      an expression such as <literal>1e+3</literal> is ambiguous.
+      Depending on context, it might be interpreted as the expression
+      <literal>1e + 3</literal> or as the number
+      <literal>1e+3</literal>.
     </para>
 
     <para>
-      Be careful when using <literal>MD5</literal> to produce table
-      names, as it can produce illegal table names such as the ones
-      listed above.
+      Be careful when using <literal>MD5()</literal> to produce table
+      names because it can produce names in illegal or ambiguous formats
+      such as those just described.
     </para>
 
     <section id="identifier-qualifiers">
@@ -959,7 +991,7 @@
             <row>
               <entry><replaceable>col_name</replaceable></entry>
               <entry>The column <replaceable>col_name</replaceable> from whichever table used
-                in the query contains a column of that name.</entry>
+                in the statement contains a column of that name.</entry>
             </row>
             <row>
               <entry><replaceable>tbl_name.col_name</replaceable></entry>
@@ -1075,7 +1107,7 @@
 
       <para>
         In MySQL, databases correspond to directories within the data
-        directory. Each tables within a database corresponds to at least
+        directory. Each table within a database corresponds to at least
         one file within the database directory (and possibly more,
         depending on the storage engine). Consequently, the case
         sensitivity of the underlying operating system determines the
@@ -1085,16 +1117,19 @@
         is Mac OS X, which is Unix-based but uses a default filesystem
         type (HFS+) that is not case sensitive. However, Mac OS X also
         supports UFS volumes, which are case sensitive just as on any
-        Unix. See <xref linkend="extensions-to-ansi"/>.
+        Unix. See <xref linkend="extensions-to-ansi"/>. The
+        <literal>lower_case_table_names</literal> system variable also
+        affects how the server handles identifier case sensitivity, as
+        described later in this section.
       </para>
 
       <para>
         <emphasis role="bold">Note</emphasis>: Although database and
         table names are not case sensitive on some platforms, you should
         not refer to a given database or table using different cases
-        within the same query. The following query would not work
-        because it refers to a table both as <literal>my_table</literal>
-        and as <literal>MY_TABLE</literal>:
+        within the same statement. The following statement would not
+        work because it refers to a table both as
+        <literal>my_table</literal> and as <literal>MY_TABLE</literal>:
       </para>
 
 <programlisting>
@@ -1108,8 +1143,8 @@
 
       <para>
         By default, table aliases are case sensitive on Unix, but not so
-        on Windows or Mac OS X. The following query would not work on
-        Unix, because it refers to the alias both as
+        on Windows or Mac OS X. The following statement would not work
+        on Unix, because it refers to the alias both as
         <literal>a</literal> and as <literal>A</literal>:
       </para>
 
@@ -1119,20 +1154,22 @@
 </programlisting>
 
       <para>
-        However, this same query is permitted on Windows. To avoid being
-        caught out by such differences, best to adopt a consistent
-        convention, such as always creating and referring to databases
-        and tables using lowercase names. This convention is recommended
-        for maximum portability and ease of use.
+        However, this same statement is permitted on Windows. To avoid
+        being caught out by such differences, it is best to adopt a
+        consistent convention, such as always creating and referring to
+        databases and tables using lowercase names. This convention is
+        recommended for maximum portability and ease of use.
       </para>
 
       <para>
         How table and database names are stored on disk and used in
-        MySQL is defined by the
+        MySQL is affected by the
         <literal>lower_case_table_names</literal> system variable, which
         you can set when starting <command>mysqld</command>.
-        <literal>lower_case_table_names</literal> can take one of the
-        following values:
+        <literal>lower_case_table_names</literal> can take the values
+        shown in the following table. On Unix, the default value of
+        <literal>lower_case_table_names</literal> is 0. On both Windows
+        and Mac OS X, the default value is 1.
       </para>
 
       <informaltable>
@@ -1149,20 +1186,19 @@
               <entry>Table and database names are stored on disk using the lettercase
                 specified in the <literal>CREATE TABLE</literal> or
                 <literal>CREATE DATABASE</literal> statement. Name
-                comparisons are case sensitive. This is the default on
-                Unix systems. Note that if you force this to 0 with
+                comparisons are case sensitive. Note that if you force
+                this variable to 0 with
                 <option>--lower-case-table-names=0</option> on a
                 case-insensitive filesystem and access
                 <literal>MyISAM</literal> tablenames using different
-                lettercases, this may lead to index corruption.</entry>
+                lettercases, index corruption may result.</entry>
             </row>
             <row>
               <entry><literal>1</literal></entry>
               <entry>Table names are stored in lowercase on disk and name comparisons are not
                 case sensitive. MySQL converts all table names to
                 lowercase on storage and lookup. This behavior also
-                applies to database names and table aliases. This value
-                is the default on Windows and Mac OS X systems.</entry>
+                applies to database names and table aliases.</entry>
             </row>
             <row>
               <entry><literal>2</literal></entry>
@@ -1182,11 +1218,6 @@
       </informaltable>
 
       <para>
-        On both Windows and Mac OS X, the default value of
-        <literal>lower_case_table_names</literal> is 1.
-      </para>
-
-      <para>
         If you are using MySQL on only one platform, you don't normally
         have to change the <literal>lower_case_table_names</literal>
         variable. However, you may encounter difficulties if you want to
@@ -1195,7 +1226,8 @@
         tables named <literal>my_table</literal> and
         <literal>MY_TABLE</literal>, but on Windows these two names are
         considered identical. To avoid data transfer problems stemming
-        from database or table name lettercase, you have two options:
+        from lettercase of database or table names, you have two
+        options:
       </para>
 
       <itemizedlist>
@@ -1216,9 +1248,9 @@
             <literal>lower_case_table_names=2</literal> on Windows. This
             preserves the lettercase of database and table names. The
             disadvantage of this is that you must ensure that your
-            queries always refer to your database and table names with
-            the correct lettercase on Windows. If you transfer your
-            queries to Unix, where lettercase is significant, they do
+            statements always refer to your database and table names
+            with the correct lettercase on Windows. If you transfer your
+            statements to Unix, where lettercase is significant, they do
             not work if the lettercase is incorrect.
           </para>
 
@@ -1233,10 +1265,11 @@
       </itemizedlist>
 
       <para>
-        Note that before setting
-        <literal>lower_case_table_names</literal> to 1 on Unix, you must
-        first convert your old database and table names to lowercase
-        before restarting <command>mysqld</command>.
+        Note that if you plan to set the
+        <literal>lower_case_table_names</literal> system variable to 1
+        on Unix, you must first convert your old database and table
+        names to lowercase before restarting <command>mysqld</command>
+        with the new variable setting.
       </para>
 
     </section>
@@ -1262,13 +1295,13 @@
     </indexterm>
 
     <para>
-      You can store a value in a user variable and then refer to it
-      later; this allows you to pass values from one statement to
-      another. <emphasis>User variables are
-      connection-specific</emphasis>. That is, a variable defined by one
-      client cannot be seen or used by other clients. All variables for
-      a given client connection are automatically freed when that client
-      exits.
+      You can store a value in a user-defined variable and then refer to
+      it later. This enables you to pass values from one statement to
+      another. <emphasis>User-defined variables are
+      connection-specific</emphasis>. That is, a user variable defined
+      by one client cannot be seen or used by other clients. All
+      variables for a given client connection are automatically freed
+      when that client exits.
     </para>
 
     <para>
@@ -1282,12 +1315,15 @@
       <literal>latin1</literal> (cp1252 West European). This may be
       changed with the <option>--default-character-set</option> option
       to <command>mysqld</command>. See
-      <xref linkend="character-sets"/>. User variable names are not case
-      sensitive.
+      <xref linkend="character-sets"/>. A user variable name can contain
+      other characters if you quote it as a string or identifier (for
+      example, <literal>@'my-var'</literal>,
+      <literal>@"my-var"</literal>, or <literal>@`my-var`</literal>).
+      User variable names are not case sensitive.
     </para>
 
     <para>
-      One way to set a user variable is by issuing a
+      One way to set a user-defined variable is by issuing a
       <literal>SET</literal> statement:
     </para>
 
@@ -1322,20 +1358,15 @@
 </programlisting>
 
     <para>
-      User variables may be used where expressions are allowed. This
-      does not currently include contexts that explicitly require a
-      literal value, such as in the <literal>LIMIT</literal> clause of a
-      <literal>SELECT</literal> statement, or the <literal>IGNORE number
-      LINES</literal> clause of a <literal>LOAD DATA</literal>
-      statement.
+      User variables may be used in contexts where expressions are
+      allowed. This does not currently include contexts that explicitly
+      require a literal value, such as in the <literal>LIMIT</literal>
+      clause of a <literal>SELECT</literal> statement, or the
+      <literal>IGNORE <replaceable>N</replaceable> LINES</literal>
+      clause of a <literal>LOAD DATA</literal> statement.
     </para>
 
     <para>
-      If you refer to a variable that has not been initialized, its
-      value is <literal>NULL</literal>.
-    </para>
-
-    <para>
       If a user variable is assigned a string value, it also has the
       same character set and collation as the string. The coercibility
       of user variables is implicit. (This is the same coercibility as
@@ -1362,9 +1393,8 @@
       <literal>HAVING</literal> clause refers to an alias for an
       expression in the <literal>SELECT</literal> list that uses
       <literal>@aa</literal>. This does not work as expected:
-      <literal>@aa</literal> does not contain the value of the current
-      row, but the value of <literal>id</literal> from the previous
-      selected row.
+      <literal>@aa</literal> contains the value of <literal>id</literal>
+      from the previous selected row, not from the current row.
     </para>
 
     <para>
@@ -1408,8 +1438,8 @@
     </para>
 
     <para>
-      An unassigned variable has a value of <literal>NULL</literal> with
-      a type of string.
+      If you refer to a variable that has not been initialized, it has a
+      value of <literal>NULL</literal> and a type of string.
     </para>
 
   </section>
@@ -1434,8 +1464,8 @@
     <para>
       MySQL provides access to many system and connection variables.
       Many variables can be changed dynamically while the server is
-      running. This often allows you to modify server operation without
-      having to stop and restart it.
+      running, which enables you to modify operation of the server
+      without having to stop and restart it.
     </para>
 
     <remark role="note">
@@ -1484,8 +1514,8 @@
     </para>
 
     <para>
-      Global or session variables may be set or retrieved using several
-      syntax forms. The following examples use
+      Global or session variables may be set or retrieved in several
+      ways. The following examples use
       <literal>sort_buffer_size</literal> as a sample variable name.
     </para>
 
@@ -1567,9 +1597,9 @@
     <para>
       The reason for requiring the <literal>GLOBAL</literal> keyword
       when setting <literal>GLOBAL</literal>-only variables but not when
-      retrieving them is to prevent problems in the future. If we remove
-      a <literal>SESSION</literal> variable with the same name as a
-      <literal>GLOBAL</literal> variable, a client with the
+      retrieving them is to prevent problems in the future. If we were
+      to remove a <literal>SESSION</literal> variable that has the same
+      name as a <literal>GLOBAL</literal> variable, a client with the
       <literal>SUPER</literal> privilege might accidentally change the
       <literal>GLOBAL</literal> variable rather than just the
       <literal>SESSION</literal> variable for its own connection. If we
@@ -1659,7 +1689,7 @@
       <para>
         To refer to a component of a structured variable instance, you
         can use a compound name in
-        <literal>instance_name.component_name</literal> format.
+        <replaceable>instance_name.component_name</replaceable> format.
         Examples:
       </para>
 
@@ -1680,8 +1710,8 @@
       </para>
 
       <para>
-        The naming rules for structured variable instances and
-        components are as follows:
+        Structured variable instances and components follow these naming
+        rules:
       </para>
 
       <itemizedlist>
@@ -1735,8 +1765,8 @@
       <para>
         Currently, the first two rules have no possibility of being
         violated because the only structured variable type is the one
-        for key caches. These rules assume greater significance if some
-        other type of structured variable is created in the future.
+        for key caches. These rules will assume greater significance if
+        some other type of structured variable is created in the future.
       </para>
 
       <para>
@@ -1751,7 +1781,7 @@
 </programlisting>
 
       <para>
-        In an option file, use this:
+        In an option file, use this syntax:
       </para>
 
 <programlisting>
@@ -1850,7 +1880,7 @@
     </indexterm>
 
     <para>
-      MySQL server supports three comment styles:
+      MySQL Server supports three comment styles:
     </para>
 
     <itemizedlist>
@@ -1865,21 +1895,22 @@
       <listitem>
         <para>
           From a &lsquo;<literal>-- </literal>&rsquo; sequence to the
-          end of the line. Note that the &lsquo;<literal>--
+          end of the line. In MySQL, the &lsquo;<literal>--
           </literal>&rsquo; (double-dash) comment style requires the
-          second dash to be followed by at least one whitespace
-          character (such as a space, tab, newline, and so on). This
-          syntax differs slightly from standard SQL comment syntax, as
-          discussed in <xref linkend="ansi-diff-comments"/>.
+          second dash to be followed by at least one whitespace or
+          control character (such as a space, tab, newline, and so on).
+          This syntax differs slightly from standard SQL comment syntax,
+          as discussed in <xref linkend="ansi-diff-comments"/>.
         </para>
       </listitem>
 
       <listitem>
         <para>
           From a <literal>/*</literal> sequence to the following
-          <literal>*/</literal> sequence. The closing sequence need not
-          be on the same line, so this syntax allows a comment to extend
-          over multiple lines.
+          <literal>*/</literal> sequence, as in the C programming
+          language. This syntax allows a comment to extend over multiple
+          lines because the beginning and closing sequences need not be
+          on the same line.
         </para>
       </listitem>
 
@@ -1894,11 +1925,11 @@
 mysql&gt; <userinput>SELECT 1+1;     -- This comment continues to the end of line</userinput>
 mysql&gt; <userinput>SELECT 1 /* this is an in-line comment */ + 1;</userinput>
 mysql&gt; <userinput>SELECT 1+</userinput>
-/*
-this is a
-multiple-line comment
-*/
-1;
+<userinput>/*</userinput>
+<userinput>this is a</userinput>
+<userinput>multiple-line comment</userinput>
+<userinput>*/</userinput>
+<userinput>1;</userinput>
 </programlisting>
 
     <para>
@@ -1940,25 +1971,11 @@
       The comment syntax just described applies to how the
       <command>mysqld</command> server parses SQL statements. The
       <command>mysql</command> client program also performs some parsing
-      of statements before sending them to the server. (For example, it
-      does this to determine statement boundaries within a
-      multiple-statement input line.)
+      of statements before sending them to the server. (It does this to
+      determine statement boundaries within a multiple-statement input
+      line.)
     </para>
 
-    <para>
-      In MySQL &current-series;, the only limitation on the way that
-      <command>mysql</command> parses <literal>/* ... */</literal>
-      comments is that an exclamation point used with this style of
-      comment delimiter marks portions of SQL statements for conditional
-      execution. This applies both when you run <command>mysql</command>
-      interactively and when you put commands in a file and use
-      <command>mysql</command> in batch mode to process the file with
-      <command>mysql &lt;
-      <replaceable>file_name</replaceable></command>. For more
-      information and examples, see
-      <xref linkend="extensions-to-ansi"/>.
-    </para>
-
   </section>
 
   <section id="reserved-words">
@@ -1976,10 +1993,22 @@
 
     <para>
       A common problem stems from trying to use an identifier such as a
-      table or column name that is the name of a built-in MySQL data
-      type or function, such as <literal>TIMESTAMP</literal> or
-      <literal>GROUP</literal>. You are permitted to do this (for
-      example, <literal>ABS</literal> is acceptable as a column name).
+      table or column name that is a reserved word such as
+      <literal>SELECT</literal> or the name of a built-in MySQL data
+      type or function such as <literal>TIMESTAMP</literal> or
+      <literal>GROUP</literal>.
+    </para>
+
+    <para>
+      If an identifier is a reserved word, you must quote it as
+      described in <xref linkend="legal-names"/>. Exception: A word that
+      follows a period in a qualified name must be an identifier, so it
+      is not necessary to quote it, even if it is a reserved word.
+    </para>
+
+    <para>
+      You are permitted to use function names as identifiers. For
+      example, <literal>ABS</literal> is acceptable as a column name.
       However, by default, no whitespace is allowed in function
       invocations between the function name and the following
       &lsquo;<literal>(</literal>&rsquo; character. This requirement
@@ -2005,27 +2034,22 @@
 
 <programlisting>
 mysql&gt; <userinput>CREATE TABLE abs(val INT);</userinput>
+ERROR 1064 (42000) at line 2: You have an error in your SQL
+syntax &hellip; near 'abs(val INT)'
 </programlisting>
 
     <para>
-      If the server SQL mode includes the
-      <literal>IGNORE_SPACE</literal> mode value, the server allows
-      function invocations to have whitespace between a function name
-      and the following &lsquo;<literal>(</literal>&rsquo; character.
-      This causes function names to be treated as reserved words. As a
-      result, identifiers that are the same as function names must be
-      quoted as described in <xref linkend="legal-names"/>. The server
-      SQL mode is controlled as described in
-      <xref linkend="server-sql-mode"/>.
+      If the <literal>IGNORE_SPACE</literal> SQL mode is enabled, the
+      server allows function invocations to have whitespace between a
+      function name and the following &lsquo;<literal>(</literal>&rsquo;
+      character. This causes function names to be treated as reserved
+      words. As a result, identifiers that are the same as function
+      names must be quoted as described in
+      <xref linkend="legal-names"/>. The server SQL mode is controlled
+      as described in <xref linkend="server-sql-mode"/>.
     </para>
 
     <para>
-      A word that follows a period in a qualified name must be an
-      identifier, so it is not necessary to quote it, even if it is a
-      reserved word.
-    </para>
-
-    <para>
       The words in the following table are explicitly reserved in MySQL
       &current-series;. At some point, you might update to a higher
       version, so it's a good idea to have a look at future reserved

Modified: trunk/refman-common/titles.en.ent
===================================================================
--- trunk/refman-common/titles.en.ent	2006-01-16 22:44:30 UTC (rev 860)
+++ trunk/refman-common/titles.en.ent	2006-01-17 01:06:29 UTC (rev 861)
@@ -362,7 +362,7 @@
 <!ENTITY title-example-maximum-column-group-row "The Rows Holding the Group-wise Maximum of a Certain Field">
 <!ENTITY title-example-maximum-row "The Row Holding the Maximum of a Certain Column">
 <!ENTITY title-example-storage-engine "The <literal>EXAMPLE</literal> Storage Engine">
-<!ENTITY title-example-user-variables "Using User Variables">
+<!ENTITY title-example-user-variables "Using User-Defined Variables">
 <!ENTITY title-examples "Examples of Common Queries">
 <!ENTITY title-exists-and-not-exists-subqueries "<literal>EXISTS</literal> and <literal>NOT EXISTS</literal>">
 <!ENTITY title-explain "Optimizing Queries with <literal>EXPLAIN</literal>">
@@ -1666,7 +1666,7 @@
 <!ENTITY title-using-mysql-programs "Using MySQL Programs">
 <!ENTITY title-using-stack-trace "Using a Stack Trace">
 <!ENTITY title-using-triggers "Using Triggers">
-<!ENTITY title-variables "User Variables">
+<!ENTITY title-variables "User-Defined Variables">
 <!ENTITY title-variables-in-stored-procedures "Variables in Stored Procedures">
 <!ENTITY title-vb-types "How Do I Map Visual Basic Data Types to MySQL Types?">
 <!ENTITY title-verifying-md5-checksum "Verifying the MD5 Checksum">

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