Author: plavin
Date: 2007-03-16 18:12:49 +0100 (Fri, 16 Mar 2007)
New Revision: 5421
Log:
Correct return types
Modified:
trunk/dynamic-docs/opsfunctions/opfunctions.xml
Modified: trunk/dynamic-docs/opsfunctions/opfunctions.xml
===================================================================
--- trunk/dynamic-docs/opsfunctions/opfunctions.xml 2007-03-16 17:04:17 UTC (rev 5420)
+++ trunk/dynamic-docs/opsfunctions/opfunctions.xml 2007-03-16 17:12:49 UTC (rev 5421)
Changed blocks: 32, Lines Added: 63, Lines Deleted: 44; 10318 bytes
@@ -104,18 +104,9 @@
</versions>
</operator>
- <operator id="not-in" class="logical" >
- <display>NOT IN</display>
- <description lang="en">Negation of a set of values</description>
- <versions>
- <manual version="4.1"/>
- <manual version="5.0"/>
- <manual version="5.1"/>
- </versions>
- </operator>
-
- <operator id="and" class="logical">
+ <operator id="and" class="logical">
<display>AND</display>
+ <display>&&</display>
<description lang="en">Logical AND</description>
<versions>
<manual version="4.1"/>
@@ -124,8 +115,9 @@
</versions>
</operator>
- <operator id="or" class="logical" >
- <display>||, OR</display>
+ <operator id="or" class="logical">
+ <display>||</display>
+ <display>OR</display>
<description lang="en">Logical OR</description>
<versions>
<manual version="4.1"/>
@@ -154,7 +146,7 @@
</versions>
</operator>
- <operator id="not-like" class="logical" >
+ <operator id="not-like" class="comparison" >
<display>NOT LIKE</display>
<description lang="en">Negation of simple pattern matching</description>
<versions>
@@ -164,7 +156,7 @@
</versions>
</operator>
- <operator id="not-regexp" class="logical" >
+ <operator id="not-regexp" class="comparison" >
<display>NOT RGEXP</display>
<description lang="en">Negation of REGEXP</description>
<versions>
@@ -184,6 +176,17 @@
</versions>
</operator>
+ <operator id="rlike" class="comparison" >
+ <!--synonym, no id in the manual-->
+ <display>RLIKE</display>
+ <description lang="en">Synonym for REGEXP</description>
+ <versions>
+ <manual version="4.1"/>
+ <manual version="5.0"/>
+ <manual version="5.1"/>
+ </versions>
+ </operator>
+
<operator id="plus" class="arithmetic" >
<display>+</display>
<description lang="en">Addition operator</description>
@@ -215,7 +218,7 @@
</operator>
<operator id="times" class="arithmetic" >
- <display>* (multiplication)</display>
+ <display>*</display>
<description lang="en">Times operator</description>
<versions>
<manual version="4.1"/>
@@ -225,7 +228,7 @@
</operator>
<operator id="by" class="arithmetic" >
- <display>/ (division)</display>
+ <display>/</display>
<description lang="en">Division operator</description>
<versions>
<manual version="4.1"/>
@@ -246,7 +249,7 @@
<operator id="mod" class="arithmetic" >
<display>%</display>
- <description lang="en">Modulus operator</description>
+ <description lang="en">Modulo operator</description>
<versions>
<manual version="4.1"/>
<manual version="5.0"/>
@@ -265,7 +268,7 @@
</operator>
<operator id="bitwise-or" class="bit-level" >
- <display>| (bitwise OR)</display>
+ <display>|</display>
<description lang="en">Bitwise OR</description>
<versions>
<manual version="4.1"/>
@@ -275,7 +278,7 @@
</operator>
<operator id="bitwise-and" class="bit-level" >
- <display>& (bitwise AND)</display>
+ <display>&</display>
<description lang="en">Bitwise AND</description>
<versions>
<manual version="4.1"/>
@@ -285,7 +288,7 @@
</operator>
<operator id="bitwise-xor" class="bit-level" >
- <display>^ (bitwise XOR)</display>
+ <display>^</display>
<description lang="en">Bitwise XOR</description>
<versions>
<manual version="4.1"/>
@@ -304,7 +307,7 @@
</versions>
</operator>
- <operator id="right-shift" class="bit-level" >
+ <operator id="right-shift" class="bit-level">
<display>>></display>
<description lang="en">Right shift</description>
<versions>
@@ -314,7 +317,7 @@
</versions>
</operator>
- <operator id="tilde" class="bit-level" >
+ <operator id="tilde" class="bit-level">
<display>~</display>
<description lang="en">Invert bits</description>
<versions>
@@ -324,7 +327,7 @@
</versions>
</operator>
- <operator id="sounds-like" class="comparison" >
+ <operator id="sounds-like" class="comparison">
<display>SOUNDS LIKE</display>
<description lang="en">Compare sounds</description>
<versions>
@@ -341,8 +344,7 @@
<description lang="en">Case statement</description>
<arguments>
<format></format>
- </arguments>
-
+ </arguments>
<return type="none"/>
<error type="sql"/>
<versions>
@@ -382,7 +384,7 @@
<argument seq="2" name="type" type="string">Datatype to cast
to</argument>
</arguments>
- <return type="value"/>
+ <return type="mixed"/>
<error type="return"/>
<versions>
<manual version="4.1"/>
@@ -398,7 +400,7 @@
<format><![CDATA[<replaceable>X</replaceable>]]></format>
<argument seq="1" name="expr" type="numeric"></argument>
</arguments>
- <return type="value"/>
+ <return type="numeric"/>
<error type="return"/>
<versions>
<manual version="4.1"/>
@@ -414,7 +416,7 @@
<format><![CDATA[<replaceable>X</replaceable>]]></format>
<argument seq="1" name="expr" type="numeric"></argument>
</arguments>
- <return type="value"/>
+ <return type="numeric"/>
<error type="return"/>
<versions>
<manual version="4.1"/>
@@ -430,7 +432,7 @@
<format><![CDATA[<replaceable>X</replaceable>]]></format>
<argument seq="1" name="expr" type="numeric"></argument>
</arguments>
- <return type="value"/>
+ <return type="numeric"/>
<error type="return"/>
<versions>
<manual version="4.1"/>
@@ -447,7 +449,7 @@
<format><![CDATA[<replaceable>X</replaceable>]]></format>
<argument seq="1" name="expr" type="numeric"></argument>
</arguments>
- <return type="value"/>
+ <return type="numeric"/>
<error type="return"/>
<versions>
<manual version="4.1"/>
@@ -465,7 +467,7 @@
<argument seq="2" name="expr" type="numeric"></argument>
</arguments>
- <return type="value"/>
+ <return type="numeric"/>
<error type="return"/>
<versions>
<manual version="4.1"/>
@@ -483,7 +485,7 @@
<argument seq="1" name="expr" type="numeric"></argument>
</arguments>
- <return type="value"/>
+ <return type="numeric"/>
<error type="return"/>
<versions>
<manual version="4.1"/>
@@ -499,7 +501,7 @@
<format><![CDATA[<replaceable>X</replaceable>]]></format>
<argument seq="1" name="expr" type="numeric"></argument>
</arguments>
- <return type="value"/>
+ <return type="numeric"/>
<error type="return"/>
<versions>
<manual version="4.1"/>
@@ -515,7 +517,7 @@
<format><![CDATA[<replaceable>X</replaceable>]]></format>
<argument seq="1" name="expr" type="numeric"></argument>
</arguments>
- <return type="value"/>
+ <return type="numeric"/>
<error type="return"/>
<versions>
<manual version="4.1"/>
@@ -531,7 +533,7 @@
<format><![CDATA[<replaceable>expr</replaceable>]]></format>
<argument seq="1" name="expr" type="string"></argument>
</arguments>
- <return type="value"/>
+ <return type="string"/>
<error type="return"/>
<versions>
<manual version="4.1"/>
@@ -547,7 +549,7 @@
<format><![CDATA[<replaceable>X</replaceable>]]></format>
<argument seq="1" name="expr" type="numeric">Radians</argument>
</arguments>
- <return type="value"/>
+ <return type="numeric"/>
<error type="return"/>
<versions>
<manual version="4.1"/>
@@ -582,7 +584,7 @@
<format><![CDATA[<replaceable>X</replaceable>]]></format>
<argument seq="1" name="expr" type="numeric"></argument>
</arguments>
- <return type="value"/>
+ <return type="numeric"/>
<error type="return"/>
<versions>
<manual version="4.1"/>
@@ -623,7 +625,7 @@
<argument seq="2" name="expr" type="numeric">Base</argument>
</arguments>
- <return type="value"/>
+ <return type="numeric"/>
<error type="return"/>
<versions>
<manual version="4.1"/>
@@ -666,13 +668,13 @@
<function id="mod2" class="mathematical">
<display>MOD()</display>
- <description lang="en">Return the modulus</description>
+ <description lang="en">Return the remainder</description>
<arguments>
<format><![CDATA[<replaceable>N</replaceable>,<replaceable>M</replaceable>]]></format>
<argument seq="1" name="expr" type="numeric">Dividend</argument>
<argument seq="2" name="expr" type="numeric">Divisor</argument>
</arguments>
- <return type="value"/>
+ <return type="numeric"/>
<error type="return"/>
<versions>
<manual version="4.1"/>
@@ -705,7 +707,7 @@
<argument seq="1" name="expr" type="numeric"></argument>
<argument seq="2" name="expr" type="numeric"></argument>
</arguments>
- <return type="value"/>
+ <return type="numeric"/>
<error type="return"/>
<versions>
<manual version="4.1"/>
@@ -3916,8 +3918,8 @@
</function>
<function id="in" class="comparison">
- <display>NOT BETWEEN ... AND</display>
- <description lang="en">Check whether a value is not within a range of values</description>
+ <display>IN</display>
+ <description lang="en">Check whether a value is not within a set of values</description>
<arguments>
<format><![CDATA[<replaceable>expr</replaceable> IN
(<replaceable>value</replaceable>,...)]]></format>
@@ -3933,5 +3935,22 @@
</versions>
</function>
+ <function id="not-in" class="comparison">
+ <display>NOT IN</display>
+ <description lang="en">Check whether a value is not within a set of values</description>
+ <arguments>
+ <format><![CDATA[<replaceable>expr</replaceable> NOT IN
+ (<replaceable>value</replaceable>,...)]]></format>
+ <argument seq="1" name="expr" type="mixed"></argument>
+ <argument seq="2" name="expr" type="mixed"></argument>
+ </arguments>
+ <return type="bool"/>
+ <error type="return"/>
+ <versions>
+ <manual version="4.1"/>
+ <manual version="5.0"/>
+ <manual version="5.1"/>
+ </versions>
+ </function>
</opfunctions>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r5421 - trunk/dynamic-docs/opsfunctions | plavin | 16 Mar |
