MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:paul Date:November 14 2007 3:03am
Subject:svn commit - mysqldoc@docsrva: r8706 - in trunk: . dynamic-docs/opsfunctions refman-4.1 refman-5.0 refman-5.1 refman-6.0
View as plain text  
Author: paul
Date: 2007-11-14 04:03:20 +0100 (Wed, 14 Nov 2007)
New Revision: 8706

Log:
 r27006@frost:  paul | 2007-11-13 18:20:55 -0600
 Attach an ID to MATCH() so that we can xref it.


Modified:
   trunk/dynamic-docs/opsfunctions/Makefile
   trunk/dynamic-docs/opsfunctions/opfunctions.xml
   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:32775
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:27004
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:21581
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:32775
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:27006
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:21581


Modified: trunk/dynamic-docs/opsfunctions/Makefile
===================================================================
--- trunk/dynamic-docs/opsfunctions/Makefile	2007-11-14 01:08:20 UTC (rev 8705)
+++ trunk/dynamic-docs/opsfunctions/Makefile	2007-11-14 03:03:20 UTC (rev 8706)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 4; 551 bytes

@@ -12,8 +12,5 @@
 include $(MAKE_DIR)/vars-shell
 include $(MAKE_DIR)/vars-docbook
 
-operators.valid: operators.xml
+opfunctions.valid: opfunctions.xml
 	$(XMLLINT) --postvalid --noout --nonet $< 2>&1
-
-functions.valid: functions.xml
-	$(XMLLINT) --postvalid --noout --nonet $< 2>&1


Modified: trunk/dynamic-docs/opsfunctions/opfunctions.xml
===================================================================
--- trunk/dynamic-docs/opsfunctions/opfunctions.xml	2007-11-14 01:08:20 UTC (rev 8705)
+++ trunk/dynamic-docs/opsfunctions/opfunctions.xml	2007-11-14 03:03:20 UTC (rev 8706)
Changed blocks: 3, Lines Added: 20, Lines Deleted: 1; 1635 bytes

@@ -3597,6 +3597,24 @@
     </versions>
   </opfunction>
   
+  <opfunction type="function" id="match" class="string">
+    <display>MATCH</display>
+    <description lang="en">Perform full-text search</description>
+    <arguments>
+      <format><![CDATA[MATCH (<replaceable>col1</replaceable>, <replaceable>col2</replaceable>, ... AGAINST( <replaceable>expr</replaceable> [<replaceable>search_modifier</replaceable>])]]></format>
+      <argument seq="1" name="col1" type="string"></argument>
+      <argument seq="2" name="expr" type="string"></argument>
+    </arguments>
+    <return type="string"/>
+    <error type="return"/>
+    <versions>
+      <manual version="4.1"/>
+      <manual version="5.0"/>
+      <manual version="5.1"/>
+      <manual version="6.0"/>
+    </versions>
+  </opfunction>
+  
   <opfunction type="function" id="greatest" class="comparison">
     <display>GREATEST()</display>
     <description lang="en">Return the largest argument</description>

@@ -3787,6 +3805,7 @@
       <manual version="6.0"/>
     </versions>
   </opfunction>
+
  <opfunction type="operator" id="is-null" class="string-comparison" >
     <display>IS NULL</display>
     <description lang="en">NULL value test</description>

@@ -4151,4 +4170,4 @@
       <manual version="6.0"/>
     </versions>
   </opfunction>
-</opfunctions>
\ No newline at end of file
+</opfunctions>


Modified: trunk/refman-4.1/functions-core.xml
===================================================================
--- trunk/refman-4.1/functions-core.xml	2007-11-14 01:08:20 UTC (rev 8705)
+++ trunk/refman-4.1/functions-core.xml	2007-11-14 03:03:20 UTC (rev 8706)
Changed blocks: 1, Lines Added: 7, Lines Deleted: 2; 856 bytes

@@ -10291,9 +10291,14 @@
 
     <remark role="help-syntax"/>
 
+    <para id="function_match">
+      <literal>MATCH
+      (<replaceable>col1</replaceable>,<replaceable>col2</replaceable>,...)
+      AGAINST (<replaceable>expr</replaceable>
+      [<replaceable>search_modifier</replaceable>])</literal>
+    </para>
+
 <programlisting>
-MATCH (<replaceable>col1</replaceable>,<replaceable>col2</replaceable>,...) AGAINST (<replaceable>expr</replaceable> [<replaceable>search_modifier</replaceable>])
-
 <replaceable>search_modifier:</replaceable> { IN BOOLEAN MODE | WITH QUERY EXPANSION }
 </programlisting>
 


Modified: trunk/refman-5.0/functions-core.xml
===================================================================
--- trunk/refman-5.0/functions-core.xml	2007-11-14 01:08:20 UTC (rev 8705)
+++ trunk/refman-5.0/functions-core.xml	2007-11-14 03:03:20 UTC (rev 8706)
Changed blocks: 1, Lines Added: 7, Lines Deleted: 2; 856 bytes

@@ -10509,9 +10509,14 @@
 
     <remark role="help-syntax"/>
 
+    <para id="function_match">
+      <literal>MATCH
+      (<replaceable>col1</replaceable>,<replaceable>col2</replaceable>,...)
+      AGAINST (<replaceable>expr</replaceable>
+      [<replaceable>search_modifier</replaceable>])</literal>
+    </para>
+
 <programlisting>
-MATCH (<replaceable>col1</replaceable>,<replaceable>col2</replaceable>,...) AGAINST (<replaceable>expr</replaceable> [<replaceable>search_modifier</replaceable>])
-
 <replaceable>search_modifier:</replaceable> { IN BOOLEAN MODE | WITH QUERY EXPANSION }
 </programlisting>
 


Modified: trunk/refman-5.1/functions-core.xml
===================================================================
--- trunk/refman-5.1/functions-core.xml	2007-11-14 01:08:20 UTC (rev 8705)
+++ trunk/refman-5.1/functions-core.xml	2007-11-14 03:03:20 UTC (rev 8706)
Changed blocks: 1, Lines Added: 7, Lines Deleted: 2; 821 bytes

@@ -10463,9 +10463,14 @@
 
     <remark role="help-syntax"/>
 
+    <para id="function_match">
+      <literal>MATCH
+      (<replaceable>col1</replaceable>,<replaceable>col2</replaceable>,...)
+      AGAINST (<replaceable>expr</replaceable>
+      [<replaceable>search_modifier</replaceable>])</literal>
+    </para>
+
 <programlisting>
-MATCH (<replaceable>col1</replaceable>,<replaceable>col2</replaceable>,...) AGAINST (<replaceable>expr</replaceable> [<replaceable>search_modifier</replaceable>])
-
 <replaceable>search_modifier:</replaceable>
   {
        IN BOOLEAN MODE


Modified: trunk/refman-6.0/functions-core.xml
===================================================================
--- trunk/refman-6.0/functions-core.xml	2007-11-14 01:08:20 UTC (rev 8705)
+++ trunk/refman-6.0/functions-core.xml	2007-11-14 03:03:20 UTC (rev 8706)
Changed blocks: 1, Lines Added: 7, Lines Deleted: 2; 821 bytes

@@ -10450,9 +10450,14 @@
 
     <remark role="help-syntax"/>
 
+    <para id="function_match">
+      <literal>MATCH
+      (<replaceable>col1</replaceable>,<replaceable>col2</replaceable>,...)
+      AGAINST (<replaceable>expr</replaceable>
+      [<replaceable>search_modifier</replaceable>])</literal>
+    </para>
+
 <programlisting>
-MATCH (<replaceable>col1</replaceable>,<replaceable>col2</replaceable>,...) AGAINST (<replaceable>expr</replaceable> [<replaceable>search_modifier</replaceable>])
-
 <replaceable>search_modifier:</replaceable>
   {
        IN BOOLEAN MODE


Thread
svn commit - mysqldoc@docsrva: r8706 - in trunk: . dynamic-docs/opsfunctions refman-4.1 refman-5.0 refman-5.1 refman-6.0paul14 Nov