List:Commits« Previous MessageNext Message »
From:paul Date:February 20 2007 3:24pm
Subject:svn commit - mysqldoc@docsrva: r5000 - in trunk: . refman-4.1 refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2007-02-20 16:24:00 +0100 (Tue, 20 Feb 2007)
New Revision: 5000

Log:
 r16584@frost:  paul | 2007-02-20 08:17:35 -0600
 Point out for some functions that their value is for the current time zone.


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

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


Modified: trunk/refman-4.1/functions.xml
===================================================================
--- trunk/refman-4.1/functions.xml	2007-02-20 14:42:34 UTC (rev 4999)
+++ trunk/refman-4.1/functions.xml	2007-02-20 15:24:00 UTC (rev 5000)
Changed blocks: 3, Lines Added: 6, Lines Deleted: 3; 1676 bytes

@@ -6356,7 +6356,8 @@
           Returns the current time as a value in
           <literal>'HH:MM:SS'</literal> or <literal>HHMMSS</literal>
           format, depending on whether the function is used in a string
-          or numeric context.
+          or numeric context. The value is expressed in the current time
+          zone.
         </para>
 
         <remark role="help-description-end"/>

@@ -7355,7 +7356,8 @@
           <replaceable>unix_timestamp</replaceable> argument as a value
           in <literal>'YYYY-MM-DD HH:MM:SS'</literal> or
           <literal>YYYYMMDDHHMMSS</literal> format, depending on whether
-          the function is used in a string or numeric context.
+          the function is used in a string or numeric context. The value
+          is expressed in the current time zone.
           <replaceable>unix_timestamp</replaceable> is an internal
           timestamp value such as is produced by the
           <literal>UNIX_TIMESTAMP()</literal> function.

@@ -7930,7 +7932,8 @@
           Returns the current date and time as a value in
           <literal>'YYYY-MM-DD HH:MM:SS'</literal> or
           <literal>YYYYMMDDHHMMSS</literal> format, depending on whether
-          the function is used in a string or numeric context.
+          the function is used in a string or numeric context. The value
+          is expressed in the current time zone.
         </para>
 
         <remark role="help-description-end"/>


Modified: trunk/refman-5.0/functions.xml
===================================================================
--- trunk/refman-5.0/functions.xml	2007-02-20 14:42:34 UTC (rev 4999)
+++ trunk/refman-5.0/functions.xml	2007-02-20 15:24:00 UTC (rev 5000)
Changed blocks: 5, Lines Added: 28, Lines Deleted: 20; 5048 bytes

@@ -102,25 +102,31 @@
 mysql&gt; <userinput>SELECT MOD(29,9);</userinput>
         -&gt; 2
 </programlisting>
-  
+
   <note>
     <para>
-      Given the size of this chapter, locating information about a specific function or operator 
-      can be time consuming. To simplify this task, anchors for each function and operator have been added
-      to the manual. In the HTML version of this document it is possible to navigate
-      directly to a specific function if you know the HTML page where that function appears. You can do this by 
-      appending <literal>#function_<replaceable>function-name</replaceable></literal>
-      to the URL. For example, to find out information about the <literal>DATE_FORMAT</literal> function
-      using the online version of the manual, go to the page that deals with date and time functions 
-      (<ulink url="&base-url-refman;/5.1/en/date-and-time-functions.html"></ulink>) and 
-      append <literal>#function_date-format</literal> to the address in the address bar of your web browser.
-      This will take you directly to the <literal>DATE_FORMAT</literal> function. If you have downloaded
-      the single page version of the manual you simply need to add the appropriate anchor reference.
-      In a similar fashion, you can navigate directly to an operator by appending <literal>#operator_<replaceable>operator-name</replaceable></literal>
+      Given the size of this chapter, locating information about a
+      specific function or operator can be time consuming. To simplify
+      this task, anchors for each function and operator have been added
+      to the manual. In the HTML version of this document it is possible
+      to navigate directly to a specific function if you know the HTML
+      page where that function appears. You can do this by appending
+      <literal>#function_<replaceable>function-name</replaceable></literal>
+      to the URL. For example, to find out information about the
+      <literal>DATE_FORMAT</literal> function using the online version
+      of the manual, go to the page that deals with date and time
+      functions
+      (<ulink url="&base-url-refman;/5.1/en/date-and-time-functions.html"></ulink>)
+      and append <literal>#function_date-format</literal> to the address
+      in the address bar of your web browser. This will take you
+      directly to the <literal>DATE_FORMAT</literal> function. If you
+      have downloaded the single page version of the manual you simply
+      need to add the appropriate anchor reference. In a similar
+      fashion, you can navigate directly to an operator by appending
+      <literal>#operator_<replaceable>operator-name</replaceable></literal>
       to the appropriate URL.
     </para>
   </note>
-  
 
   <remark role="todo">
     rename node to Operators

@@ -6522,7 +6528,8 @@
           Returns the current time as a value in
           <literal>'HH:MM:SS'</literal> or <literal>HHMMSS</literal>
           format, depending on whether the function is used in a string
-          or numeric context.
+          or numeric context. The value is expressed in the current time
+          zone.
         </para>
 
         <remark role="help-description-end"/>

@@ -7475,7 +7482,8 @@
           <replaceable>unix_timestamp</replaceable> argument as a value
           in <literal>'YYYY-MM-DD HH:MM:SS'</literal> or
           <literal>YYYYMMDDHHMMSS</literal> format, depending on whether
-          the function is used in a string or numeric context.
+          the function is used in a string or numeric context. The value
+          is expressed in the current time zone.
           <replaceable>unix_timestamp</replaceable> is an internal
           timestamp value such as is produced by the
           <literal>UNIX_TIMESTAMP()</literal> function.

@@ -8024,7 +8032,8 @@
           Returns the current date and time as a value in
           <literal>'YYYY-MM-DD HH:MM:SS'</literal> or
           <literal>YYYYMMDDHHMMSS</literal> format, depending on whether
-          the function is used in a string or numeric context.
+          the function is used in a string or numeric context. The value
+          is expressed in the current time zone.
         </para>
 
         <remark role="help-description-end"/>

@@ -13514,9 +13523,8 @@
             generated value that was set for an
             <literal>AUTO_INCREMENT</literal> column by the
             <emphasis>most recently executed</emphasis>
-            <literal>INSERT</literal> 
-            statement to affect such a column. For example, after
-            inserting a row that generates an
+            <literal>INSERT</literal> statement to affect such a column.
+            For example, after inserting a row that generates an
             <literal>AUTO_INCREMENT</literal> value, you can get the
             value like this:
           </para>


Modified: trunk/refman-5.1/functions.xml
===================================================================
--- trunk/refman-5.1/functions.xml	2007-02-20 14:42:34 UTC (rev 4999)
+++ trunk/refman-5.1/functions.xml	2007-02-20 15:24:00 UTC (rev 5000)
Changed blocks: 7, Lines Added: 337, Lines Deleted: 328; 30111 bytes

@@ -4480,187 +4480,188 @@
 
     </section>
 
-<section id="regexp">
+    <section id="regexp">
 
-  <title>Regular Expressions</title>
+      <title>Regular Expressions</title>
 
-  <indexterm>
-    <primary>REGEXP operator</primary>
-  </indexterm>
+      <indexterm>
+        <primary>REGEXP operator</primary>
+      </indexterm>
 
-  <indexterm>
-    <primary>pattern matching</primary>
-  </indexterm>
+      <indexterm>
+        <primary>pattern matching</primary>
+      </indexterm>
 
-  <indexterm>
-    <primary>regular expression syntax</primary>
-  </indexterm>
+      <indexterm>
+        <primary>regular expression syntax</primary>
+      </indexterm>
 
-  <indexterm>
-    <primary>syntax</primary>
-    <secondary>regular expression</secondary>
-  </indexterm>
+      <indexterm>
+        <primary>syntax</primary>
+        <secondary>regular expression</secondary>
+      </indexterm>
 
-  <para>
-    A regular expression is a powerful way of specifying a pattern for a
-    complex search.
-  </para>
+      <para>
+        A regular expression is a powerful way of specifying a pattern
+        for a complex search.
+      </para>
 
-  <para>
-    MySQL uses Henry Spencer's implementation of regular expressions,
-    which is aimed at conformance with POSIX 1003.2. See
-    <xref linkend="credits"/>. MySQL uses the extended version to
-    support pattern-matching operations performed with the
-    <literal>REGEXP</literal> operator in SQL statements. See
-    <xref linkend="pattern-matching"/>, and
-    <xref linkend="string-comparison-functions"/>.
-  </para>
+      <para>
+        MySQL uses Henry Spencer's implementation of regular
+        expressions, which is aimed at conformance with POSIX 1003.2.
+        See <xref linkend="credits"/>. MySQL uses the extended version
+        to support pattern-matching operations performed with the
+        <literal>REGEXP</literal> operator in SQL statements. See
+        <xref linkend="pattern-matching"/>, and
+        <xref linkend="string-comparison-functions"/>.
+      </para>
 
-  <para>
-    This section is a summary, with examples, of the special characters
-    and constructs that can be used in MySQL for
-    <literal>REGEXP</literal> operations. It does not contain all the
-    details that can be found in Henry Spencer's
-    <literal>regex(7)</literal> manual page. That manual page is
-    included in MySQL source distributions, in the
-    <filename>regex.7</filename> file under the
-    <filename>regex</filename> directory.
-  </para>
+      <para>
+        This section is a summary, with examples, of the special
+        characters and constructs that can be used in MySQL for
+        <literal>REGEXP</literal> operations. It does not contain all
+        the details that can be found in Henry Spencer's
+        <literal>regex(7)</literal> manual page. That manual page is
+        included in MySQL source distributions, in the
+        <filename>regex.7</filename> file under the
+        <filename>regex</filename> directory.
+      </para>
 
-  <para>
-    A regular expression describes a set of strings. The simplest
-    regular expression is one that has no special characters in it. For
-    example, the regular expression <literal>hello</literal> matches
-    <literal>hello</literal> and nothing else.
-  </para>
+      <para>
+        A regular expression describes a set of strings. The simplest
+        regular expression is one that has no special characters in it.
+        For example, the regular expression <literal>hello</literal>
+        matches <literal>hello</literal> and nothing else.
+      </para>
 
-  <para>
-    Non-trivial regular expressions use certain special constructs so
-    that they can match more than one string. For example, the regular
-    expression <literal>hello|word</literal> matches either the string
-    <literal>hello</literal> or the string <literal>word</literal>.
-  </para>
+      <para>
+        Non-trivial regular expressions use certain special constructs
+        so that they can match more than one string. For example, the
+        regular expression <literal>hello|word</literal> matches either
+        the string <literal>hello</literal> or the string
+        <literal>word</literal>.
+      </para>
 
-  <para>
-    As a more complex example, the regular expression
-    <literal>B[an]*s</literal> matches any of the strings
-    <literal>Bananas</literal>, <literal>Baaaaas</literal>,
-    <literal>Bs</literal>, and any other string starting with a
-    <literal>B</literal>, ending with an <literal>s</literal>, and
-    containing any number of <literal>a</literal> or
-    <literal>n</literal> characters in between.
-  </para>
-
-  <para>
-    A regular expression for the <literal>REGEXP</literal> operator may
-    use any of the following special characters and constructs:
-  </para>
-
-  <itemizedlist>
-
-    <listitem>
       <para>
-        <literal>^</literal>
+        As a more complex example, the regular expression
+        <literal>B[an]*s</literal> matches any of the strings
+        <literal>Bananas</literal>, <literal>Baaaaas</literal>,
+        <literal>Bs</literal>, and any other string starting with a
+        <literal>B</literal>, ending with an <literal>s</literal>, and
+        containing any number of <literal>a</literal> or
+        <literal>n</literal> characters in between.
       </para>
 
       <para>
-        Match the beginning of a string.
+        A regular expression for the <literal>REGEXP</literal> operator
+        may use any of the following special characters and constructs:
       </para>
 
+      <itemizedlist>
+
+        <listitem>
+          <para>
+            <literal>^</literal>
+          </para>
+
+          <para>
+            Match the beginning of a string.
+          </para>
+
 <programlisting>
 mysql&gt; <userinput>SELECT 'fo\nfo' REGEXP '^fo$';</userinput>                   -&gt; 0
 mysql&gt; <userinput>SELECT 'fofo' REGEXP '^fo';</userinput>                      -&gt; 1
 </programlisting>
-    </listitem>
+        </listitem>
 
-    <listitem>
-      <para>
-        <literal>$</literal>
-      </para>
+        <listitem>
+          <para>
+            <literal>$</literal>
+          </para>
 
-      <para>
-        Match the end of a string.
-      </para>
+          <para>
+            Match the end of a string.
+          </para>
 
 <programlisting>
 mysql&gt; <userinput>SELECT 'fo\no' REGEXP '^fo\no$';</userinput>                 -&gt; 1
 mysql&gt; <userinput>SELECT 'fo\no' REGEXP '^fo$';</userinput>                    -&gt; 0
 </programlisting>
-    </listitem>
+        </listitem>
 
-    <listitem>
-      <para>
-        <literal>.</literal>
-      </para>
+        <listitem>
+          <para>
+            <literal>.</literal>
+          </para>
 
-      <para>
-        Match any character (including carriage return and newline).
-      </para>
+          <para>
+            Match any character (including carriage return and newline).
+          </para>
 
 <programlisting>
 mysql&gt; <userinput>SELECT 'fofo' REGEXP '^f.*$';</userinput>                    -&gt; 1
 mysql&gt; <userinput>SELECT 'fo\r\nfo' REGEXP '^f.*$';</userinput>                -&gt; 1
 </programlisting>
-    </listitem>
+        </listitem>
 
-    <listitem>
-      <para>
-        <literal>a*</literal>
-      </para>
+        <listitem>
+          <para>
+            <literal>a*</literal>
+          </para>
 
-      <para>
-        Match any sequence of zero or more <literal>a</literal>
-        characters.
-      </para>
+          <para>
+            Match any sequence of zero or more <literal>a</literal>
+            characters.
+          </para>
 
 <programlisting>
 mysql&gt; <userinput>SELECT 'Ban' REGEXP '^Ba*n';</userinput>                     -&gt; 1
 mysql&gt; <userinput>SELECT 'Baaan' REGEXP '^Ba*n';</userinput>                   -&gt; 1
 mysql&gt; <userinput>SELECT 'Bn' REGEXP '^Ba*n';</userinput>                      -&gt; 1
 </programlisting>
-    </listitem>
+        </listitem>
 
-    <listitem>
-      <para>
-        <literal>a+</literal>
-      </para>
+        <listitem>
+          <para>
+            <literal>a+</literal>
+          </para>
 
-      <para>
-        Match any sequence of one or more <literal>a</literal>
-        characters.
-      </para>
+          <para>
+            Match any sequence of one or more <literal>a</literal>
+            characters.
+          </para>
 
 <programlisting>
 mysql&gt; <userinput>SELECT 'Ban' REGEXP '^Ba+n';</userinput>                     -&gt; 1
 mysql&gt; <userinput>SELECT 'Bn' REGEXP '^Ba+n';</userinput>                      -&gt; 0
 </programlisting>
-    </listitem>
+        </listitem>
 
-    <listitem>
-      <para>
-        <literal>a?</literal>
-      </para>
+        <listitem>
+          <para>
+            <literal>a?</literal>
+          </para>
 
-      <para>
-        Match either zero or one <literal>a</literal> character.
-      </para>
+          <para>
+            Match either zero or one <literal>a</literal> character.
+          </para>
 
 <programlisting>
 mysql&gt; <userinput>SELECT 'Bn' REGEXP '^Ba?n';</userinput>                      -&gt; 1
 mysql&gt; <userinput>SELECT 'Ban' REGEXP '^Ba?n';</userinput>                     -&gt; 1
 mysql&gt; <userinput>SELECT 'Baan' REGEXP '^Ba?n';</userinput>                    -&gt; 0
 </programlisting>
-    </listitem>
+        </listitem>
 
-    <listitem>
-      <para>
-        <literal>de|abc</literal>
-      </para>
+        <listitem>
+          <para>
+            <literal>de|abc</literal>
+          </para>
 
-      <para>
-        Match either of the sequences <literal>de</literal> or
-        <literal>abc</literal>.
-      </para>
+          <para>
+            Match either of the sequences <literal>de</literal> or
+            <literal>abc</literal>.
+          </para>
 
 <programlisting>
 mysql&gt; <userinput>SELECT 'pi' REGEXP 'pi|apa';</userinput>                     -&gt; 1

@@ -4670,115 +4671,118 @@
 mysql&gt; <userinput>SELECT 'pi' REGEXP '^(pi|apa)$';</userinput>                 -&gt; 1
 mysql&gt; <userinput>SELECT 'pix' REGEXP '^(pi|apa)$';</userinput>                -&gt; 0
 </programlisting>
-    </listitem>
+        </listitem>
 
-    <listitem>
-      <para>
-        <literal>(abc)*</literal>
-      </para>
+        <listitem>
+          <para>
+            <literal>(abc)*</literal>
+          </para>
 
-      <para>
-        Match zero or more instances of the sequence
-        <literal>abc</literal>.
-      </para>
+          <para>
+            Match zero or more instances of the sequence
+            <literal>abc</literal>.
+          </para>
 
 <programlisting>
 mysql&gt; <userinput>SELECT 'pi' REGEXP '^(pi)*$';</userinput>                    -&gt; 1
 mysql&gt; <userinput>SELECT 'pip' REGEXP '^(pi)*$';</userinput>                   -&gt; 0
 mysql&gt; <userinput>SELECT 'pipi' REGEXP '^(pi)*$';</userinput>                  -&gt; 1
 </programlisting>
-    </listitem>
+        </listitem>
 
-    <listitem>
-      <para>
-        <literal>{1}</literal>, <literal>{2,3}</literal>
-      </para>
-
-      <para>
-        <literal>{n}</literal> or <literal>{m,n}</literal> notation
-        provides a more general way of writing regular expressions that
-        match many occurrences of the previous atom (or
-        <quote>piece</quote>) of the pattern. <literal>m</literal> and
-        <literal>n</literal> are integers.
-      </para>
-
-      <itemizedlist>
-
         <listitem>
           <para>
-            <literal>a*</literal>
+            <literal>{1}</literal>, <literal>{2,3}</literal>
           </para>
 
           <para>
-            Can be written as <literal>a{0,}</literal>.
+            <literal>{n}</literal> or <literal>{m,n}</literal> notation
+            provides a more general way of writing regular expressions
+            that match many occurrences of the previous atom (or
+            <quote>piece</quote>) of the pattern. <literal>m</literal>
+            and <literal>n</literal> are integers.
           </para>
-        </listitem>
 
-        <listitem>
-          <para>
-            <literal>a+</literal>
-          </para>
+          <itemizedlist>
 
-          <para>
-            Can be written as <literal>a{1,}</literal>.
-          </para>
-        </listitem>
+            <listitem>
+              <para>
+                <literal>a*</literal>
+              </para>
 
-        <listitem>
+              <para>
+                Can be written as <literal>a{0,}</literal>.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                <literal>a+</literal>
+              </para>
+
+              <para>
+                Can be written as <literal>a{1,}</literal>.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                <literal>a?</literal>
+              </para>
+
+              <para>
+                Can be written as <literal>a{0,1}</literal>.
+              </para>
+            </listitem>
+
+          </itemizedlist>
+
           <para>
-            <literal>a?</literal>
+            To be more precise, <literal>a{n}</literal> matches exactly
+            <literal>n</literal> instances of <literal>a</literal>.
+            <literal>a{n,}</literal> matches <literal>n</literal> or
+            more instances of <literal>a</literal>.
+            <literal>a{m,n}</literal> matches <literal>m</literal>
+            through <literal>n</literal> instances of
+            <literal>a</literal>, inclusive.
           </para>
 
           <para>
-            Can be written as <literal>a{0,1}</literal>.
+            <literal>m</literal> and <literal>n</literal> must be in the
+            range from <literal>0</literal> to
+            <literal>RE_DUP_MAX</literal> (default 255), inclusive. If
+            both <literal>m</literal> and <literal>n</literal> are
+            given, <literal>m</literal> must be less than or equal to
+            <literal>n</literal>.
           </para>
-        </listitem>
 
-      </itemizedlist>
-
-      <para>
-        To be more precise, <literal>a{n}</literal> matches exactly
-        <literal>n</literal> instances of <literal>a</literal>.
-        <literal>a{n,}</literal> matches <literal>n</literal> or more
-        instances of <literal>a</literal>. <literal>a{m,n}</literal>
-        matches <literal>m</literal> through <literal>n</literal>
-        instances of <literal>a</literal>, inclusive.
-      </para>
-
-      <para>
-        <literal>m</literal> and <literal>n</literal> must be in the
-        range from <literal>0</literal> to <literal>RE_DUP_MAX</literal>
-        (default 255), inclusive. If both <literal>m</literal> and
-        <literal>n</literal> are given, <literal>m</literal> must be
-        less than or equal to <literal>n</literal>.
-      </para>
-
 <programlisting>
 mysql&gt; <userinput>SELECT 'abcde' REGEXP 'a[bcd]{2}e';</userinput>              -&gt; 0
 mysql&gt; <userinput>SELECT 'abcde' REGEXP 'a[bcd]{3}e';</userinput>              -&gt; 1
 mysql&gt; <userinput>SELECT 'abcde' REGEXP 'a[bcd]{1,10}e';</userinput>           -&gt; 1
 </programlisting>
-    </listitem>
+        </listitem>
 
-    <listitem>
-      <para>
-        <literal>[a-dX]</literal>, <literal>[^a-dX]</literal>
-      </para>
+        <listitem>
+          <para>
+            <literal>[a-dX]</literal>, <literal>[^a-dX]</literal>
+          </para>
 
-      <para>
-        Matches any character that is (or is not, if ^ is used) either
-        <literal>a</literal>, <literal>b</literal>,
-        <literal>c</literal>, <literal>d</literal> or
-        <literal>X</literal>. A <literal>-</literal> character between
-        two other characters forms a range that matches all characters
-        from the first character to the second. For example,
-        <literal>[0-9]</literal> matches any decimal digit. To include a
-        literal <literal>]</literal> character, it must immediately
-        follow the opening bracket <literal>[</literal>. To include a
-        literal <literal>-</literal> character, it must be written first
-        or last. Any character that does not have a defined special
-        meaning inside a <literal>[]</literal> pair matches only itself.
-      </para>
+          <para>
+            Matches any character that is (or is not, if ^ is used)
+            either <literal>a</literal>, <literal>b</literal>,
+            <literal>c</literal>, <literal>d</literal> or
+            <literal>X</literal>. A <literal>-</literal> character
+            between two other characters forms a range that matches all
+            characters from the first character to the second. For
+            example, <literal>[0-9]</literal> matches any decimal digit.
+            To include a literal <literal>]</literal> character, it must
+            immediately follow the opening bracket <literal>[</literal>.
+            To include a literal <literal>-</literal> character, it must
+            be written first or last. Any character that does not have a
+            defined special meaning inside a <literal>[]</literal> pair
+            matches only itself.
+          </para>
 
 <programlisting>
 mysql&gt; <userinput>SELECT 'aXbc' REGEXP '[a-dXYZ]';</userinput>                 -&gt; 1

@@ -4788,157 +4792,159 @@
 mysql&gt; <userinput>SELECT 'gheis' REGEXP '^[^a-dXYZ]+$';</userinput>            -&gt; 1
 mysql&gt; <userinput>SELECT 'gheisa' REGEXP '^[^a-dXYZ]+$';</userinput>           -&gt; 0
 </programlisting>
-    </listitem>
+        </listitem>
 
-    <listitem>
-      <para>
-        <literal>[.characters.]</literal>
-      </para>
+        <listitem>
+          <para>
+            <literal>[.characters.]</literal>
+          </para>
 
-      <para>
-        Within a bracket expression (written using <literal>[</literal>
-        and <literal>]</literal>), matches the sequence of characters of
-        that collating element. <literal>characters</literal> is either
-        a single character or a character name like
-        <literal>newline</literal>. You can find the full list of
-        character names in the <filename>regexp/cname.h</filename> file.
-      </para>
+          <para>
+            Within a bracket expression (written using
+            <literal>[</literal> and <literal>]</literal>), matches the
+            sequence of characters of that collating element.
+            <literal>characters</literal> is either a single character
+            or a character name like <literal>newline</literal>. You can
+            find the full list of character names in the
+            <filename>regexp/cname.h</filename> file.
+          </para>
 
 <programlisting>
 mysql&gt; <userinput>SELECT '~' REGEXP '[[.~.]]';</userinput>                     -&gt; 1
 mysql&gt; <userinput>SELECT '~' REGEXP '[[.tilde.]]';</userinput>                 -&gt; 1
 </programlisting>
-    </listitem>
+        </listitem>
 
-    <listitem>
-      <para>
-        <literal>[=character_class=]</literal>
-      </para>
+        <listitem>
+          <para>
+            <literal>[=character_class=]</literal>
+          </para>
 
-      <para>
-        Within a bracket expression (written using <literal>[</literal>
-        and <literal>]</literal>),
-        <literal>[=character_class=]</literal> represents an equivalence
-        class. It matches all characters with the same collation value,
-        including itself. For example, if <literal>o</literal> and
-        <literal>(+)</literal> are the members of an equivalence class,
-        then <literal>[[=o=]]</literal>, <literal>[[=(+)=]]</literal>,
-        and <literal>[o(+)]</literal> are all synonymous. An equivalence
-        class may not be used as an endpoint of a range.
-      </para>
-    </listitem>
+          <para>
+            Within a bracket expression (written using
+            <literal>[</literal> and <literal>]</literal>),
+            <literal>[=character_class=]</literal> represents an
+            equivalence class. It matches all characters with the same
+            collation value, including itself. For example, if
+            <literal>o</literal> and <literal>(+)</literal> are the
+            members of an equivalence class, then
+            <literal>[[=o=]]</literal>, <literal>[[=(+)=]]</literal>,
+            and <literal>[o(+)]</literal> are all synonymous. An
+            equivalence class may not be used as an endpoint of a range.
+          </para>
+        </listitem>
 
-    <listitem>
-      <para>
-        <literal>[:character_class:]</literal>
-      </para>
+        <listitem>
+          <para>
+            <literal>[:character_class:]</literal>
+          </para>
 
-      <para>
-        Within a bracket expression (written using <literal>[</literal>
-        and <literal>]</literal>),
-        <literal>[:character_class:]</literal> represents a character
-        class that matches all characters belonging to that class. The
-        following table lists the standard class names. These names
-        stand for the character classes defined in the
-        <literal>ctype(3)</literal> manual page. A particular locale may
-        provide other class names. A character class may not be used as
-        an endpoint of a range.
-      </para>
+          <para>
+            Within a bracket expression (written using
+            <literal>[</literal> and <literal>]</literal>),
+            <literal>[:character_class:]</literal> represents a
+            character class that matches all characters belonging to
+            that class. The following table lists the standard class
+            names. These names stand for the character classes defined
+            in the <literal>ctype(3)</literal> manual page. A particular
+            locale may provide other class names. A character class may
+            not be used as an endpoint of a range.
+          </para>
 
-      <informaltable>
-        <tgroup cols="2">
-          <colspec colwidth="10*"/>
-          <colspec colwidth="90*"/>
-          <tbody>
-            <row>
-              <entry><literal>alnum</literal></entry>
-              <entry>Alphanumeric characters</entry>
-            </row>
-            <row>
-              <entry><literal>alpha</literal></entry>
-              <entry>Alphabetic characters</entry>
-            </row>
-            <row>
-              <entry><literal>blank</literal></entry>
-              <entry>Whitespace characters</entry>
-            </row>
-            <row>
-              <entry><literal>cntrl</literal></entry>
-              <entry>Control characters</entry>
-            </row>
-            <row>
-              <entry><literal>digit</literal></entry>
-              <entry>Digit characters</entry>
-            </row>
-            <row>
-              <entry><literal>graph</literal></entry>
-              <entry>Graphic characters</entry>
-            </row>
-            <row>
-              <entry><literal>lower</literal></entry>
-              <entry>Lowercase alphabetic characters</entry>
-            </row>
-            <row>
-              <entry><literal>print</literal></entry>
-              <entry>Graphic or space characters</entry>
-            </row>
-            <row>
-              <entry><literal>punct</literal></entry>
-              <entry>Punctuation characters</entry>
-            </row>
-            <row>
-              <entry><literal>space</literal></entry>
-              <entry>Space, tab, newline, and carriage return</entry>
-            </row>
-            <row>
-              <entry><literal>upper</literal></entry>
-              <entry>Uppercase alphabetic characters</entry>
-            </row>
-            <row>
-              <entry><literal>xdigit</literal></entry>
-              <entry>Hexadecimal digit characters</entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </informaltable>
+          <informaltable>
+            <tgroup cols="2">
+              <colspec colwidth="10*"/>
+              <colspec colwidth="90*"/>
+              <tbody>
+                <row>
+                  <entry><literal>alnum</literal></entry>
+                  <entry>Alphanumeric characters</entry>
+                </row>
+                <row>
+                  <entry><literal>alpha</literal></entry>
+                  <entry>Alphabetic characters</entry>
+                </row>
+                <row>
+                  <entry><literal>blank</literal></entry>
+                  <entry>Whitespace characters</entry>
+                </row>
+                <row>
+                  <entry><literal>cntrl</literal></entry>
+                  <entry>Control characters</entry>
+                </row>
+                <row>
+                  <entry><literal>digit</literal></entry>
+                  <entry>Digit characters</entry>
+                </row>
+                <row>
+                  <entry><literal>graph</literal></entry>
+                  <entry>Graphic characters</entry>
+                </row>
+                <row>
+                  <entry><literal>lower</literal></entry>
+                  <entry>Lowercase alphabetic characters</entry>
+                </row>
+                <row>
+                  <entry><literal>print</literal></entry>
+                  <entry>Graphic or space characters</entry>
+                </row>
+                <row>
+                  <entry><literal>punct</literal></entry>
+                  <entry>Punctuation characters</entry>
+                </row>
+                <row>
+                  <entry><literal>space</literal></entry>
+                  <entry>Space, tab, newline, and carriage return</entry>
+                </row>
+                <row>
+                  <entry><literal>upper</literal></entry>
+                  <entry>Uppercase alphabetic characters</entry>
+                </row>
+                <row>
+                  <entry><literal>xdigit</literal></entry>
+                  <entry>Hexadecimal digit characters</entry>
+                </row>
+              </tbody>
+            </tgroup>
+          </informaltable>
 
 <programlisting>
 mysql&gt; <userinput>SELECT 'justalnums' REGEXP '[[:alnum:]]+';</userinput>       -&gt; 1
 mysql&gt; <userinput>SELECT '!!' REGEXP '[[:alnum:]]+';</userinput>               -&gt; 0
 </programlisting>
-    </listitem>
+        </listitem>
 
-    <listitem>
-      <para>
-        <literal>[[:&lt;:]]</literal>, <literal>[[:&gt;:]]</literal>
-      </para>
+        <listitem>
+          <para>
+            <literal>[[:&lt;:]]</literal>, <literal>[[:&gt;:]]</literal>
+          </para>
 
-      <para>
-        These markers stand for word boundaries. They match the
-        beginning and end of words, respectively. A word is a sequence
-        of word characters that is not preceded by or followed by word
-        characters. A word character is an alphanumeric character in the
-        <literal>alnum</literal> class or an underscore
-        (<literal>_</literal>).
-      </para>
+          <para>
+            These markers stand for word boundaries. They match the
+            beginning and end of words, respectively. A word is a
+            sequence of word characters that is not preceded by or
+            followed by word characters. A word character is an
+            alphanumeric character in the <literal>alnum</literal> class
+            or an underscore (<literal>_</literal>).
+          </para>
 
 <programlisting>
 mysql&gt; <userinput>SELECT 'a word a' REGEXP '[[:&lt;:]]word[[:&gt;:]]';</userinput>   -&gt; 1
 mysql&gt; <userinput>SELECT 'a xword a' REGEXP '[[:&lt;:]]word[[:&gt;:]]';</userinput>  -&gt; 0
 </programlisting>
-    </listitem>
+        </listitem>
 
-  </itemizedlist>
+      </itemizedlist>
 
-  <para>
-    To use a literal instance of a special character in a regular
-    expression, precede it by two backslash (\) characters. The MySQL
-    parser interprets one of the backslashes, and the regular expression
-    library interprets the other. For example, to match the string
-    <literal>1+2</literal> that contains the special
-    <literal>+</literal> character, only the last of the following
-    regular expressions is the correct one:
-  </para>
+      <para>
+        To use a literal instance of a special character in a regular
+        expression, precede it by two backslash (\) characters. The
+        MySQL parser interprets one of the backslashes, and the regular
+        expression library interprets the other. For example, to match
+        the string <literal>1+2</literal> that contains the special
+        <literal>+</literal> character, only the last of the following
+        regular expressions is the correct one:
+      </para>
 
 <programlisting>
 mysql&gt; <userinput>SELECT '1+2' REGEXP '1+2';</userinput>                       -&gt; 0

@@ -4946,7 +4952,7 @@
 mysql&gt; <userinput>SELECT '1+2' REGEXP '1\\+2';</userinput>                     -&gt; 1
 </programlisting>
 
-</section>
+    </section>
 
   </section>
 

@@ -6963,7 +6969,8 @@
           Returns the current time as a value in
           <literal>'HH:MM:SS'</literal> or <literal>HHMMSS</literal>
           format, depending on whether the function is used in a string
-          or numeric context.
+          or numeric context. The value is expressed in the current time
+          zone.
         </para>
 
         <remark role="help-description-end"/>

@@ -7910,7 +7917,8 @@
           <replaceable>unix_timestamp</replaceable> argument as a value
           in <literal>'YYYY-MM-DD HH:MM:SS'</literal> or
           <literal>YYYYMMDDHHMMSS</literal> format, depending on whether
-          the function is used in a string or numeric context.
+          the function is used in a string or numeric context. The value
+          is expressed in the current time zone.
           <replaceable>unix_timestamp</replaceable> is an internal
           timestamp value such as is produced by the
           <literal>UNIX_TIMESTAMP()</literal> function.

@@ -8459,7 +8467,8 @@
           Returns the current date and time as a value in
           <literal>'YYYY-MM-DD HH:MM:SS'</literal> or
           <literal>YYYYMMDDHHMMSS</literal> format, depending on whether
-          the function is used in a string or numeric context.
+          the function is used in a string or numeric context. The value
+          is expressed in the current time zone.
         </para>
 
         <remark role="help-description-end"/>


Thread
svn commit - mysqldoc@docsrva: r5000 - in trunk: . refman-4.1 refman-5.0 refman-5.1paul20 Feb