List:Commits« Previous MessageNext Message »
From:paul Date:January 20 2006 4:32am
Subject:svn commit - mysqldoc@docsrva: r942 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-common
View as plain text  
Author: paul
Date: 2006-01-20 05:32:46 +0100 (Fri, 20 Jan 2006)
New Revision: 942

Log:
 r6470@frost:  paul | 2006-01-19 21:01:53 -0600
 General revisions.


Modified:
   trunk/
   trunk/refman-4.1/functions.xml
   trunk/refman-5.0/functions.xml
   trunk/refman-5.1/functions.xml
   trunk/refman-5.1/renamed-nodes.txt
   trunk/refman-common/news-5.1.xml
   trunk/refman-common/titles.en.ent


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

Modified: trunk/refman-4.1/functions.xml
===================================================================
--- trunk/refman-4.1/functions.xml	2006-01-20 02:32:16 UTC (rev 941)
+++ trunk/refman-4.1/functions.xml	2006-01-20 04:32:46 UTC (rev 942)
@@ -36,8 +36,10 @@
     <literal>DELETE</literal>, or <literal>UPDATE</literal> statement,
     or in <literal>SET</literal> statements. Expressions can be written
     using literal values, column values, <literal>NULL</literal>,
-    functions, and operators. This chapter describes the functions and
-    operators that are allowed for writing expressions in MySQL.
+    built-in functions, user-defined functions, and operators. This
+    chapter describes the functions and operators that are allowed for
+    writing expressions in MySQL. Instructions for writing user-defined
+    functions are given in <xref linkend="adding-functions"/>.
   </para>
 
   <para>
@@ -57,17 +59,17 @@
   <para>
     You can tell the MySQL server to accept spaces after function names
     by starting it with the <option>--sql-mode=IGNORE_SPACE</option>
-    option. Individual client programs can request this behavior by
-    using the <literal>CLIENT_IGNORE_SPACE</literal> option for
+    option. (See <xref linkend="server-sql-mode"/>.) Individual client
+    programs can request this behavior by using the
+    <literal>CLIENT_IGNORE_SPACE</literal> option for
     <literal>mysql_real_connect()</literal>. In either case, all
-    function names become reserved words. See
-    <xref linkend="server-sql-mode"/>.
+    function names become reserved words.
   </para>
 
   <para>
     For the sake of brevity, most examples in this chapter display the
     output from the <command>mysql</command> program in abbreviated
-    form. Instead of showing examples in this format:
+    form. Rather than showing examples in this format:
   </para>
 
 <programlisting>
@@ -101,6 +103,16 @@
 
       <title>&title-operator-precedence;</title>
 
+      <indexterm>
+        <primary>operators</primary>
+        <secondary>precedence</secondary>
+      </indexterm>
+
+      <indexterm>
+        <primary>precedence</primary>
+        <secondary>operator</secondary>
+      </indexterm>
+
       <para>
         Operator precedences are shown in the following list, from
         lowest precedence to the highest. Operators that are shown
@@ -124,12 +136,6 @@
 BINARY, COLLATE
 </programlisting>
 
-    </section>
-
-    <section id="parentheses">
-
-      <title>&title-parentheses;</title>
-
       <indexterm type="function">
         <primary>() (parentheses)</primary>
       </indexterm>
@@ -148,28 +154,19 @@
         <secondary>expressions</secondary>
       </indexterm>
 
-      <itemizedlist>
+      <para>
+        The precedence of operators determines the order of evaluation
+        of terms in an expression. To override this order and group
+        terms explicitly, use parentheses. For example:
+      </para>
 
-        <listitem>
-          <para>
-            <literal>( ... )</literal>
-          </para>
-
-          <para>
-            Use parentheses to force the order of evaluation in an
-            expression. For example:
-          </para>
-
 <programlisting>
 mysql&gt; <userinput>SELECT 1+2*3;</userinput>
         -&gt; 7
 mysql&gt; <userinput>SELECT (1+2)*3;</userinput>
         -&gt; 9
 </programlisting>
-        </listitem>
 
-      </itemizedlist>
-
     </section>
 
     <section id="comparison-operators">
@@ -192,18 +189,20 @@
 
       <para>
         Comparison operations result in a value of <literal>1</literal>
-        (TRUE), <literal>0</literal> (FALSE), or
-        <literal>NULL</literal>. These operations work for both numbers
-        and strings. Strings are automatically converted to numbers and
-        numbers to strings as necessary.
+        (<literal>TRUE</literal>), <literal>0</literal>
+        (<literal>FALSE</literal>), or <literal>NULL</literal>. These
+        operations work for both numbers and strings. Strings are
+        automatically converted to numbers and numbers to strings as
+        necessary.
       </para>
 
       <para>
         Some of the functions in this section (such as
         <literal>LEAST()</literal> and <literal>GREATEST()</literal>)
-        return values other than <literal>1</literal> (TRUE),
-        <literal>0</literal> (FALSE), or <literal>NULL</literal>.
-        However, the value they return is based on comparison operations
+        return values other than <literal>1</literal>
+        (<literal>TRUE</literal>), <literal>0</literal>
+        (<literal>FALSE</literal>), or <literal>NULL</literal>. However,
+        the value they return is based on comparison operations
         performed as described by the following rules.
       </para>
 

Modified: trunk/refman-5.0/functions.xml
===================================================================
--- trunk/refman-5.0/functions.xml	2006-01-20 02:32:16 UTC (rev 941)
+++ trunk/refman-5.0/functions.xml	2006-01-20 04:32:46 UTC (rev 942)
@@ -13,6 +13,14 @@
 
   <title>&title-functions;</title>
 
+  <remark role="todo">
+    There are a number of remarks in this chapter that are out of date
+    with respect to case sensitivity. Specifically, they still carry the
+    4.0 connotation of binary string meaning a "case sensitive" string,
+    instead of the 4.1 meaning of "string of bytes without character set
+    or collation." Search for "sensitive to find these.
+  </remark>
+
   <indexterm>
     <primary>functions for <literal>SELECT</literal> and <literal>WHERE</literal>
       clauses</primary>
@@ -36,8 +44,12 @@
     <literal>DELETE</literal>, or <literal>UPDATE</literal> statement,
     or in <literal>SET</literal> statements. Expressions can be written
     using literal values, column values, <literal>NULL</literal>,
-    functions, and operators. This chapter describes the functions and
-    operators that are allowed for writing expressions in MySQL.
+    built-in functions, stored functions, user-defined functions, and
+    operators. This chapter describes the functions and operators that
+    are allowed for writing expressions in MySQL. Instructions for
+    writing stored functions and user-defined functions are given in
+    <xref linkend="stored-procedures"/>, and
+    <xref linkend="adding-functions"/>.
   </para>
 
   <para>
@@ -57,17 +69,17 @@
   <para>
     You can tell the MySQL server to accept spaces after function names
     by starting it with the <option>--sql-mode=IGNORE_SPACE</option>
-    option. Individual client programs can request this behavior by
-    using the <literal>CLIENT_IGNORE_SPACE</literal> option for
+    option. (See <xref linkend="server-sql-mode"/>.) Individual client
+    programs can request this behavior by using the
+    <literal>CLIENT_IGNORE_SPACE</literal> option for
     <literal>mysql_real_connect()</literal>. In either case, all
-    function names become reserved words. See
-    <xref linkend="server-sql-mode"/>.
+    function names become reserved words.
   </para>
 
   <para>
     For the sake of brevity, most examples in this chapter display the
     output from the <command>mysql</command> program in abbreviated
-    form. Instead of showing examples in this format:
+    form. Rather than showing examples in this format:
   </para>
 
 <programlisting>
@@ -101,6 +113,16 @@
 
       <title>&title-operator-precedence;</title>
 
+      <indexterm>
+        <primary>operators</primary>
+        <secondary>precedence</secondary>
+      </indexterm>
+
+      <indexterm>
+        <primary>precedence</primary>
+        <secondary>operator</secondary>
+      </indexterm>
+
       <para>
         Operator precedences are shown in the following list, from
         lowest precedence to the highest. Operators that are shown
@@ -134,12 +156,6 @@
         <xref linkend="server-sql-mode"/>.
       </para>
 
-    </section>
-
-    <section id="parentheses">
-
-      <title>&title-parentheses;</title>
-
       <indexterm type="function">
         <primary>() (parentheses)</primary>
       </indexterm>
@@ -158,28 +174,19 @@
         <secondary>expressions</secondary>
       </indexterm>
 
-      <itemizedlist>
+      <para>
+        The precedence of operators determines the order of evaluation
+        of terms in an expression. To override this order and group
+        terms explicitly, use parentheses. For example:
+      </para>
 
-        <listitem>
-          <para>
-            <literal>( ... )</literal>
-          </para>
-
-          <para>
-            Use parentheses to force the order of evaluation in an
-            expression. For example:
-          </para>
-
 <programlisting>
 mysql&gt; <userinput>SELECT 1+2*3;</userinput>
         -&gt; 7
 mysql&gt; <userinput>SELECT (1+2)*3;</userinput>
         -&gt; 9
 </programlisting>
-        </listitem>
 
-      </itemizedlist>
-
     </section>
 
     <section id="comparison-operators">
@@ -202,18 +209,20 @@
 
       <para>
         Comparison operations result in a value of <literal>1</literal>
-        (TRUE), <literal>0</literal> (FALSE), or
-        <literal>NULL</literal>. These operations work for both numbers
-        and strings. Strings are automatically converted to numbers and
-        numbers to strings as necessary.
+        (<literal>TRUE</literal>), <literal>0</literal>
+        (<literal>FALSE</literal>), or <literal>NULL</literal>. These
+        operations work for both numbers and strings. Strings are
+        automatically converted to numbers and numbers to strings as
+        necessary.
       </para>
 
       <para>
         Some of the functions in this section (such as
         <literal>LEAST()</literal> and <literal>GREATEST()</literal>)
-        return values other than <literal>1</literal> (TRUE),
-        <literal>0</literal> (FALSE), or <literal>NULL</literal>.
-        However, the value they return is based on comparison operations
+        return values other than <literal>1</literal>
+        (<literal>TRUE</literal>), <literal>0</literal>
+        (<literal>FALSE</literal>), or <literal>NULL</literal>. However,
+        the value they return is based on comparison operations
         performed as described by the following rules.
       </para>
 

Modified: trunk/refman-5.1/functions.xml
===================================================================
--- trunk/refman-5.1/functions.xml	2006-01-20 02:32:16 UTC (rev 941)
+++ trunk/refman-5.1/functions.xml	2006-01-20 04:32:46 UTC (rev 942)
@@ -13,6 +13,14 @@
 
   <title>&title-functions;</title>
 
+  <remark role="todo">
+    There are a number of remarks in this chapter that are out of date
+    with respect to case sensitivity. Specifically, they still carry the
+    4.0 connotation of binary string meaning a "case sensitive" string,
+    instead of the 4.1 meaning of "string of bytes without character set
+    or collation." Search for "sensitive to find these.
+  </remark>
+
   <indexterm>
     <primary>functions for <literal>SELECT</literal> and <literal>WHERE</literal>
       clauses</primary>
@@ -36,8 +44,12 @@
     <literal>DELETE</literal>, or <literal>UPDATE</literal> statement,
     or in <literal>SET</literal> statements. Expressions can be written
     using literal values, column values, <literal>NULL</literal>,
-    functions, and operators. This chapter describes the functions and
-    operators that are allowed for writing expressions in MySQL.
+    built-in functions, stored functions, user-defined functions, and
+    operators. This chapter describes the functions and operators that
+    are allowed for writing expressions in MySQL. Instructions for
+    writing stored functions and user-defined functions are given in
+    <xref linkend="stored-procedures"/>, and
+    <xref linkend="adding-functions"/>.
   </para>
 
   <para>
@@ -57,17 +69,17 @@
   <para>
     You can tell the MySQL server to accept spaces after function names
     by starting it with the <option>--sql-mode=IGNORE_SPACE</option>
-    option. Individual client programs can request this behavior by
-    using the <literal>CLIENT_IGNORE_SPACE</literal> option for
+    option. (See <xref linkend="server-sql-mode"/>.) Individual client
+    programs can request this behavior by using the
+    <literal>CLIENT_IGNORE_SPACE</literal> option for
     <literal>mysql_real_connect()</literal>. In either case, all
-    function names become reserved words. See
-    <xref linkend="server-sql-mode"/>.
+    function names become reserved words.
   </para>
 
   <para>
     For the sake of brevity, most examples in this chapter display the
     output from the <command>mysql</command> program in abbreviated
-    form. Instead of showing examples in this format:
+    form. Rather than showing examples in this format:
   </para>
 
 <programlisting>
@@ -101,6 +113,16 @@
 
       <title>&title-operator-precedence;</title>
 
+      <indexterm>
+        <primary>operators</primary>
+        <secondary>precedence</secondary>
+      </indexterm>
+
+      <indexterm>
+        <primary>precedence</primary>
+        <secondary>operator</secondary>
+      </indexterm>
+
       <para>
         Operator precedences are shown in the following list, from
         lowest precedence to the highest. Operators that are shown
@@ -133,12 +155,6 @@
         <xref linkend="server-sql-mode"/>.
       </para>
 
-    </section>
-
-    <section id="parentheses">
-
-      <title>&title-parentheses;</title>
-
       <indexterm type="function">
         <primary>() (parentheses)</primary>
       </indexterm>
@@ -157,28 +173,19 @@
         <secondary>expressions</secondary>
       </indexterm>
 
-      <itemizedlist>
+      <para>
+        The precedence of operators determines the order of evaluation
+        of terms in an expression. To override this order and group
+        terms explicitly, use parentheses. For example:
+      </para>
 
-        <listitem>
-          <para>
-            <literal>( ... )</literal>
-          </para>
-
-          <para>
-            Use parentheses to force the order of evaluation in an
-            expression. For example:
-          </para>
-
 <programlisting>
 mysql&gt; <userinput>SELECT 1+2*3;</userinput>
         -&gt; 7
 mysql&gt; <userinput>SELECT (1+2)*3;</userinput>
         -&gt; 9
 </programlisting>
-        </listitem>
 
-      </itemizedlist>
-
     </section>
 
     <section id="comparison-operators">
@@ -201,18 +208,20 @@
 
       <para>
         Comparison operations result in a value of <literal>1</literal>
-        (TRUE), <literal>0</literal> (FALSE), or
-        <literal>NULL</literal>. These operations work for both numbers
-        and strings. Strings are automatically converted to numbers and
-        numbers to strings as necessary.
+        (<literal>TRUE</literal>), <literal>0</literal>
+        (<literal>FALSE</literal>), or <literal>NULL</literal>. These
+        operations work for both numbers and strings. Strings are
+        automatically converted to numbers and numbers to strings as
+        necessary.
       </para>
 
       <para>
         Some of the functions in this section (such as
         <literal>LEAST()</literal> and <literal>GREATEST()</literal>)
-        return values other than <literal>1</literal> (TRUE),
-        <literal>0</literal> (FALSE), or <literal>NULL</literal>.
-        However, the value they return is based on comparison operations
+        return values other than <literal>1</literal>
+        (<literal>TRUE</literal>), <literal>0</literal>
+        (<literal>FALSE</literal>), or <literal>NULL</literal>. However,
+        the value they return is based on comparison operations
         performed as described by the following rules.
       </para>
 
@@ -11217,16 +11226,16 @@
   <section id="xml-functions">
 
     <title>&title-xml-functions;</title>
-    
+
     <para>
       This section discusses XML and related functionality in MySQL.
     </para>
-    
+
     <para>
       Note that it is possible to obtain XML-formatted output from MySQL
       in the <command>mysql</command> client by invoking it with the
-      <option>--xml</option> option. See 
-      <xref linkend="mysql-command-options"/>. 
+      <option>--xml</option> option. See
+      <xref linkend="mysql-command-options"/>.
     </para>
 
     <para>
@@ -11238,8 +11247,8 @@
       Note that these functions remain under development. We continue to
       improve these and other aspects of XML and XPath functionality in
       MySQL 5.1 and onwards. You may discuss these, ask questions about
-      them, and obtain help from other users with them in the 
-      <ulink url="http://forums.mysql.com/list.php?44">MySQL XML User 
+      them, and obtain help from other users with them in the
+      <ulink url="http://forums.mysql.com/list.php?44">MySQL XML User
       Forum</ulink>.
     </para>
 

Modified: trunk/refman-5.1/renamed-nodes.txt
===================================================================
--- trunk/refman-5.1/renamed-nodes.txt	2006-01-20 02:32:16 UTC (rev 941)
+++ trunk/refman-5.1/renamed-nodes.txt	2006-01-20 04:32:46 UTC (rev 942)
@@ -106,3 +106,4 @@
 fetching-spatial-data-in-wkb-format fetching-spatial-data
 fetching-spatial-data-in-wkt-format fetching-spatial-data
 gis-features-that-are-not-yet-implemented mysql-gis-conformance-and-compatibility
+parentheses operator-precedence

Modified: trunk/refman-common/news-5.1.xml
===================================================================
--- trunk/refman-common/news-5.1.xml	2006-01-20 02:32:16 UTC (rev 941)
+++ trunk/refman-common/news-5.1.xml	2006-01-20 04:32:46 UTC (rev 942)
@@ -324,14 +324,10 @@
           <literal>LIST</literal> a value less than any specified in one
           of the table's partition definitions resulted in a server
           crash. In such cases, <command>mysqld</command> now returns
-
           <errortext>ERROR 1500 (HY000): Table has no partition for
-          value <replaceable>v</replaceable>
-
-          </errortext>
-
-          , where <replaceable>v</replaceable> is the out-of-range
-          value. (Bug #15819)
+          value <replaceable>v</replaceable></errortext>, where
+          <replaceable>v</replaceable> is the out-of-range value. (Bug
+          #15819)
         </para>
       </listitem>
 
@@ -477,11 +473,8 @@
 
         <para>
           Previously, attempting to do so would produce the error
-
           <errortext>All partitions must have unique names in the
-          table</errortext>
-
-          . (Bug #15521)
+          table</errortext>. (Bug #15521)
         </para>
       </listitem>
 

Modified: trunk/refman-common/titles.en.ent
===================================================================
--- trunk/refman-common/titles.en.ent	2006-01-20 02:32:16 UTC (rev 941)
+++ trunk/refman-common/titles.en.ent	2006-01-20 04:32:46 UTC (rev 942)
@@ -1300,7 +1300,6 @@
 <!ENTITY title-pack-isam-for-manpage "generate compressed, read-only <literal>ISAM</literal> tables">
 <!ENTITY title-packages "Packages that support MySQL">
 <!ENTITY title-packet-too-large "<literal>Packet too large</literal>">
-<!ENTITY title-parentheses "Parentheses">
 <!ENTITY title-partitioning "Partitioning">
 <!ENTITY title-partitioning-handling-nulls "How MySQL Partitioning Handles <literal>NULL</literal> Values">
 <!ENTITY title-partitioning-hash "<literal>HASH</literal> Partitioning">
@@ -1626,6 +1625,7 @@
 <!ENTITY title-twin "Queries from the Twin Project">
 <!ENTITY title-twin-event "Show a Table of Twin Pair Status">
 <!ENTITY title-twin-pool "Find All Non-distributed Twins">
+<!ENTITY title-type-conversion "Type Conversion in Expression Evaluation">
 <!ENTITY title-types-of-mysql-odbc-drivers "Types of MySQL ODBC Drivers">
 <!ENTITY title-udf-aggr-calling "UDF Calling Sequences for Aggregate Functions">
 <!ENTITY title-udf-arguments "UDF Argument Processing">

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