Author: paul
Date: 2007-12-04 17:36:09 +0100 (Tue, 04 Dec 2007)
New Revision: 9098
Log:
r27729@frost: paul | 2007-12-04 10:34:24 -0600
Add initial info for WEIGHT_STRING() function. (More to come) (WL#3716)
Modified:
trunk/dynamic-docs/changelog/mysqld-1.xml
trunk/dynamic-docs/opsfunctions/opfunctions.xml
trunk/refman-6.0/functions-core.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:33765
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:27716
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:22582
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:33765
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:27729
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:22582
Modified: trunk/dynamic-docs/changelog/mysqld-1.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld-1.xml 2007-12-04 14:49:26 UTC (rev 9097)
+++ trunk/dynamic-docs/changelog/mysqld-1.xml 2007-12-04 16:36:09 UTC (rev 9098)
Changed blocks: 1, Lines Added: 23, Lines Deleted: 0; 792 bytes
@@ -1311,4 +1311,27 @@
</logentry>
+ <logentry entrytype="feature">
+
+ <tags>
+ <manual type="WEIGHT_STRING()"/>
+ </tags>
+
+ <versions>
+ <version ver="5.2.4"/>
+ </versions>
+
+ <message>
+
+ <para>
+ A new SQL function,
+ <function role="sql">WEIGHT_STRING()</function>, returns the
+ weight string for an input string. The weight string represents
+ the sorting and comparison value of the input string.
+ </para>
+
+ </message>
+
+ </logentry>
+
</changelog>
Modified: trunk/dynamic-docs/opsfunctions/opfunctions.xml
===================================================================
--- trunk/dynamic-docs/opsfunctions/opfunctions.xml 2007-12-04 14:49:26 UTC (rev 9097)
+++ trunk/dynamic-docs/opsfunctions/opfunctions.xml 2007-12-04 16:36:09 UTC (rev 9098)
Changed blocks: 4, Lines Added: 23, Lines Deleted: 4; 2708 bytes
@@ -3568,13 +3568,13 @@
[<replaceable>remstr</replaceable>] FROM]
<replaceable>str</replaceable>)</literal>]]></format>
<argument seq="1" name="expr" type="string">Character to be removed</argument>
- <argument seq="2" name="expr" type="string"></argument>
+ <argument seq="2" name="expr" type="string">String from which to remove characters</argument>
</arguments>
<arguments>
<format><![CDATA[[<replaceable>remstr</replaceable> FROM]
<replaceable>str</replaceable>]]></format>
<argument seq="1" name="expr" type="string">Character to be removed</argument>
- <argument seq="2" name="expr" type="string"></argument>
+ <argument seq="2" name="expr" type="string">String from which to remove characters</argument>
</arguments>
<return type="string"/>
@@ -3811,7 +3811,7 @@
</opfunction>
<opfunction type="function" id="in" class="comparison">
- <display>IN</display>
+ <display>IN()</display>
<description lang="en">Check whether a value is within a set of values</description>
<arguments>
<format><![CDATA[<replaceable>expr</replaceable> IN
@@ -3830,7 +3830,7 @@
</opfunction>
<opfunction type="function" id="not-in" class="comparison">
- <display>NOT IN</display>
+ <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
@@ -4253,4 +4253,23 @@
<manual version="6.0"/>
</versions>
</opfunction>
+
+ <opfunction type="function" id="weight_string" inversion="5.2.4" class="string">
+ <display>WEIGHT_STRING</display>
+ <description lang="en">Return the weight string for a string</description>
+ <arguments>
+ <format><![CDATA[<replaceable>str</replaceable> [AS {CHAR|BINARY|(N)]
+[LEVEL <replaceable>levels</replaceable>] [<replaceable>flags</replaceable>]
+ (<replaceable>value</replaceable>,...)]]></format>
+ <argument seq="1" name="str" type="string">Input string</argument>
+ <argument seq="2" name="levels" type="mixed">Collation levels</argument>
+ <argument seq="3" name="flags" type="mixed">Flags</argument>
+ </arguments>
+ <return type="string"/>
+ <error type="return"/>
+ <versions>
+ <manual version="5.2"/>
+ <manual version="6.0"/>
+ </versions>
+ </opfunction>
</opfunctions>
Modified: trunk/refman-6.0/functions-core.xml
===================================================================
--- trunk/refman-6.0/functions-core.xml 2007-12-04 14:49:26 UTC (rev 9097)
+++ trunk/refman-6.0/functions-core.xml 2007-12-04 16:36:09 UTC (rev 9098)
Changed blocks: 1, Lines Added: 27, Lines Deleted: 0; 1144 bytes
@@ -4105,6 +4105,33 @@
</para>
</listitem>
+ <listitem>
+ <remark role="help-topic" condition="WEIGHT_STRING"/>
+
+ <remark role="help-syntax-begin"/>
+
+ <para id="function_upper">
+ <indexterm>
+ <primary>WEIGHT_STRING()</primary>
+ </indexterm>
+
+ <function role="sql">WEIGHT_STRING(<replaceable>str</replaceable>
+ [AS {CHAR|BINARY}(<replaceable>N</replaceable>)] [LEVEL
+ <replaceable>levels</replaceable>]
+ [<replaceable>flags</replaceable>])</function>
+ </para>
+
+ <remark role="help-syntax-end"/>
+
+ <remark role="help-description-begin"/>
+
+ <para>
+ Returns the weight string for the input string.
+ </para>
+
+ <remark role="help-description-end"/>
+ </listitem>
+
</itemizedlist>
<section id="string-comparison-functions">
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r9098 - in trunk: . dynamic-docs/changelog dynamic-docs/opsfunctions refman-6.0 | paul | 4 Dec |
