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.3271 05/08/14 20:22:06 paul@stripped +6 -0
De-cruft.
refman/functions.xml
1.26 05/08/14 20:22:04 paul@stripped +134 -164
De-cruft.
refman/error-handling.xml
1.5 05/08/14 20:22:04 paul@stripped +4 -3
De-cruft.
refman-5.1/functions.xml
1.5 05/08/14 20:22:04 paul@stripped +134 -164
De-cruft.
refman-5.0/functions.xml
1.6 05/08/14 20:22:03 paul@stripped +134 -164
De-cruft.
refman-4.1/functions.xml
1.28 05/08/14 20:22:03 paul@stripped +111 -139
De-cruft.
refman-4.1/error-handling.xml
1.4 05/08/14 20:22:03 paul@stripped +4 -3
De-cruft.
# 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.4/refman-5.1/functions.xml 2005-08-13 14:06:27 -05:00
+++ 1.5/refman-5.1/functions.xml 2005-08-14 20:22:04 -05:00
@@ -332,15 +332,15 @@
<!-- description_for_help_topic = -->
- <indexterm type="function">
- <primary>= (equal)</primary>
- </indexterm>
-
- <indexterm type="function">
- <primary>equal (=)</primary>
- </indexterm>
-
<listitem>
+ <indexterm type="function">
+ <primary>= (equal)</primary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary>equal (=)</primary>
+ </indexterm>
+
<para>
<literal>=</literal>
</para>
@@ -367,20 +367,18 @@
</programlisting>
<!-- description_for_help_topic <=> -->
-
- <para>
- <indexterm type="concept">
- <primary><literal>NULL</literal></primary>
- <secondary>testing for null</secondary>
- </indexterm>
-
- <indexterm type="function">
- <primary><=> (equal to)</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="concept">
+ <primary><literal>NULL</literal></primary>
+ <secondary>testing for null</secondary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary><=> (equal to)</primary>
+ </indexterm>
+
<para>
<literal><=></literal>
</para>
@@ -406,27 +404,25 @@
</programlisting>
<!-- description_for_help_topic != <> -->
-
- <para>
- <indexterm type="function">
- <primary><> (not equal)</primary>
- </indexterm>
-
- <indexterm type="function">
- <primary>not equal (<>)</primary>
- </indexterm>
-
- <indexterm type="function">
- <primary>!= (not equal)</primary>
- </indexterm>
-
- <indexterm type="function">
- <primary>not equal (!=)</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="function">
+ <primary><> (not equal)</primary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary>not equal (<>)</primary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary>!= (not equal)</primary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary>not equal (!=)</primary>
+ </indexterm>
+
<para>
<literal><></literal> , <literal>!=</literal>
</para>
@@ -449,19 +445,17 @@
</programlisting>
<!-- description_for_help_topic <= -->
-
- <para>
- <indexterm type="function">
- <primary><= (less than or equal)</primary>
- </indexterm>
-
- <indexterm type="function">
- <primary>less than or equal (<=)</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="function">
+ <primary><= (less than or equal)</primary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary>less than or equal (<=)</primary>
+ </indexterm>
+
<para>
<literal><=</literal>
</para>
@@ -480,19 +474,17 @@
</programlisting>
<!-- description_for_help_topic < -->
-
- <para>
- <indexterm type="function">
- <primary>< (less than)</primary>
- </indexterm>
-
- <indexterm type="function">
- <primary>less than (<)</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="function">
+ <primary>< (less than)</primary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary>less than (<)</primary>
+ </indexterm>
+
<para>
<literal><</literal>
</para>
@@ -511,19 +503,17 @@
</programlisting>
<!-- description_for_help_topic >= -->
-
- <para>
- <indexterm type="function">
- <primary>>= (greater than or equal)</primary>
- </indexterm>
-
- <indexterm type="function">
- <primary>greater than or equal (>=)</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="function">
+ <primary>>= (greater than or equal)</primary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary>greater than or equal (>=)</primary>
+ </indexterm>
+
<para>
<literal>>=</literal>
</para>
@@ -542,19 +532,17 @@
</programlisting>
<!-- description_for_help_topic > -->
-
- <para>
- <indexterm type="function">
- <primary>> (greater than)</primary>
- </indexterm>
-
- <indexterm type="function">
- <primary>greater than (>)</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="function">
+ <primary>> (greater than)</primary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary>greater than (>)</primary>
+ </indexterm>
+
<para>
<literal>></literal>
</para>
@@ -573,34 +561,32 @@
</programlisting>
<!-- description_for_help_topic IS -->
-
- <para>
- <indexterm type="concept">
- <primary><literal>TRUE</literal></primary>
- <secondary>testing for</secondary>
- </indexterm>
-
- <indexterm type="concept">
- <primary><literal>FALSE</literal></primary>
- <secondary>testing for</secondary>
- </indexterm>
-
- <indexterm type="concept">
- <primary><literal>UNKNOWN</literal></primary>
- <secondary>testing for</secondary>
- </indexterm>
-
- <indexterm type="function">
- <primary>IS boolean_value</primary>
- </indexterm>
-
- <indexterm type="function">
- <primary>IS NOT boolean_value</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="concept">
+ <primary><literal>TRUE</literal></primary>
+ <secondary>testing for</secondary>
+ </indexterm>
+
+ <indexterm type="concept">
+ <primary><literal>FALSE</literal></primary>
+ <secondary>testing for</secondary>
+ </indexterm>
+
+ <indexterm type="concept">
+ <primary><literal>UNKNOWN</literal></primary>
+ <secondary>testing for</secondary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary>IS boolean_value</primary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary>IS NOT boolean_value</primary>
+ </indexterm>
+
<para>
<literal>IS
<replaceable>boolean_value</replaceable></literal> ,
@@ -633,24 +619,22 @@
</para>
<!-- description_for_help_topic IS NULL NULL IS -->
-
- <para>
- <indexterm type="concept">
- <primary><literal>NULL</literal></primary>
- <secondary>testing for null</secondary>
- </indexterm>
-
- <indexterm type="function">
- <primary>IS NULL</primary>
- </indexterm>
-
- <indexterm type="function">
- <primary>IS NOT NULL</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="concept">
+ <primary><literal>NULL</literal></primary>
+ <secondary>testing for null</secondary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary>IS NULL</primary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary>IS NOT NULL</primary>
+ </indexterm>
+
<para>
<literal>IS NULL</literal> , <literal>IS NOT NULL</literal>
</para>
@@ -729,15 +713,13 @@
</itemizedlist>
<!-- description_for_help_topic BETWEEN AND BETWEEN AND -->
-
- <para>
- <indexterm type="function">
- <primary>BETWEEN ... AND</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="function">
+ <primary>BETWEEN ... AND</primary>
+ </indexterm>
+
<para>
<literal><replaceable>expr</replaceable> BETWEEN
<replaceable>min</replaceable> AND
@@ -777,15 +759,13 @@
</programlisting>
<!-- description_for_help_topic NOT BETWEEN -->
-
- <para>
- <indexterm type="function">
- <primary>NOT BETWEEN</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="function">
+ <primary>NOT BETWEEN</primary>
+ </indexterm>
+
<para>
<literal><replaceable>expr</replaceable> NOT BETWEEN
<replaceable>min</replaceable> AND
@@ -802,20 +782,18 @@
<!-- end_description_for_help_topic -->
<!-- description_for_help_topic COALESCE -->
-
- <para>
- <indexterm type="concept">
- <primary><literal>NULL</literal></primary>
- <secondary>testing for null</secondary>
- </indexterm>
-
- <indexterm type="function">
- <primary>COALESCE()</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="concept">
+ <primary><literal>NULL</literal></primary>
+ <secondary>testing for null</secondary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary>COALESCE()</primary>
+ </indexterm>
+
<para>
<literal>COALESCE(<replaceable>value</replaceable>,...)</literal>
</para>
@@ -837,15 +815,13 @@
</programlisting>
<!-- description_for_help_topic GREATEST -->
-
- <para>
- <indexterm type="function">
- <primary>GREATEST()</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="function">
+ <primary>GREATEST()</primary>
+ </indexterm>
+
<para>
<literal>GREATEST(<replaceable>value1</replaceable>,<replaceable>value2</replaceable>,...)</literal>
</para>
@@ -870,15 +846,13 @@
</programlisting>
<!-- description_for_help_topic IN -->
-
- <para>
- <indexterm type="function">
- <primary>IN</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="function">
+ <primary>IN</primary>
+ </indexterm>
+
<para>
<literal><replaceable>expr</replaceable> IN
(<replaceable>value</replaceable>,...)</literal>
@@ -932,15 +906,13 @@
</para>
<!-- description_for_help_topic NOT IN -->
-
- <para>
- <indexterm type="function">
- <primary>NOT IN</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="function">
+ <primary>NOT IN</primary>
+ </indexterm>
+
<para>
<literal><replaceable>expr</replaceable> NOT IN
(<replaceable>value</replaceable>,...)</literal>
@@ -955,15 +927,13 @@
<!-- end_description_for_help_topic -->
<!-- description_for_help_topic ISNULL -->
-
- <para>
- <indexterm type="function">
- <primary>ISNULL()</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="function">
+ <primary>ISNULL()</primary>
+ </indexterm>
+
<para>
<literal>ISNULL(<replaceable>expr</replaceable>)</literal>
</para>
--- 1.3/refman-4.1/error-handling.xml 2005-08-08 21:52:52 -05:00
+++ 1.4/refman-4.1/error-handling.xml 2005-08-14 20:22:03 -05:00
@@ -11,9 +11,10 @@
<title id='title-error-handling'>&title-error-handling;</title>
-<!-- TODO: say something about SHOW WARNINGS, SHOW ERRORS, @warning_count, -->
-
-<!-- @error_count. -->
+<!--
+ TODO: say something about SHOW WARNINGS, SHOW ERRORS,
+ @warning_count, @error_count.
+-->
<para>
This chapter lists the errors that may appear when you call MySQL
--- 1.27/refman-4.1/functions.xml 2005-08-14 15:42:38 -05:00
+++ 1.28/refman-4.1/functions.xml 2005-08-14 20:22:03 -05:00
@@ -323,15 +323,15 @@
<!-- description_for_help_topic = -->
- <indexterm type="function">
- <primary>= (equal)</primary>
- </indexterm>
-
- <indexterm type="function">
- <primary>equal (=)</primary>
- </indexterm>
-
<listitem>
+ <indexterm type="function">
+ <primary>= (equal)</primary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary>equal (=)</primary>
+ </indexterm>
+
<para>
<literal>=</literal>
</para>
@@ -358,20 +358,18 @@
</programlisting>
<!-- description_for_help_topic <=> -->
-
- <para>
- <indexterm type="concept">
- <primary><literal>NULL</literal></primary>
- <secondary>testing for null</secondary>
- </indexterm>
-
- <indexterm type="function">
- <primary><=> (equal to)</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="concept">
+ <primary><literal>NULL</literal></primary>
+ <secondary>testing for null</secondary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary><=> (equal to)</primary>
+ </indexterm>
+
<para>
<literal><=></literal>
</para>
@@ -402,27 +400,25 @@
</para>
<!-- description_for_help_topic != <> -->
-
- <para>
- <indexterm type="function">
- <primary><> (not equal)</primary>
- </indexterm>
-
- <indexterm type="function">
- <primary>not equal (<>)</primary>
- </indexterm>
-
- <indexterm type="function">
- <primary>!= (not equal)</primary>
- </indexterm>
-
- <indexterm type="function">
- <primary>not equal (!=)</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="function">
+ <primary><> (not equal)</primary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary>not equal (<>)</primary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary>!= (not equal)</primary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary>not equal (!=)</primary>
+ </indexterm>
+
<para>
<literal><></literal> , <literal>!=</literal>
</para>
@@ -445,19 +441,17 @@
</programlisting>
<!-- description_for_help_topic <= -->
-
- <para>
- <indexterm type="function">
- <primary><= (less than or equal)</primary>
- </indexterm>
-
- <indexterm type="function">
- <primary>less than or equal (<=)</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="function">
+ <primary><= (less than or equal)</primary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary>less than or equal (<=)</primary>
+ </indexterm>
+
<para>
<literal><=</literal>
</para>
@@ -476,19 +470,17 @@
</programlisting>
<!-- description_for_help_topic < -->
-
- <para>
- <indexterm type="function">
- <primary>< (less than)</primary>
- </indexterm>
-
- <indexterm type="function">
- <primary>less than (<)</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="function">
+ <primary>< (less than)</primary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary>less than (<)</primary>
+ </indexterm>
+
<para>
<literal><</literal>
</para>
@@ -507,19 +499,17 @@
</programlisting>
<!-- description_for_help_topic >= -->
-
- <para>
- <indexterm type="function">
- <primary>>= (greater than or equal)</primary>
- </indexterm>
-
- <indexterm type="function">
- <primary>greater than or equal (>=)</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="function">
+ <primary>>= (greater than or equal)</primary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary>greater than or equal (>=)</primary>
+ </indexterm>
+
<para>
<literal>>=</literal>
</para>
@@ -538,19 +528,17 @@
</programlisting>
<!-- description_for_help_topic > -->
-
- <para>
- <indexterm type="function">
- <primary>> (greater than)</primary>
- </indexterm>
-
- <indexterm type="function">
- <primary>greater than (>)</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="function">
+ <primary>> (greater than)</primary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary>greater than (>)</primary>
+ </indexterm>
+
<para>
<literal>></literal>
</para>
@@ -569,24 +557,22 @@
</programlisting>
<!-- description_for_help_topic IS NULL NULL IS -->
-
- <para>
- <indexterm type="concept">
- <primary><literal>NULL</literal></primary>
- <secondary>testing for null</secondary>
- </indexterm>
-
- <indexterm type="function">
- <primary>IS NULL</primary>
- </indexterm>
-
- <indexterm type="function">
- <primary>IS NOT NULL</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="concept">
+ <primary><literal>NULL</literal></primary>
+ <secondary>testing for null</secondary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary>IS NULL</primary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary>IS NOT NULL</primary>
+ </indexterm>
+
<para>
<literal>IS NULL</literal> , <literal>IS NOT NULL</literal>
</para>
@@ -665,15 +651,13 @@
</itemizedlist>
<!-- description_for_help_topic BETWEEN AND BETWEEN AND -->
-
- <para>
- <indexterm type="function">
- <primary>BETWEEN ... AND</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="function">
+ <primary>BETWEEN ... AND</primary>
+ </indexterm>
+
<para>
<literal><replaceable>expr</replaceable> BETWEEN
<replaceable>min</replaceable> AND
@@ -715,15 +699,13 @@
</programlisting>
<!-- description_for_help_topic NOT BETWEEN -->
-
- <para>
- <indexterm type="function">
- <primary>NOT BETWEEN</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="function">
+ <primary>NOT BETWEEN</primary>
+ </indexterm>
+
<para>
<literal><replaceable>expr</replaceable> NOT BETWEEN
<replaceable>min</replaceable> AND
@@ -740,20 +722,18 @@
<!-- end_description_for_help_topic -->
<!-- description_for_help_topic COALESCE -->
-
- <para>
- <indexterm type="concept">
- <primary><literal>NULL</literal></primary>
- <secondary>testing for null</secondary>
- </indexterm>
-
- <indexterm type="function">
- <primary>COALESCE()</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="concept">
+ <primary><literal>NULL</literal></primary>
+ <secondary>testing for null</secondary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary>COALESCE()</primary>
+ </indexterm>
+
<para>
<literal>COALESCE(<replaceable>value</replaceable>,...)</literal>
</para>
@@ -779,15 +759,13 @@
</para>
<!-- description_for_help_topic GREATEST -->
-
- <para>
- <indexterm type="function">
- <primary>GREATEST()</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="function">
+ <primary>GREATEST()</primary>
+ </indexterm>
+
<para>
<literal>GREATEST(<replaceable>value1</replaceable>,<replaceable>value2</replaceable>,...)</literal>
</para>
@@ -817,15 +795,13 @@
</para>
<!-- description_for_help_topic IN -->
-
- <para>
- <indexterm type="function">
- <primary>IN</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="function">
+ <primary>IN</primary>
+ </indexterm>
+
<para>
<literal><replaceable>expr</replaceable> IN
(<replaceable>value</replaceable>,...)</literal>
@@ -879,15 +855,13 @@
</para>
<!-- description_for_help_topic NOT IN -->
-
- <para>
- <indexterm type="function">
- <primary>NOT IN</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="function">
+ <primary>NOT IN</primary>
+ </indexterm>
+
<para>
<literal><replaceable>expr</replaceable> NOT IN
(<replaceable>value</replaceable>,...)</literal>
@@ -902,15 +876,13 @@
<!-- end_description_for_help_topic -->
<!-- description_for_help_topic ISNULL -->
-
- <para>
- <indexterm type="function">
- <primary>ISNULL()</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="function">
+ <primary>ISNULL()</primary>
+ </indexterm>
+
<para>
<literal>ISNULL(<replaceable>expr</replaceable>)</literal>
</para>
--- 1.4/refman/error-handling.xml 2005-08-08 21:53:11 -05:00
+++ 1.5/refman/error-handling.xml 2005-08-14 20:22:04 -05:00
@@ -11,9 +11,10 @@
<title id='title-error-handling'>&title-error-handling;</title>
-<!-- TODO: say something about SHOW WARNINGS, SHOW ERRORS, @warning_count, -->
-
-<!-- @error_count. -->
+<!--
+ TODO: say something about SHOW WARNINGS, SHOW ERRORS,
+ @warning_count, @error_count.
+-->
<para>
This chapter lists the errors that may appear when you call MySQL
--- 1.25/refman/functions.xml 2005-08-14 15:42:39 -05:00
+++ 1.26/refman/functions.xml 2005-08-14 20:22:04 -05:00
@@ -332,15 +332,15 @@
<!-- description_for_help_topic = -->
- <indexterm type="function">
- <primary>= (equal)</primary>
- </indexterm>
-
- <indexterm type="function">
- <primary>equal (=)</primary>
- </indexterm>
-
<listitem>
+ <indexterm type="function">
+ <primary>= (equal)</primary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary>equal (=)</primary>
+ </indexterm>
+
<para>
<literal>=</literal>
</para>
@@ -367,20 +367,18 @@
</programlisting>
<!-- description_for_help_topic <=> -->
-
- <para>
- <indexterm type="concept">
- <primary><literal>NULL</literal></primary>
- <secondary>testing for null</secondary>
- </indexterm>
-
- <indexterm type="function">
- <primary><=> (equal to)</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="concept">
+ <primary><literal>NULL</literal></primary>
+ <secondary>testing for null</secondary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary><=> (equal to)</primary>
+ </indexterm>
+
<para>
<literal><=></literal>
</para>
@@ -411,27 +409,25 @@
</para>
<!-- description_for_help_topic != <> -->
-
- <para>
- <indexterm type="function">
- <primary><> (not equal)</primary>
- </indexterm>
-
- <indexterm type="function">
- <primary>not equal (<>)</primary>
- </indexterm>
-
- <indexterm type="function">
- <primary>!= (not equal)</primary>
- </indexterm>
-
- <indexterm type="function">
- <primary>not equal (!=)</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="function">
+ <primary><> (not equal)</primary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary>not equal (<>)</primary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary>!= (not equal)</primary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary>not equal (!=)</primary>
+ </indexterm>
+
<para>
<literal><></literal> , <literal>!=</literal>
</para>
@@ -454,19 +450,17 @@
</programlisting>
<!-- description_for_help_topic <= -->
-
- <para>
- <indexterm type="function">
- <primary><= (less than or equal)</primary>
- </indexterm>
-
- <indexterm type="function">
- <primary>less than or equal (<=)</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="function">
+ <primary><= (less than or equal)</primary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary>less than or equal (<=)</primary>
+ </indexterm>
+
<para>
<literal><=</literal>
</para>
@@ -485,19 +479,17 @@
</programlisting>
<!-- description_for_help_topic < -->
-
- <para>
- <indexterm type="function">
- <primary>< (less than)</primary>
- </indexterm>
-
- <indexterm type="function">
- <primary>less than (<)</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="function">
+ <primary>< (less than)</primary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary>less than (<)</primary>
+ </indexterm>
+
<para>
<literal><</literal>
</para>
@@ -516,19 +508,17 @@
</programlisting>
<!-- description_for_help_topic >= -->
-
- <para>
- <indexterm type="function">
- <primary>>= (greater than or equal)</primary>
- </indexterm>
-
- <indexterm type="function">
- <primary>greater than or equal (>=)</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="function">
+ <primary>>= (greater than or equal)</primary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary>greater than or equal (>=)</primary>
+ </indexterm>
+
<para>
<literal>>=</literal>
</para>
@@ -547,19 +537,17 @@
</programlisting>
<!-- description_for_help_topic > -->
-
- <para>
- <indexterm type="function">
- <primary>> (greater than)</primary>
- </indexterm>
-
- <indexterm type="function">
- <primary>greater than (>)</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="function">
+ <primary>> (greater than)</primary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary>greater than (>)</primary>
+ </indexterm>
+
<para>
<literal>></literal>
</para>
@@ -578,34 +566,32 @@
</programlisting>
<!-- description_for_help_topic IS -->
-
- <para>
- <indexterm type="concept">
- <primary><literal>TRUE</literal></primary>
- <secondary>testing for</secondary>
- </indexterm>
-
- <indexterm type="concept">
- <primary><literal>FALSE</literal></primary>
- <secondary>testing for</secondary>
- </indexterm>
-
- <indexterm type="concept">
- <primary><literal>UNKNOWN</literal></primary>
- <secondary>testing for</secondary>
- </indexterm>
-
- <indexterm type="function">
- <primary>IS boolean_value</primary>
- </indexterm>
-
- <indexterm type="function">
- <primary>IS NOT boolean_value</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="concept">
+ <primary><literal>TRUE</literal></primary>
+ <secondary>testing for</secondary>
+ </indexterm>
+
+ <indexterm type="concept">
+ <primary><literal>FALSE</literal></primary>
+ <secondary>testing for</secondary>
+ </indexterm>
+
+ <indexterm type="concept">
+ <primary><literal>UNKNOWN</literal></primary>
+ <secondary>testing for</secondary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary>IS boolean_value</primary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary>IS NOT boolean_value</primary>
+ </indexterm>
+
<para>
<literal>IS
<replaceable>boolean_value</replaceable></literal> ,
@@ -638,24 +624,22 @@
</para>
<!-- description_for_help_topic IS NULL NULL IS -->
-
- <para>
- <indexterm type="concept">
- <primary><literal>NULL</literal></primary>
- <secondary>testing for null</secondary>
- </indexterm>
-
- <indexterm type="function">
- <primary>IS NULL</primary>
- </indexterm>
-
- <indexterm type="function">
- <primary>IS NOT NULL</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="concept">
+ <primary><literal>NULL</literal></primary>
+ <secondary>testing for null</secondary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary>IS NULL</primary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary>IS NOT NULL</primary>
+ </indexterm>
+
<para>
<literal>IS NULL</literal> , <literal>IS NOT NULL</literal>
</para>
@@ -734,15 +718,13 @@
</itemizedlist>
<!-- description_for_help_topic BETWEEN AND BETWEEN AND -->
-
- <para>
- <indexterm type="function">
- <primary>BETWEEN ... AND</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="function">
+ <primary>BETWEEN ... AND</primary>
+ </indexterm>
+
<para>
<literal><replaceable>expr</replaceable> BETWEEN
<replaceable>min</replaceable> AND
@@ -784,15 +766,13 @@
</programlisting>
<!-- description_for_help_topic NOT BETWEEN -->
-
- <para>
- <indexterm type="function">
- <primary>NOT BETWEEN</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="function">
+ <primary>NOT BETWEEN</primary>
+ </indexterm>
+
<para>
<literal><replaceable>expr</replaceable> NOT BETWEEN
<replaceable>min</replaceable> AND
@@ -809,20 +789,18 @@
<!-- end_description_for_help_topic -->
<!-- description_for_help_topic COALESCE -->
-
- <para>
- <indexterm type="concept">
- <primary><literal>NULL</literal></primary>
- <secondary>testing for null</secondary>
- </indexterm>
-
- <indexterm type="function">
- <primary>COALESCE()</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="concept">
+ <primary><literal>NULL</literal></primary>
+ <secondary>testing for null</secondary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary>COALESCE()</primary>
+ </indexterm>
+
<para>
<literal>COALESCE(<replaceable>value</replaceable>,...)</literal>
</para>
@@ -848,15 +826,13 @@
</para>
<!-- description_for_help_topic GREATEST -->
-
- <para>
- <indexterm type="function">
- <primary>GREATEST()</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="function">
+ <primary>GREATEST()</primary>
+ </indexterm>
+
<para>
<literal>GREATEST(<replaceable>value1</replaceable>,<replaceable>value2</replaceable>,...)</literal>
</para>
@@ -886,15 +862,13 @@
</para>
<!-- description_for_help_topic IN -->
-
- <para>
- <indexterm type="function">
- <primary>IN</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="function">
+ <primary>IN</primary>
+ </indexterm>
+
<para>
<literal><replaceable>expr</replaceable> IN
(<replaceable>value</replaceable>,...)</literal>
@@ -948,15 +922,13 @@
</para>
<!-- description_for_help_topic NOT IN -->
-
- <para>
- <indexterm type="function">
- <primary>NOT IN</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="function">
+ <primary>NOT IN</primary>
+ </indexterm>
+
<para>
<literal><replaceable>expr</replaceable> NOT IN
(<replaceable>value</replaceable>,...)</literal>
@@ -971,15 +943,13 @@
<!-- end_description_for_help_topic -->
<!-- description_for_help_topic ISNULL -->
-
- <para>
- <indexterm type="function">
- <primary>ISNULL()</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="function">
+ <primary>ISNULL()</primary>
+ </indexterm>
+
<para>
<literal>ISNULL(<replaceable>expr</replaceable>)</literal>
</para>
--- 1.5/refman-5.0/functions.xml 2005-08-13 14:06:26 -05:00
+++ 1.6/refman-5.0/functions.xml 2005-08-14 20:22:03 -05:00
@@ -332,15 +332,15 @@
<!-- description_for_help_topic = -->
- <indexterm type="function">
- <primary>= (equal)</primary>
- </indexterm>
-
- <indexterm type="function">
- <primary>equal (=)</primary>
- </indexterm>
-
<listitem>
+ <indexterm type="function">
+ <primary>= (equal)</primary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary>equal (=)</primary>
+ </indexterm>
+
<para>
<literal>=</literal>
</para>
@@ -367,20 +367,18 @@
</programlisting>
<!-- description_for_help_topic <=> -->
-
- <para>
- <indexterm type="concept">
- <primary><literal>NULL</literal></primary>
- <secondary>testing for null</secondary>
- </indexterm>
-
- <indexterm type="function">
- <primary><=> (equal to)</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="concept">
+ <primary><literal>NULL</literal></primary>
+ <secondary>testing for null</secondary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary><=> (equal to)</primary>
+ </indexterm>
+
<para>
<literal><=></literal>
</para>
@@ -406,27 +404,25 @@
</programlisting>
<!-- description_for_help_topic != <> -->
-
- <para>
- <indexterm type="function">
- <primary><> (not equal)</primary>
- </indexterm>
-
- <indexterm type="function">
- <primary>not equal (<>)</primary>
- </indexterm>
-
- <indexterm type="function">
- <primary>!= (not equal)</primary>
- </indexterm>
-
- <indexterm type="function">
- <primary>not equal (!=)</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="function">
+ <primary><> (not equal)</primary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary>not equal (<>)</primary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary>!= (not equal)</primary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary>not equal (!=)</primary>
+ </indexterm>
+
<para>
<literal><></literal> , <literal>!=</literal>
</para>
@@ -449,19 +445,17 @@
</programlisting>
<!-- description_for_help_topic <= -->
-
- <para>
- <indexterm type="function">
- <primary><= (less than or equal)</primary>
- </indexterm>
-
- <indexterm type="function">
- <primary>less than or equal (<=)</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="function">
+ <primary><= (less than or equal)</primary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary>less than or equal (<=)</primary>
+ </indexterm>
+
<para>
<literal><=</literal>
</para>
@@ -480,19 +474,17 @@
</programlisting>
<!-- description_for_help_topic < -->
-
- <para>
- <indexterm type="function">
- <primary>< (less than)</primary>
- </indexterm>
-
- <indexterm type="function">
- <primary>less than (<)</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="function">
+ <primary>< (less than)</primary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary>less than (<)</primary>
+ </indexterm>
+
<para>
<literal><</literal>
</para>
@@ -511,19 +503,17 @@
</programlisting>
<!-- description_for_help_topic >= -->
-
- <para>
- <indexterm type="function">
- <primary>>= (greater than or equal)</primary>
- </indexterm>
-
- <indexterm type="function">
- <primary>greater than or equal (>=)</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="function">
+ <primary>>= (greater than or equal)</primary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary>greater than or equal (>=)</primary>
+ </indexterm>
+
<para>
<literal>>=</literal>
</para>
@@ -542,19 +532,17 @@
</programlisting>
<!-- description_for_help_topic > -->
-
- <para>
- <indexterm type="function">
- <primary>> (greater than)</primary>
- </indexterm>
-
- <indexterm type="function">
- <primary>greater than (>)</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="function">
+ <primary>> (greater than)</primary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary>greater than (>)</primary>
+ </indexterm>
+
<para>
<literal>></literal>
</para>
@@ -573,34 +561,32 @@
</programlisting>
<!-- description_for_help_topic IS -->
-
- <para>
- <indexterm type="concept">
- <primary><literal>TRUE</literal></primary>
- <secondary>testing for</secondary>
- </indexterm>
-
- <indexterm type="concept">
- <primary><literal>FALSE</literal></primary>
- <secondary>testing for</secondary>
- </indexterm>
-
- <indexterm type="concept">
- <primary><literal>UNKNOWN</literal></primary>
- <secondary>testing for</secondary>
- </indexterm>
-
- <indexterm type="function">
- <primary>IS boolean_value</primary>
- </indexterm>
-
- <indexterm type="function">
- <primary>IS NOT boolean_value</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="concept">
+ <primary><literal>TRUE</literal></primary>
+ <secondary>testing for</secondary>
+ </indexterm>
+
+ <indexterm type="concept">
+ <primary><literal>FALSE</literal></primary>
+ <secondary>testing for</secondary>
+ </indexterm>
+
+ <indexterm type="concept">
+ <primary><literal>UNKNOWN</literal></primary>
+ <secondary>testing for</secondary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary>IS boolean_value</primary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary>IS NOT boolean_value</primary>
+ </indexterm>
+
<para>
<literal>IS
<replaceable>boolean_value</replaceable></literal> ,
@@ -633,24 +619,22 @@
</para>
<!-- description_for_help_topic IS NULL NULL IS -->
-
- <para>
- <indexterm type="concept">
- <primary><literal>NULL</literal></primary>
- <secondary>testing for null</secondary>
- </indexterm>
-
- <indexterm type="function">
- <primary>IS NULL</primary>
- </indexterm>
-
- <indexterm type="function">
- <primary>IS NOT NULL</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="concept">
+ <primary><literal>NULL</literal></primary>
+ <secondary>testing for null</secondary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary>IS NULL</primary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary>IS NOT NULL</primary>
+ </indexterm>
+
<para>
<literal>IS NULL</literal> , <literal>IS NOT NULL</literal>
</para>
@@ -729,15 +713,13 @@
</itemizedlist>
<!-- description_for_help_topic BETWEEN AND BETWEEN AND -->
-
- <para>
- <indexterm type="function">
- <primary>BETWEEN ... AND</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="function">
+ <primary>BETWEEN ... AND</primary>
+ </indexterm>
+
<para>
<literal><replaceable>expr</replaceable> BETWEEN
<replaceable>min</replaceable> AND
@@ -777,15 +759,13 @@
</programlisting>
<!-- description_for_help_topic NOT BETWEEN -->
-
- <para>
- <indexterm type="function">
- <primary>NOT BETWEEN</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="function">
+ <primary>NOT BETWEEN</primary>
+ </indexterm>
+
<para>
<literal><replaceable>expr</replaceable> NOT BETWEEN
<replaceable>min</replaceable> AND
@@ -802,20 +782,18 @@
<!-- end_description_for_help_topic -->
<!-- description_for_help_topic COALESCE -->
-
- <para>
- <indexterm type="concept">
- <primary><literal>NULL</literal></primary>
- <secondary>testing for null</secondary>
- </indexterm>
-
- <indexterm type="function">
- <primary>COALESCE()</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="concept">
+ <primary><literal>NULL</literal></primary>
+ <secondary>testing for null</secondary>
+ </indexterm>
+
+ <indexterm type="function">
+ <primary>COALESCE()</primary>
+ </indexterm>
+
<para>
<literal>COALESCE(<replaceable>value</replaceable>,...)</literal>
</para>
@@ -837,15 +815,13 @@
</programlisting>
<!-- description_for_help_topic GREATEST -->
-
- <para>
- <indexterm type="function">
- <primary>GREATEST()</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="function">
+ <primary>GREATEST()</primary>
+ </indexterm>
+
<para>
<literal>GREATEST(<replaceable>value1</replaceable>,<replaceable>value2</replaceable>,...)</literal>
</para>
@@ -870,15 +846,13 @@
</programlisting>
<!-- description_for_help_topic IN -->
-
- <para>
- <indexterm type="function">
- <primary>IN</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="function">
+ <primary>IN</primary>
+ </indexterm>
+
<para>
<literal><replaceable>expr</replaceable> IN
(<replaceable>value</replaceable>,...)</literal>
@@ -932,15 +906,13 @@
</para>
<!-- description_for_help_topic NOT IN -->
-
- <para>
- <indexterm type="function">
- <primary>NOT IN</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="function">
+ <primary>NOT IN</primary>
+ </indexterm>
+
<para>
<literal><replaceable>expr</replaceable> NOT IN
(<replaceable>value</replaceable>,...)</literal>
@@ -955,15 +927,13 @@
<!-- end_description_for_help_topic -->
<!-- description_for_help_topic ISNULL -->
-
- <para>
- <indexterm type="function">
- <primary>ISNULL()</primary>
- </indexterm>
- </para>
</listitem>
<listitem>
+ <indexterm type="function">
+ <primary>ISNULL()</primary>
+ </indexterm>
+
<para>
<literal>ISNULL(<replaceable>expr</replaceable>)</literal>
</para>
| Thread |
|---|
| • bk commit - mysqldoc@docsrva tree (paul:1.3271) | paul | 15 Aug |
