List:Internals« Previous MessageNext Message »
From:paul Date:August 12 2005 3:06am
Subject:bk commit - mysqldoc@docsrva tree (paul:1.3255)
View as plain text  
Below is the list of changes that have just been committed into a local
mysqldoc repository of paul. When paul does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.3255 05/08/11 22:06:42 paul@stripped +5 -0
  Document SLEEP() function.

  refman/functions.xml
    1.23 05/08/11 22:06:39 paul@stripped +34 -13
    Document SLEEP() function.

  refman-common/news-5.0.xml
    1.32 05/08/11 22:06:38 paul@stripped +7 -0
    Document SLEEP() function.

  refman-5.1/functions.xml
    1.3 05/08/11 22:06:38 paul@stripped +35 -14
    Sync.

  refman-5.0/functions.xml
    1.4 05/08/11 22:06:38 paul@stripped +33 -12
    Sync.

  refman-4.1/functions.xml
    1.25 05/08/11 22:06:38 paul@stripped +145 -126
    Sync.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	paul
# Host:	frost.snake.net
# Root:	/Volumes/frost2/MySQL/bk/mysqldoc

--- 1.2/refman-5.1/functions.xml	2005-08-08 21:53:04 -05:00
+++ 1.3/refman-5.1/functions.xml	2005-08-11 22:06:38 -05:00
@@ -281,8 +281,8 @@
 
       <para>
         By default, string comparisons are not case sensitive and use
-        the current character set (ISO-8859-1 Latin1 by default, which
-        also works excellently for English).
+        the current character set (cp1252 Latin1 by default, which also
+        works excellently for English).
       </para>
 
       <para>
@@ -2540,7 +2540,7 @@
         <para>
           Returns the string <replaceable>str</replaceable> with all
           characters changed to lowercase according to the current
-          character set mapping (the default is ISO-8859-1 Latin1).
+          character set mapping (the default is cp1252 Latin1).
         </para>
 
 <!--  end_description_for_help_topic -->
@@ -3439,7 +3439,7 @@
         <para>
           Returns the string <replaceable>str</replaceable> with all
           characters changed to uppercase according to the current
-          character set mapping (the default is ISO-8859-1 Latin1).
+          character set mapping (the default is cp1252 Latin1).
         </para>
 
 <!--  end_description_for_help_topic -->
@@ -3798,8 +3798,8 @@
 
           <para>
             <literal>REGEXP</literal> and <literal>RLIKE</literal> use
-            the current character set (ISO-8859-1 Latin1 by default)
-            when deciding the type of a character.
+            the current character set (cp1252 Latin1 by default) when
+            deciding the type of a character.
             <emphasis role="bold">Warning</emphasis>: These operators
             are not multi-byte safe.
           </para>
@@ -8387,8 +8387,8 @@
           such as <quote>the</quote> or <quote>some</quote> that is so
           common that it is considered to have zero semantic value.
           There is a built-in stopword list, but it can be overwritten
-          by a user-defined list.
-          See <xref linkend="fulltext-fine-tuning"/>.
+          by a user-defined list. See
+          <xref linkend="fulltext-fine-tuning"/>.
         </para>
       </listitem>
 
@@ -8973,10 +8973,12 @@
               <primary>stopword list</primary>
               <secondary>user-defined</secondary>
             </indexterm>
+
             <indexterm type="function">
               <primary>fulltext</primary>
               <secondary>stopword list</secondary>
             </indexterm>
+
             To override the default stopword list, set the
             <literal>ft_stopword_file</literal> system variable. (See
             <xref linkend="server-system-variables"/>.) The variable
@@ -8986,15 +8988,15 @@
             contents of the stopword file, rebuild your
             <literal>FULLTEXT</literal> indexes.
           </para>
+
           <para>
             The stopword list is free-form, that is, you may use any
-            non-alphanumeric character such as newline, space, or comma 
-            to separate stopwords. Exceptions are the underscore 
+            non-alphanumeric character such as newline, space, or comma
+            to separate stopwords. Exceptions are the underscore
             character (<literal>_</literal>) and a single apostrophe
             (<literal>'</literal>) which are treated as part of a word.
             The character set of the stopword list is the server's
-            default character set;
-            see <xref linkend="charset-server"/>.
+            default character set; see <xref linkend="charset-server"/>.
           </para>
         </listitem>
 
@@ -11533,20 +11535,39 @@
             with <literal>RELEASE_LOCK()</literal>. See
             <xref linkend="do"/>.
           </para>
+        </listitem>
 
 <!--  end_description_for_help_topic -->
 
-<!--  description_for_help_topic UUID -->
+<!--  description_for_help_topic SLEEP -->
 
+        <listitem>
           <para>
             <indexterm type="function">
-              <primary>UUID()</primary>
+              <primary>SLEEP()</primary>
             </indexterm>
+
+            <literal>SLEEP(<replaceable>duration</replaceable>)</literal>
+          </para>
+
+          <para>
+            Sleeps (pauses) for the number of seconds given by the
+            <replaceable>duration</replaceable> argument, then returns
+            0. The duration may have a fractional part given in
+            microseconds. This function was added in MySQL 5.0.12.
           </para>
         </listitem>
 
+<!--  end_description_for_help_topic -->
+
+<!--  description_for_help_topic UUID -->
+
         <listitem>
           <para>
+            <indexterm type="function">
+              <primary>UUID()</primary>
+            </indexterm>
+
             <literal>UUID()</literal>
           </para>
 

--- 1.31/refman-common/news-5.0.xml	2005-08-10 15:54:45 -05:00
+++ 1.32/refman-common/news-5.0.xml	2005-08-11 22:06:38 -05:00
@@ -175,6 +175,13 @@
 
       <listitem>
         <para>
+          Added the <literal>SLEEP()</literal> function, which pauses
+          for the number of seconds given by its argument. (Bug #6760)
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
           Trying to drop the default keycache by setting
           <literal>@@global.key_buffer_size</literal> to zero now
           returns a warning that the default keycache cannot be dropped.

--- 1.24/refman-4.1/functions.xml	2005-08-11 15:03:06 -05:00
+++ 1.25/refman-4.1/functions.xml	2005-08-11 22:06:38 -05:00
@@ -188,10 +188,10 @@
 
       <para>
         Comparison operations result in a value of <literal>1</literal>
-        (<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 
+        (<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>
 
@@ -272,8 +272,8 @@
 
       <para>
         By default, string comparisons are not case sensitive and use
-        the current character set (cp1252 Latin1 by default, which
-        also works excellently for English).
+        the current character set (cp1252 Latin1 by default, which also
+        works excellently for English).
       </para>
 
       <para>
@@ -969,9 +969,9 @@
             integers. It is required that <replaceable>N1</replaceable>
             &lt; <replaceable>N2</replaceable> &lt;
             <replaceable>N3</replaceable> &lt; <literal>...</literal>
-            &lt; <replaceable>Nn</replaceable> for 
-            this function to work correctly. This is because a binary 
-            search is used (very fast).
+            &lt; <replaceable>Nn</replaceable> for this function to work
+            correctly. This is because a binary search is used (very
+            fast).
           </para>
 
 <!--  end_description_for_help_topic -->
@@ -1439,13 +1439,13 @@
           <replaceable>expr3</replaceable> is explicitly
           <literal>NULL</literal>, the result type of the
           <literal>IF()</literal> function is the type of
-          non-<literal>NULL</literal> expression. (This behavior was 
+          non-<literal>NULL</literal> expression. (This behavior was
           implemented in MySQL 4.0.3.)
         </para>
 
         <para>
-          <replaceable>expr1</replaceable> is evaluated as an integer 
-          value, which means that if you are testing floating-point or 
+          <replaceable>expr1</replaceable> is evaluated as an integer
+          value, which means that if you are testing floating-point or
           string values, you should do so using a comparison operation.
         </para>
 
@@ -1482,21 +1482,18 @@
                 <entry><emphasis role="bold">Return Value</emphasis></entry>
               </row>
               <row>
-                <entry><replaceable>expr2</replaceable> or 
-                  <replaceable>expr3</replaceable> returns a 
-                  string</entry>
+                <entry><replaceable>expr2</replaceable> or <replaceable>expr3</replaceable>
+                  returns a string</entry>
                 <entry>string</entry>
               </row>
               <row>
-                <entry><replaceable>expr2</replaceable> or 
-                  <replaceable>expr3</replaceable> returns a 
-                  floating-point value</entry>
+                <entry><replaceable>expr2</replaceable> or <replaceable>expr3</replaceable>
+                  returns a floating-point value</entry>
                 <entry>floating-point</entry>
               </row>
               <row>
-                <entry><replaceable>expr2</replaceable> or 
-                  <replaceable>expr3</replaceable> returns an 
-                  integer</entry>
+                <entry><replaceable>expr2</replaceable> or <replaceable>expr3</replaceable>
+                  returns an integer</entry>
                 <entry>integer</entry>
               </row>
             </tbody>
@@ -1504,9 +1501,9 @@
         </informaltable>
 
         <para>
-          If <replaceable>expr2</replaceable> and 
-          <replaceable>expr3</replaceable> are both strings, the result 
-          is case sensitive if either string is case sensitive (starting 
+          If <replaceable>expr2</replaceable> and
+          <replaceable>expr3</replaceable> are both strings, the result
+          is case sensitive if either string is case sensitive (starting
           from MySQL 3.23.51).
         </para>
 
@@ -2439,8 +2436,8 @@
         </para>
 
         <para>
-          If the file does not exist or cannot be read because one of 
-          the preceding conditions is not satisfied, the function 
+          If the file does not exist or cannot be read because one of
+          the preceding conditions is not satisfied, the function
           returns <literal>NULL</literal>.
         </para>
 
@@ -2811,10 +2808,10 @@
           properly escaped data value in an SQL statement. The string is
           returned surrounded by single quotes and with each instance of
           single quote ('<literal>'</literal>'), backslash
-          ('<literal>\</literal>'), ASCII <literal>NUL</literal>, and 
-          Control-Z preceded by a backslash. If the argument is 
-          <literal>NULL</literal>, the return value is the word 
-          <quote>NULL</quote> without surrounding single quotes. The 
+          ('<literal>\</literal>'), ASCII <literal>NUL</literal>, and
+          Control-Z preceded by a backslash. If the argument is
+          <literal>NULL</literal>, the return value is the word
+          <quote>NULL</quote> without surrounding single quotes. The
           <literal>QUOTE()</literal> function was added in MySQL 4.0.3.
         </para>
 
@@ -3542,8 +3539,8 @@
 
           <para>
             Pattern matching using SQL simple regular expression
-            comparison. Returns <literal>1</literal> 
-            (<literal>TRUE</literal>) or <literal>0</literal> 
+            comparison. Returns <literal>1</literal>
+            (<literal>TRUE</literal>) or <literal>0</literal>
             (<literal>FALSE</literal>). If either
             <replaceable>expr</replaceable> or
             <replaceable>pat</replaceable> is <literal>NULL</literal>,
@@ -3594,8 +3591,8 @@
 
           <para>
             To test for literal instances of a wildcard character,
-            precede the character with the escape character. If you
-            do not specify the <literal>ESCAPE</literal> character,
+            precede the character with the escape character. If you do
+            not specify the <literal>ESCAPE</literal> character,
             '<literal>\</literal>' is assumed.
           </para>
 
@@ -3808,9 +3805,9 @@
 
           <para>
             <literal>REGEXP</literal> and <literal>RLIKE</literal> use
-            the current character set (cp1252 Latin1 by default)
-            when deciding the type of a character. However, these
-            operators are not multi-byte safe.
+            the current character set (cp1252 Latin1 by default) when
+            deciding the type of a character. However, these operators
+            are not multi-byte safe.
           </para>
 
 <!--  description_for_help_topic STRCMP -->
@@ -3995,7 +3992,7 @@
 </programlisting>
 
           <para>
-            <emphasis role="bold">Note</emphasis>: If this operator is 
+            <emphasis role="bold">Note</emphasis>: If this operator is
             used with a <literal>BIGINT</literal>, the return value is a
             <literal>BIGINT</literal>. This means that you should avoid
             using <literal>-</literal> on integers that may have the
@@ -4796,7 +4793,7 @@
 
           <para>
             Returns the value of <emphasis>pi</emphasis> (&pi;). The
-            default number of decimals displayed is five, but MySQL 
+            default number of decimals displayed is five, but MySQL
             internally uses the full double-precision value.
           </para>
 
@@ -4916,7 +4913,7 @@
 </programlisting>
 
           <para>
-            You cannot use a column with <literal>RAND()</literal> 
+            You cannot use a column with <literal>RAND()</literal>
             values in an <literal>ORDER BY</literal> clause, because
             <literal>ORDER BY</literal> would evaluate the column
             multiple times. As of MySQL 3.23, you can retrieve rows in
@@ -4946,8 +4943,8 @@
 
           <para>
             <literal>RAND()</literal> is not meant to be a perfect
-            random generator, but instead is a fast way to generate 
-            <emphasis>ad hoc</emphasis> random numbers that is portable 
+            random generator, but instead is a fast way to generate
+            <emphasis>ad hoc</emphasis> random numbers that is portable
             between platforms for the same MySQL version.
           </para>
 
@@ -5003,7 +5000,7 @@
           </para>
 
           <para>
-            The behavior of <literal>ROUND()</literal> when the argument 
+            The behavior of <literal>ROUND()</literal> when the argument
             is halfway between two integers depends on the C library
             implementation. Different implementations round to the
             nearest even number, always up, always down, or always
@@ -5653,7 +5650,8 @@
 
         <para>
           The <literal>INTERVAL</literal> keyword and the
-          <replaceable>type</replaceable> specifier are not case sensitive.
+          <replaceable>type</replaceable> specifier are not case
+          sensitive.
         </para>
 
         <para>
@@ -7793,7 +7791,7 @@
           the year that contains the first day of the week for the given
           date, you should use <literal>0</literal>,
           <literal>2</literal>, <literal>5</literal>, or
-          <literal>7</literal> as the optional 
+          <literal>7</literal> as the optional
           <replaceable>mode</replaceable> argument.
         </para>
 
@@ -7967,8 +7965,12 @@
     </indexterm>
 
     <para>
-      MySQL uses what is known as a <firstterm>proleptic Gregorian 
-      calendar</firstterm>.
+      MySQL uses what is known as a
+
+      <firstterm>proleptic Gregorian 
+      calendar</firstterm>
+
+      .
     </para>
 
     <para>
@@ -8030,18 +8032,21 @@
 
     <para>
       There are no dates between October 4 and October 15. This
-      discontinuity is called the <firstterm>cutover</firstterm>. Any 
-      dates before the cutover are Julian, and any dates following the 
-      cutover are Gregorian. Dates during a cutover are nonexistent.
+      discontinuity is called the
+
+      <firstterm>cutover</firstterm>
+
+      . Any dates before the cutover are Julian, and any dates following
+      the cutover are Gregorian. Dates during a cutover are nonexistent.
     </para>
 
     <para>
       A calendar applied to dates when it was not actually in use is
-      called <emphasis>proleptic</emphasis>. Thus, if we assume there 
-      was never a cutover and Gregorian rules always rule, we have a 
-      proleptic Gregorian calendar. This is what is used by MySQL, as is 
-      required by standard SQL. For this reason, dates prior to the 
-      cutover stored as MySQL <literal>DATE</literal> or 
+      called <emphasis>proleptic</emphasis>. Thus, if we assume there
+      was never a cutover and Gregorian rules always rule, we have a
+      proleptic Gregorian calendar. This is what is used by MySQL, as is
+      required by standard SQL. For this reason, dates prior to the
+      cutover stored as MySQL <literal>DATE</literal> or
       <literal>DATETIME</literal> values must be adjusted to compensate
       for the difference. It is important to realise that the cutover
       did not occur at the same time in all countries, and that the
@@ -8049,7 +8054,7 @@
       Britain, it took place in 1752, when Wednesday September 2 was
       followed by Thursday September 14; Russia remained on the Julian
       calendar until 1918, losing 13 days in the process, and what is
-      popularly referred to as its <quote>October Revolution</quote> 
+      popularly referred to as its <quote>October Revolution</quote>
       occurred in November according to the Gregorian calendar.
     </para>
 
@@ -8105,7 +8110,7 @@
           at <literal>CREATE TABLE</literal> time or added later with
           <literal>ALTER TABLE</literal> or <literal>CREATE
           INDEX</literal>. For large datasets, it is much faster to load
-          data into a table that has no <literal>FULLTEXT</literal> 
+          data into a table that has no <literal>FULLTEXT</literal>
           index, then create the index with <literal>ALTER
           TABLE</literal> (or <literal>CREATE INDEX</literal>). Loading
           data into a table that has an existing
@@ -8283,13 +8288,13 @@
       The <literal>FULLTEXT</literal> parser determines where words
       start and end by looking for certain delimiters, for example
       <literal>' '</literal> (the space character), <literal>,</literal>
-      (the comma), and <literal>.</literal> (the period). If words
-      are not separated by delimiters, like for example Chinese words,
-      the <literal>FULLTEXT</literal> parser cannot determine where a
-      word starts and where it ends. To be able to add words or other
-      indexed terms in such languages to a <literal>FULLTEXT</literal>
-      index, you'd have to preprocess them so that they are separated by
-      some delimiter (for example, by <literal>''</literal>).
+      (the comma), and <literal>.</literal> (the period). If words are
+      not separated by delimiters, like for example Chinese words, the
+      <literal>FULLTEXT</literal> parser cannot determine where a word
+      starts and where it ends. To be able to add words or other indexed
+      terms in such languages to a <literal>FULLTEXT</literal> index,
+      you'd have to preprocess them so that they are separated by some
+      delimiter (for example, by <literal>''</literal>).
     </para>
 
     <para>
@@ -8312,8 +8317,8 @@
           such as <quote>the</quote> or <quote>some</quote> that is so
           common that it is considered to have zero semantic value.
           There is a built-in stopword list, but it can be overwritten
-          by a user-defined list.
-          See <xref linkend="fulltext-fine-tuning"/>.
+          by a user-defined list. See
+          <xref linkend="fulltext-fine-tuning"/>.
         </para>
       </listitem>
 
@@ -8356,8 +8361,8 @@
       The search result is empty because the word <quote>MySQL</quote>
       is present in at least 50% of the rows. As such, it is effectively
       treated as a stopword. For large datasets, this is the most
-      desirable behavior &mdash; a natural language query should not 
-      return every second row from a 1GB table. For small datasets, it 
+      desirable behavior &mdash; a natural language query should not
+      return every second row from a 1GB table. For small datasets, it
       may be less desirable.
     </para>
 
@@ -8543,10 +8548,10 @@
 
           <para>
             A leading tilde acts as a negation operator, causing the
-            word's contribution to the row relevance to be negative.
-            It is useful for marking <quote>noise words</quote>. A row 
-            that contains such a word is rated lower than others, but is 
-            not excluded altogether, as it would be by the 
+            word's contribution to the row relevance to be negative. It
+            is useful for marking <quote>noise words</quote>. A row that
+            contains such a word is rated lower than others, but is not
+            excluded altogether, as it would be by the
             <literal>-</literal> operator.
           </para>
         </listitem>
@@ -8574,13 +8579,12 @@
             contain the phrase <emphasis>literally, as it was
             typed</emphasis>. The full-text engine splits the phrase
             into words, performs a search in the
-            <literal>FULLTEXT</literal> index for the words. The engine 
-            then performs a substring search for the phrase in the 
-            records that are found, so the match must include non-word 
-            characters in the phrase. For example, 
-            <literal>"test phrase"</literal> does 
-            <emphasis>not</emphasis> match <literal>"test, 
-            phrase"</literal>.
+            <literal>FULLTEXT</literal> index for the words. The engine
+            then performs a substring search for the phrase in the
+            records that are found, so the match must include non-word
+            characters in the phrase. For example, <literal>"test
+            phrase"</literal> does <emphasis>not</emphasis> match
+            <literal>"test, phrase"</literal>.
           </para>
 
           <para>
@@ -8754,9 +8758,9 @@
       </para>
 
       <para>
-        <emphasis role="bold">Note</emphasis>: Because blind query 
-        expansion tends to increase noise significantly by returning 
-        non-relevant documents, it is only meaningful to use when a 
+        <emphasis role="bold">Note</emphasis>: Because blind query
+        expansion tends to increase noise significantly by returning
+        non-relevant documents, it is only meaningful to use when a
         search phrase is rather short.
       </para>
 
@@ -8786,7 +8790,7 @@
 
         <listitem>
           <para>
-            Languages such as Chinese, Japanese, and so forth do not 
+            Languages such as Chinese, Japanese, and so forth do not
             have word delimiters. You should be aware that the
             <literal>FULLTEXT</literal> parser cannot determine where a
             word starts and where it ends in these languages.
@@ -8831,8 +8835,8 @@
 
       <para>
         The MySQL full-text search capability has few user-tunable
-        parameters. You can exert more control over full-text searching 
-        behavior if you have a MySQL source distribution because some 
+        parameters. You can exert more control over full-text searching
+        behavior if you have a MySQL source distribution because some
         changes require source code modifications. See
         <xref linkend="installing-source"/>.
       </para>
@@ -8840,7 +8844,7 @@
       <para>
         Note that full-text search was carefully tuned for the best
         searching effectiveness. Modifying the default behavior, in most
-        cases, makes the search results worse. <emphasis>Do not alter 
+        cases, makes the search results worse. <emphasis>Do not alter
         the MySQL sources unless you know what you are doing</emphasis>.
       </para>
 
@@ -8894,10 +8898,12 @@
               <primary>stopword list</primary>
               <secondary>user-defined</secondary>
             </indexterm>
+
             <indexterm type="function">
               <primary>fulltext</primary>
               <secondary>stopword list</secondary>
             </indexterm>
+
             To override the default stopword list, set the
             <literal>ft_stopword_file</literal> system variable
             (available as of MySQL 4.0.10). See
@@ -8908,15 +8914,15 @@
             contents of the stopword file, rebuild your
             <literal>FULLTEXT</literal> indexes.
           </para>
+
           <para>
             The stopword list is free-form, that is, you may use any
-            non-alphanumeric character such as newline, space, or comma 
-            to separate stopwords. Exceptions are the underscore 
+            non-alphanumeric character such as newline, space, or comma
+            to separate stopwords. Exceptions are the underscore
             character (<literal>_</literal>) and a single apostrophe
             (<literal>'</literal>) which are treated as part of a word.
             The character set of the stopword list is the server's
-            default character set;
-            see <xref linkend="charset-server"/>.
+            default character set; see <xref linkend="charset-server"/>.
           </para>
         </listitem>
 
@@ -8974,7 +8980,7 @@
         <literal>ft_stopword_file</literal>), or if you change the
         stopword file itself, you must rebuild your
         <literal>FULLTEXT</literal> indexes after making the changes and
-        restarting the server. To rebuild the indexes in this case, it 
+        restarting the server. To rebuild the indexes in this case, it
         is sufficient to do a <literal>QUICK</literal> repair operation:
       </para>
 
@@ -8985,8 +8991,8 @@
       <para>
         With regard specifically to using the <literal>IN BOOLEAN
         MODE</literal> capability, if you upgrade from MySQL 3.23 to 4.0
-        or later, it is necessary to replace the index header as well. 
-        To do this, perform a <literal>USE_FRM</literal> repair 
+        or later, it is necessary to replace the index header as well.
+        To do this, perform a <literal>USE_FRM</literal> repair
         operation:
       </para>
 
@@ -9130,9 +9136,9 @@
 
         <para>
           <literal>BINARY</literal> was added in MySQL 3.23.0. As of
-          MySQL 4.0.2, <literal>BINARY 
+          MySQL 4.0.2, <literal>BINARY
           <replaceable>str</replaceable></literal> is a shorthand for
-          <literal>CAST(<replaceable>str</replaceable> AS 
+          <literal>CAST(<replaceable>str</replaceable> AS
           BINARY)</literal>.
         </para>
 
@@ -9438,8 +9444,8 @@
       The handing of unsigned values was changed in MySQL 4.0 to be able
       to support <literal>BIGINT</literal> values properly. If you have
       some code that you want to run in both MySQL 4.0 and 3.23, you
-      probably cannot use the <literal>CAST()</literal> function. You can
-      use the following technique to get a signed result when
+      probably cannot use the <literal>CAST()</literal> function. You
+      can use the following technique to get a signed result when
       subtracting two unsigned integer columns <literal>ucol1</literal>
       and <literal>ucol2</literal>:
     </para>
@@ -9936,8 +9942,8 @@
           </para>
 
           <para>
-            If the <replaceable>crypt_str</replaceable> argument does not
-            look like an encrypted string, MySQL returns the given
+            If the <replaceable>crypt_str</replaceable> argument does
+            not look like an encrypted string, MySQL returns the given
             <replaceable>crypt_str</replaceable>.
           </para>
 
@@ -10481,8 +10487,8 @@
           </informaltable>
 
           <para>
-            Before MySQL 4.1.11, the return values are shown as follows, 
-            and functions such as <literal>USER()</literal> have a 
+            Before MySQL 4.1.11, the return values are shown as follows,
+            and functions such as <literal>USER()</literal> have a
             coercibility of 2:
           </para>
 
@@ -10645,8 +10651,8 @@
 
           <para>
             <literal>CURRENT_USER()</literal> was added in MySQL 4.0.6.
-            As of MySQL 4.1.0, the string has the <literal>utf8</literal>
-            character set.
+            As of MySQL 4.1.0, the string has the
+            <literal>utf8</literal> character set.
           </para>
 
 <!--  description_for_help_topic DATABASE -->
@@ -10730,7 +10736,7 @@
             indicating how many rows the first <literal>SELECT</literal>
             would have returned had it been written without the
             <literal>LIMIT</literal> clause. (If the preceding
-            <literal>SELECT</literal> statement does not include 
+            <literal>SELECT</literal> statement does not include
             <literal>SQL_CALC_FOUND_ROWS</literal>, then
             <literal>FOUND_ROWS()</literal> may return a different
             result when <literal>LIMIT</literal> is used than when it is
@@ -10741,7 +10747,7 @@
             Note that if you are using <literal>SELECT
             SQL_CALC_FOUND_ROWS</literal>, MySQL must calculate how many
             rows are in the full result set. However, this is faster
-            than running the query again without 
+            than running the query again without
             <literal>LIMIT</literal>, because the result set need not be
             sent to the client.
           </para>
@@ -10848,14 +10854,14 @@
 
           <para>
             The last ID that was generated is maintained in the server
-            on a <emphasis>per-connection basis</emphasis>. This means 
-            that the value which the function returns to a given client 
-            is the most recent <literal>AUTO_INCREMENT</literal> value 
-            generated by that client. The value cannot be affected by 
-            other clients, even if they generate 
-            <literal>AUTO_INCREMENT</literal> values of their own. This 
-            behavior ensures that you can retrieve your own ID without 
-            concern for the activity of other clients, and without the 
+            on a <emphasis>per-connection basis</emphasis>. This means
+            that the value which the function returns to a given client
+            is the most recent <literal>AUTO_INCREMENT</literal> value
+            generated by that client. The value cannot be affected by
+            other clients, even if they generate
+            <literal>AUTO_INCREMENT</literal> values of their own. This
+            behavior ensures that you can retrieve your own ID without
+            concern for the activity of other clients, and without the
             need for locks or transactions.
           </para>
 
@@ -10881,8 +10887,8 @@
             is ignored, the <literal>AUTO_INCREMENT</literal> counter is
             not incremented and <literal>LAST_INSERT_ID()</literal>
             returns 0, which reflects that no record was inserted.
-            (Before MySQL 4.1, the <literal>AUTO_INCREMENT</literal> 
-            counter is still incremented and 
+            (Before MySQL 4.1, the <literal>AUTO_INCREMENT</literal>
+            counter is still incremented and
             <literal>LAST_INSERT_ID()</literal> returns the new value.)
           </para>
 
@@ -11485,20 +11491,39 @@
             with <literal>RELEASE_LOCK()</literal>. See
             <xref linkend="do"/>.
           </para>
+        </listitem>
 
 <!--  end_description_for_help_topic -->
 
-<!--  description_for_help_topic UUID -->
+<!--  description_for_help_topic SLEEP -->
 
+        <listitem>
           <para>
             <indexterm type="function">
-              <primary>UUID()</primary>
+              <primary>SLEEP()</primary>
             </indexterm>
+
+            <literal>SLEEP(<replaceable>duration</replaceable>)</literal>
+          </para>
+
+          <para>
+            Sleeps (pauses) for the number of seconds given by the
+            <replaceable>duration</replaceable> argument, then returns
+            0. The duration may have a fractional part given in
+            microseconds. This function was added in MySQL 5.0.12.
           </para>
         </listitem>
 
+<!--  end_description_for_help_topic -->
+
+<!--  description_for_help_topic UUID -->
+
         <listitem>
           <para>
+            <indexterm type="function">
+              <primary>UUID()</primary>
+            </indexterm>
+
             <literal>UUID()</literal>
           </para>
 
@@ -12040,19 +12065,17 @@
           </para>
 
 <!--  end_description_for_help_topic -->
-        
         </listitem>
 
 <!--  description_for_help_topic SUM  DISTINCT -->
 
         <listitem>
-
           <para>
             <indexterm type="function">
               <primary>SUM()</primary>
             </indexterm>
           </para>
-          
+
           <para>
             <literal>SUM(<replaceable>expr</replaceable>)</literal>
           </para>
@@ -12064,12 +12087,9 @@
           </para>
 
 <!--  end_description_for_help_topic -->
-
         </listitem>
 
         <listitem>
-
-
           <para>
             <indexterm type="function">
               <primary>VARIANCE()</primary>
@@ -12140,7 +12160,6 @@
         ('Phone', 'Finland', 2001, 10); 
 -->
 
-
       <para>
         As of MySQL 4.1.1, the <literal>GROUP BY</literal> clause allows
         a <literal>WITH ROLLUP</literal> modifier that causes extra rows
@@ -12445,8 +12464,8 @@
       <para>
         In standard SQL, you would have to add
         <literal>customer.name</literal> to the <literal>GROUP
-        BY</literal> clause. In MySQL, the name is redundant if you
-        do not run in ANSI mode.
+        BY</literal> clause. In MySQL, the name is redundant if you do
+        not run in ANSI mode.
       </para>
 
       <para>

--- 1.22/refman/functions.xml	2005-08-08 21:53:12 -05:00
+++ 1.23/refman/functions.xml	2005-08-11 22:06:39 -05:00
@@ -281,8 +281,8 @@
 
       <para>
         By default, string comparisons are not case sensitive and use
-        the current character set (cp1252 Latin1 by default, which
-        also works excellently for English).
+        the current character set (cp1252 Latin1 by default, which also
+        works excellently for English).
       </para>
 
       <para>
@@ -3870,9 +3870,9 @@
 
           <para>
             <literal>REGEXP</literal> and <literal>RLIKE</literal> use
-            the current character set (cp1252 Latin1 by default)
-            when deciding the type of a character. However, these
-            operators are not multi-byte safe.
+            the current character set (cp1252 Latin1 by default) when
+            deciding the type of a character. However, these operators
+            are not multi-byte safe.
           </para>
 
 <!--  description_for_help_topic STRCMP -->
@@ -8549,8 +8549,8 @@
           such as <quote>the</quote> or <quote>some</quote> that is so
           common that it is considered to have zero semantic value.
           There is a built-in stopword list, but it can be overwritten
-          by a user-defined list.
-          See <xref linkend="fulltext-fine-tuning"/>.
+          by a user-defined list. See
+          <xref linkend="fulltext-fine-tuning"/>.
         </para>
       </listitem>
 
@@ -9138,10 +9138,12 @@
               <primary>stopword list</primary>
               <secondary>user-defined</secondary>
             </indexterm>
+
             <indexterm type="function">
               <primary>fulltext</primary>
               <secondary>stopword list</secondary>
             </indexterm>
+
             To override the default stopword list, set the
             <literal>ft_stopword_file</literal> system variable
             (available as of MySQL 4.0.10). See
@@ -9152,15 +9154,15 @@
             contents of the stopword file, rebuild your
             <literal>FULLTEXT</literal> indexes.
           </para>
+
           <para>
             The stopword list is free-form, that is, you may use any
-            non-alphanumeric character such as newline, space, or comma 
-            to separate stopwords. Exceptions are the underscore 
+            non-alphanumeric character such as newline, space, or comma
+            to separate stopwords. Exceptions are the underscore
             character (<literal>_</literal>) and a single apostrophe
             (<literal>'</literal>) which are treated as part of a word.
             The character set of the stopword list is the server's
-            default character set;
-            see <xref linkend="charset-server"/>.
+            default character set; see <xref linkend="charset-server"/>.
           </para>
         </listitem>
 
@@ -11866,20 +11868,39 @@
             with <literal>RELEASE_LOCK()</literal>. See
             <xref linkend="do"/>.
           </para>
+        </listitem>
 
 <!--  end_description_for_help_topic -->
 
-<!--  description_for_help_topic UUID -->
+<!--  description_for_help_topic SLEEP -->
 
+        <listitem>
           <para>
             <indexterm type="function">
-              <primary>UUID()</primary>
+              <primary>SLEEP()</primary>
             </indexterm>
+
+            <literal>SLEEP(<replaceable>duration</replaceable>)</literal>
+          </para>
+
+          <para>
+            Sleeps (pauses) for the number of seconds given by the
+            <replaceable>duration</replaceable> argument, then returns
+            0. The duration may have a fractional part given in
+            microseconds. This function was added in MySQL 5.0.12.
           </para>
         </listitem>
 
+<!--  end_description_for_help_topic -->
+
+<!--  description_for_help_topic UUID -->
+
         <listitem>
           <para>
+            <indexterm type="function">
+              <primary>UUID()</primary>
+            </indexterm>
+
             <literal>UUID()</literal>
           </para>
 

--- 1.3/refman-5.0/functions.xml	2005-08-08 21:52:59 -05:00
+++ 1.4/refman-5.0/functions.xml	2005-08-11 22:06:38 -05:00
@@ -281,8 +281,8 @@
 
       <para>
         By default, string comparisons are not case sensitive and use
-        the current character set (cp1252 Latin1 by default, which
-        also works excellently for English).
+        the current character set (cp1252 Latin1 by default, which also
+        works excellently for English).
       </para>
 
       <para>
@@ -3798,8 +3798,8 @@
 
           <para>
             <literal>REGEXP</literal> and <literal>RLIKE</literal> use
-            the current character set (ISO-8859-1 Latin1 by default)
-            when deciding the type of a character.
+            the current character set (cp1252 Latin1 by default) when
+            deciding the type of a character.
             <emphasis role="bold">Warning</emphasis>: These operators
             are not multi-byte safe.
           </para>
@@ -8387,8 +8387,8 @@
           such as <quote>the</quote> or <quote>some</quote> that is so
           common that it is considered to have zero semantic value.
           There is a built-in stopword list, but it can be overwritten
-          by a user-defined list.
-          See <xref linkend="fulltext-fine-tuning"/>.
+          by a user-defined list. See
+          <xref linkend="fulltext-fine-tuning"/>.
         </para>
       </listitem>
 
@@ -8973,10 +8973,12 @@
               <primary>stopword list</primary>
               <secondary>user-defined</secondary>
             </indexterm>
+
             <indexterm type="function">
               <primary>fulltext</primary>
               <secondary>stopword list</secondary>
             </indexterm>
+
             To override the default stopword list, set the
             <literal>ft_stopword_file</literal> system variable. (See
             <xref linkend="server-system-variables"/>.) The variable
@@ -8986,15 +8988,15 @@
             contents of the stopword file, rebuild your
             <literal>FULLTEXT</literal> indexes.
           </para>
+
           <para>
             The stopword list is free-form, that is, you may use any
-            non-alphanumeric character such as newline, space, or comma 
-            to separate stopwords. Exceptions are the underscore 
+            non-alphanumeric character such as newline, space, or comma
+            to separate stopwords. Exceptions are the underscore
             character (<literal>_</literal>) and a single apostrophe
             (<literal>'</literal>) which are treated as part of a word.
             The character set of the stopword list is the server's
-            default character set;
-            see <xref linkend="charset-server"/>.
+            default character set; see <xref linkend="charset-server"/>.
           </para>
         </listitem>
 
@@ -11533,20 +11535,39 @@
             with <literal>RELEASE_LOCK()</literal>. See
             <xref linkend="do"/>.
           </para>
+        </listitem>
 
 <!--  end_description_for_help_topic -->
 
-<!--  description_for_help_topic UUID -->
+<!--  description_for_help_topic SLEEP -->
 
+        <listitem>
           <para>
             <indexterm type="function">
-              <primary>UUID()</primary>
+              <primary>SLEEP()</primary>
             </indexterm>
+
+            <literal>SLEEP(<replaceable>duration</replaceable>)</literal>
+          </para>
+
+          <para>
+            Sleeps (pauses) for the number of seconds given by the
+            <replaceable>duration</replaceable> argument, then returns
+            0. The duration may have a fractional part given in
+            microseconds. This function was added in MySQL 5.0.12.
           </para>
         </listitem>
 
+<!--  end_description_for_help_topic -->
+
+<!--  description_for_help_topic UUID -->
+
         <listitem>
           <para>
+            <indexterm type="function">
+              <primary>UUID()</primary>
+            </indexterm>
+
             <literal>UUID()</literal>
           </para>
 
Thread
bk commit - mysqldoc@docsrva tree (paul:1.3255)paul12 Aug