Author: paul
Date: 2008-06-04 15:35:24 +0200 (Wed, 04 Jun 2008)
New Revision: 10890
Log:
r31849@frost: paul | 2008-06-04 15:35:18 +0200
Fix ID
Add UUID_SHORT() to dyndocs
Modified:
trunk/dynamic-docs/opsfunctions/opfunctions.xml
trunk/it/refman-5.1/functions-core.xml
trunk/pt/refman-5.1/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:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:31846
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:31539
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:31849
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:31539
Modified: trunk/dynamic-docs/opsfunctions/opfunctions.xml
===================================================================
--- trunk/dynamic-docs/opsfunctions/opfunctions.xml 2008-06-04 13:24:05 UTC (rev 10889)
+++ trunk/dynamic-docs/opsfunctions/opfunctions.xml 2008-06-04 13:35:24 UTC (rev 10890)
Changed blocks: 3, Lines Added: 17, Lines Deleted: 3; 2073 bytes
@@ -2228,8 +2228,8 @@
<description lang="en">Return a number formatted to specified number of decimal places</description>
<arguments>
<format><![CDATA[<replaceable>X</replaceable>,<replaceable>D</replaceable>]]></format>
- <argument seq="1" name="expr" type="number"></argument>
- <argument seq="1" name="expr" type="number">Number of decimal places</argument>
+ <argument seq="1" name="expr" type="numeric"></argument>
+ <argument seq="1" name="expr" type="numeric">Number of decimal places</argument>
</arguments>
<return type="string"/>
<error type="return"/>
@@ -2417,6 +2417,20 @@
</versions>
</opfunction>
+ <opfunction type="function" id="uuid-short" class="other-misc" inversion="5.1.20">
+ <display>UUID_SHORT()</display>
+ <description lang="en">Return an integer-valued universal identifier</description>
+ <arguments>
+ <format></format>
+ </arguments>
+ <return type="numeric"/>
+ <error type="return"/>
+ <versions>
+ <manual version="5.1"/>
+ <manual version="6.0"/>
+ </versions>
+ </opfunction>
+
<opfunction type="function" id="values" class="other-misc" inversion="4.1.1">
<display>VALUES()</display>
<description lang="en">Defines the values to be used during an INSERT</description>
@@ -3616,7 +3630,7 @@
<format><![CDATA[<replaceable>str</replaceable>,<replaceable>delim</replaceable>,
<replaceable>count</replaceable>]]></format>
<argument seq="1" name="expr" type="string"></argument>
- <argument seq="2" name="expr" type="numberic">Delimiter</argument>
+ <argument seq="2" name="expr" type="numeric">Delimiter</argument>
<argument seq="3" name="expr" type="numeric">Count</argument>
</arguments>
<return type="string"/>
Modified: trunk/it/refman-5.1/functions-core.xml
===================================================================
--- trunk/it/refman-5.1/functions-core.xml 2008-06-04 13:24:05 UTC (rev 10889)
+++ trunk/it/refman-5.1/functions-core.xml 2008-06-04 13:35:24 UTC (rev 10890)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 514 bytes
@@ -17406,7 +17406,7 @@
<remark role="help-syntax-begin"/>
- <para id="function_uuid">
+ <para id="function_uuid-short">
<indexterm>
<primary>UUID_SHORT()</primary>
</indexterm>
Modified: trunk/pt/refman-5.1/functions-core.xml
===================================================================
--- trunk/pt/refman-5.1/functions-core.xml 2008-06-04 13:24:05 UTC (rev 10889)
+++ trunk/pt/refman-5.1/functions-core.xml 2008-06-04 13:35:24 UTC (rev 10890)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 514 bytes
@@ -17406,7 +17406,7 @@
<remark role="help-syntax-begin"/>
- <para id="function_uuid">
+ <para id="function_uuid-short">
<indexterm>
<primary>UUID_SHORT()</primary>
</indexterm>
Modified: trunk/refman-5.1/functions-core.xml
===================================================================
--- trunk/refman-5.1/functions-core.xml 2008-06-04 13:24:05 UTC (rev 10889)
+++ trunk/refman-5.1/functions-core.xml 2008-06-04 13:35:24 UTC (rev 10890)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 505 bytes
@@ -17406,7 +17406,7 @@
<remark role="help-syntax-begin"/>
- <para id="function_uuid">
+ <para id="function_uuid-short">
<indexterm>
<primary>UUID_SHORT()</primary>
</indexterm>
Modified: trunk/refman-6.0/functions-core.xml
===================================================================
--- trunk/refman-6.0/functions-core.xml 2008-06-04 13:24:05 UTC (rev 10889)
+++ trunk/refman-6.0/functions-core.xml 2008-06-04 13:35:24 UTC (rev 10890)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 505 bytes
@@ -17845,7 +17845,7 @@
<remark role="help-syntax-begin"/>
- <para id="function_uuid">
+ <para id="function_uuid-short">
<indexterm>
<primary>UUID_SHORT()</primary>
</indexterm>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r10890 - in trunk: . dynamic-docs/opsfunctions it/refman-5.1 pt/refman-5.1 refman-5.1 refman-6.0 | paul | 4 Jun |
