Author: paul
Date: 2007-11-15 21:41:04 +0100 (Thu, 15 Nov 2007)
New Revision: 8750
Log:
r32922@polar: paul | 2007-11-15 13:38:02 -0600
Add markup.
Modified:
trunk/refman-4.1/functions-core.xml
trunk/refman-5.0/functions-core.xml
trunk/refman-5.1/functions-core.xml
trunk/refman-6.0/functions-core.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:32921
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:27052
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:22167
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:32922
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:27052
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:22167
Modified: trunk/refman-4.1/functions-core.xml
===================================================================
--- trunk/refman-4.1/functions-core.xml 2007-11-15 20:40:51 UTC (rev 8749)
+++ trunk/refman-4.1/functions-core.xml 2007-11-15 20:41:04 UTC (rev 8750)
Changed blocks: 7, Lines Added: 26, Lines Deleted: 18; 4276 bytes
@@ -731,7 +731,7 @@
<remark role="help-topic" condition="IS NULL"/>
<remark role="help-keywords">
- NULL IS
+ NULL IS NOT
</remark>
<remark role="help-syntax-begin"/>
@@ -750,7 +750,10 @@
<primary>IS NOT NULL</primary>
</indexterm>
- <literal>IS NULL</literal>, <literal>IS NOT NULL</literal>
+ <function role="sqlop" condition="operator_is-null">IS
+ NULL</function>,
+ <function role="sqlop" condition="operator_is-null">IS NOT
+ NULL</function>
</para>
<remark role="help-syntax-end"/>
@@ -845,9 +848,9 @@
<primary>BETWEEN ... AND</primary>
</indexterm>
- <literal><replaceable>expr</replaceable> BETWEEN
- <replaceable>min</replaceable> AND
- <replaceable>max</replaceable></literal>
+ <function role="sqlop" condition="operator_between"><replaceable>expr</replaceable>
+ BETWEEN <replaceable>min</replaceable> AND
+ <replaceable>max</replaceable></function>
</para>
<remark role="help-syntax-end"/>
@@ -858,8 +861,9 @@
If <replaceable>expr</replaceable> is greater than or equal
to <replaceable>min</replaceable> and
<replaceable>expr</replaceable> is less than or equal to
- <replaceable>max</replaceable>, <literal>BETWEEN</literal>
- returns <literal>1</literal>, otherwise it returns
+ <replaceable>max</replaceable>,
+ <function role="sqlop">BETWEEN</function> returns
+ <literal>1</literal>, otherwise it returns
<literal>0</literal>. This is equivalent to the expression
<literal>(<replaceable>min</replaceable> <=
<replaceable>expr</replaceable> AND
@@ -894,12 +898,13 @@
</programlisting>
<para>
- For best results when using <literal>BETWEEN</literal> with
- date or time values, you should use
- <literal>CAST()</literal> to explicitly convert the values
- to the desired data type. Examples: If you compare a
- <literal>DATETIME</literal> to two <literal>DATE</literal>
- values, convert the <literal>DATE</literal> values to
+ For best results when using
+ <function role="sqlop">BETWEEN</function> with date or time
+ values, you should use <literal>CAST()</literal> to
+ explicitly convert the values to the desired data type.
+ Examples: If you compare a <literal>DATETIME</literal> to
+ two <literal>DATE</literal> values, convert the
+ <literal>DATE</literal> values to
<literal>DATETIME</literal> values. If you use a string
constant such as <literal>'2001-1-1'</literal> in a
comparison to a <literal>DATE</literal>, cast the string to
@@ -917,9 +922,9 @@
<primary>NOT BETWEEN</primary>
</indexterm>
- <literal><replaceable>expr</replaceable> NOT BETWEEN
- <replaceable>min</replaceable> AND
- <replaceable>max</replaceable></literal>
+ <function role="sqlop" condition="operator_not-between"><replaceable>expr</replaceable>
+ NOT BETWEEN <replaceable>min</replaceable> AND
+ <replaceable>max</replaceable></function>
</para>
<remark role="help-syntax-end"/>
@@ -1188,8 +1193,11 @@
<para>
The <literal>ISNULL()</literal> function shares some special
- behaviors with the <literal>IS NULL</literal> comparison
- operator. See the description of <literal>IS NULL</literal>.
+ behaviors with the
+ <function role="sqlop" condition="operator_is-null">IS
+ NULL</function> comparison operator. See the description of
+ <function role="sqlop" condition="operator_is-null">IS
+ NULL</function>.
</para>
</listitem>
Modified: trunk/refman-5.0/functions-core.xml
===================================================================
--- trunk/refman-5.0/functions-core.xml 2007-11-15 20:40:51 UTC (rev 8749)
+++ trunk/refman-5.0/functions-core.xml 2007-11-15 20:41:04 UTC (rev 8750)
Changed blocks: 7, Lines Added: 26, Lines Deleted: 18; 4280 bytes
@@ -868,7 +868,7 @@
<remark role="help-topic" condition="IS NULL"/>
<remark role="help-keywords">
- NULL IS
+ NULL IS NOT
</remark>
<remark role="help-syntax-begin"/>
@@ -887,7 +887,10 @@
<primary>IS NOT NULL</primary>
</indexterm>
- <literal>IS NULL</literal>, <literal>IS NOT NULL</literal>
+ <function role="sqlop" condition="operator_is-null">IS
+ NULL</function>,
+ <function role="sqlop" condition="operator_is-null">IS NOT
+ NULL</function>
</para>
<remark role="help-syntax-end"/>
@@ -982,9 +985,9 @@
<primary>BETWEEN ... AND</primary>
</indexterm>
- <literal><replaceable>expr</replaceable> BETWEEN
- <replaceable>min</replaceable> AND
- <replaceable>max</replaceable></literal>
+ <function role="sqlop" condition="operator_between"><replaceable>expr</replaceable>
+ BETWEEN <replaceable>min</replaceable> AND
+ <replaceable>max</replaceable></function>
</para>
<remark role="help-syntax-end"/>
@@ -995,8 +998,9 @@
If <replaceable>expr</replaceable> is greater than or equal
to <replaceable>min</replaceable> and
<replaceable>expr</replaceable> is less than or equal to
- <replaceable>max</replaceable>, <literal>BETWEEN</literal>
- returns <literal>1</literal>, otherwise it returns
+ <replaceable>max</replaceable>,
+ <function role="sqlop">BETWEEN</function> returns
+ <literal>1</literal>, otherwise it returns
<literal>0</literal>. This is equivalent to the expression
<literal>(<replaceable>min</replaceable> <=
<replaceable>expr</replaceable> AND
@@ -1024,12 +1028,13 @@
</programlisting>
<para>
- For best results when using <literal>BETWEEN</literal> with
- date or time values, you should use
- <literal>CAST()</literal> to explicitly convert the values
- to the desired data type. Examples: If you compare a
- <literal>DATETIME</literal> to two <literal>DATE</literal>
- values, convert the <literal>DATE</literal> values to
+ For best results when using
+ <function role="sqlop">BETWEEN</function> with date or time
+ values, you should use <literal>CAST()</literal> to
+ explicitly convert the values to the desired data type.
+ Examples: If you compare a <literal>DATETIME</literal> to
+ two <literal>DATE</literal> values, convert the
+ <literal>DATE</literal> values to
<literal>DATETIME</literal> values. If you use a string
constant such as <literal>'2001-1-1'</literal> in a
comparison to a <literal>DATE</literal>, cast the string to
@@ -1047,9 +1052,9 @@
<primary>NOT BETWEEN</primary>
</indexterm>
- <literal><replaceable>expr</replaceable> NOT BETWEEN
- <replaceable>min</replaceable> AND
- <replaceable>max</replaceable></literal>
+ <function role="sqlop" condition="operator_not-between"><replaceable>expr</replaceable>
+ NOT BETWEEN <replaceable>min</replaceable> AND
+ <replaceable>max</replaceable></function>
</para>
<remark role="help-syntax-end"/>
@@ -1310,8 +1315,11 @@
<para>
The <literal>ISNULL()</literal> function shares some special
- behaviors with the <literal>IS NULL</literal> comparison
- operator. See the description of <literal>IS NULL</literal>.
+ behaviors with the
+ <function role="sqlop" condition="operator_is-null">IS
+ NULL</function> comparison operator. See the description of
+ <function role="sqlop" condition="operator_is-null">IS
+ NULL</function>.
</para>
</listitem>
Modified: trunk/refman-5.1/functions-core.xml
===================================================================
--- trunk/refman-5.1/functions-core.xml 2007-11-15 20:40:51 UTC (rev 8749)
+++ trunk/refman-5.1/functions-core.xml 2007-11-15 20:41:04 UTC (rev 8750)
Changed blocks: 7, Lines Added: 26, Lines Deleted: 18; 4280 bytes
@@ -855,7 +855,7 @@
<remark role="help-topic" condition="IS NULL"/>
<remark role="help-keywords">
- NULL IS
+ NULL IS NOT
</remark>
<remark role="help-syntax-begin"/>
@@ -874,7 +874,10 @@
<primary>IS NOT NULL</primary>
</indexterm>
- <literal>IS NULL</literal>, <literal>IS NOT NULL</literal>
+ <function role="sqlop" condition="operator_is-null">IS
+ NULL</function>,
+ <function role="sqlop" condition="operator_is-null">IS NOT
+ NULL</function>
</para>
<remark role="help-syntax-end"/>
@@ -969,9 +972,9 @@
<primary>BETWEEN ... AND</primary>
</indexterm>
- <literal><replaceable>expr</replaceable> BETWEEN
- <replaceable>min</replaceable> AND
- <replaceable>max</replaceable></literal>
+ <function role="sqlop" condition="operator_between"><replaceable>expr</replaceable>
+ BETWEEN <replaceable>min</replaceable> AND
+ <replaceable>max</replaceable></function>
</para>
<remark role="help-syntax-end"/>
@@ -982,8 +985,9 @@
If <replaceable>expr</replaceable> is greater than or equal
to <replaceable>min</replaceable> and
<replaceable>expr</replaceable> is less than or equal to
- <replaceable>max</replaceable>, <literal>BETWEEN</literal>
- returns <literal>1</literal>, otherwise it returns
+ <replaceable>max</replaceable>,
+ <function role="sqlop">BETWEEN</function> returns
+ <literal>1</literal>, otherwise it returns
<literal>0</literal>. This is equivalent to the expression
<literal>(<replaceable>min</replaceable> <=
<replaceable>expr</replaceable> AND
@@ -1011,12 +1015,13 @@
</programlisting>
<para>
- For best results when using <literal>BETWEEN</literal> with
- date or time values, you should use
- <literal>CAST()</literal> to explicitly convert the values
- to the desired data type. Examples: If you compare a
- <literal>DATETIME</literal> to two <literal>DATE</literal>
- values, convert the <literal>DATE</literal> values to
+ For best results when using
+ <function role="sqlop">BETWEEN</function> with date or time
+ values, you should use <literal>CAST()</literal> to
+ explicitly convert the values to the desired data type.
+ Examples: If you compare a <literal>DATETIME</literal> to
+ two <literal>DATE</literal> values, convert the
+ <literal>DATE</literal> values to
<literal>DATETIME</literal> values. If you use a string
constant such as <literal>'2001-1-1'</literal> in a
comparison to a <literal>DATE</literal>, cast the string to
@@ -1034,9 +1039,9 @@
<primary>NOT BETWEEN</primary>
</indexterm>
- <literal><replaceable>expr</replaceable> NOT BETWEEN
- <replaceable>min</replaceable> AND
- <replaceable>max</replaceable></literal>
+ <function role="sqlop" condition="operator_not-between"><replaceable>expr</replaceable>
+ NOT BETWEEN <replaceable>min</replaceable> AND
+ <replaceable>max</replaceable></function>
</para>
<remark role="help-syntax-end"/>
@@ -1295,8 +1300,11 @@
<para>
The <literal>ISNULL()</literal> function shares some special
- behaviors with the <literal>IS NULL</literal> comparison
- operator. See the description of <literal>IS NULL</literal>.
+ behaviors with the
+ <function role="sqlop" condition="operator_is-null">IS
+ NULL</function> comparison operator. See the description of
+ <function role="sqlop" condition="operator_is-null">IS
+ NULL</function>.
</para>
</listitem>
Modified: trunk/refman-6.0/functions-core.xml
===================================================================
--- trunk/refman-6.0/functions-core.xml 2007-11-15 20:40:51 UTC (rev 8749)
+++ trunk/refman-6.0/functions-core.xml 2007-11-15 20:41:04 UTC (rev 8750)
Changed blocks: 7, Lines Added: 26, Lines Deleted: 18; 4280 bytes
@@ -855,7 +855,7 @@
<remark role="help-topic" condition="IS NULL"/>
<remark role="help-keywords">
- NULL IS
+ NULL IS NOT
</remark>
<remark role="help-syntax-begin"/>
@@ -874,7 +874,10 @@
<primary>IS NOT NULL</primary>
</indexterm>
- <literal>IS NULL</literal>, <literal>IS NOT NULL</literal>
+ <function role="sqlop" condition="operator_is-null">IS
+ NULL</function>,
+ <function role="sqlop" condition="operator_is-null">IS NOT
+ NULL</function>
</para>
<remark role="help-syntax-end"/>
@@ -969,9 +972,9 @@
<primary>BETWEEN ... AND</primary>
</indexterm>
- <literal><replaceable>expr</replaceable> BETWEEN
- <replaceable>min</replaceable> AND
- <replaceable>max</replaceable></literal>
+ <function role="sqlop" condition="operator_between"><replaceable>expr</replaceable>
+ BETWEEN <replaceable>min</replaceable> AND
+ <replaceable>max</replaceable></function>
</para>
<remark role="help-syntax-end"/>
@@ -982,8 +985,9 @@
If <replaceable>expr</replaceable> is greater than or equal
to <replaceable>min</replaceable> and
<replaceable>expr</replaceable> is less than or equal to
- <replaceable>max</replaceable>, <literal>BETWEEN</literal>
- returns <literal>1</literal>, otherwise it returns
+ <replaceable>max</replaceable>,
+ <function role="sqlop">BETWEEN</function> returns
+ <literal>1</literal>, otherwise it returns
<literal>0</literal>. This is equivalent to the expression
<literal>(<replaceable>min</replaceable> <=
<replaceable>expr</replaceable> AND
@@ -1011,12 +1015,13 @@
</programlisting>
<para>
- For best results when using <literal>BETWEEN</literal> with
- date or time values, you should use
- <literal>CAST()</literal> to explicitly convert the values
- to the desired data type. Examples: If you compare a
- <literal>DATETIME</literal> to two <literal>DATE</literal>
- values, convert the <literal>DATE</literal> values to
+ For best results when using
+ <function role="sqlop">BETWEEN</function> with date or time
+ values, you should use <literal>CAST()</literal> to
+ explicitly convert the values to the desired data type.
+ Examples: If you compare a <literal>DATETIME</literal> to
+ two <literal>DATE</literal> values, convert the
+ <literal>DATE</literal> values to
<literal>DATETIME</literal> values. If you use a string
constant such as <literal>'2001-1-1'</literal> in a
comparison to a <literal>DATE</literal>, cast the string to
@@ -1034,9 +1039,9 @@
<primary>NOT BETWEEN</primary>
</indexterm>
- <literal><replaceable>expr</replaceable> NOT BETWEEN
- <replaceable>min</replaceable> AND
- <replaceable>max</replaceable></literal>
+ <function role="sqlop" condition="operator_not-between"><replaceable>expr</replaceable>
+ NOT BETWEEN <replaceable>min</replaceable> AND
+ <replaceable>max</replaceable></function>
</para>
<remark role="help-syntax-end"/>
@@ -1295,8 +1300,11 @@
<para>
The <literal>ISNULL()</literal> function shares some special
- behaviors with the <literal>IS NULL</literal> comparison
- operator. See the description of <literal>IS NULL</literal>.
+ behaviors with the
+ <function role="sqlop" condition="operator_is-null">IS
+ NULL</function> comparison operator. See the description of
+ <function role="sqlop" condition="operator_is-null">IS
+ NULL</function>.
</para>
</listitem>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r8750 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-6.0 | paul | 15 Nov |
