List:Commits« Previous MessageNext Message »
From:paul.dubois Date:November 16 2010 4:02pm
Subject:svn commit - mysqldoc@docsrva: r23773 - in trunk: . refman-5.5
View as plain text  
Author: paul
Date: 2010-11-16 17:02:44 +0100 (Tue, 16 Nov 2010)
New Revision: 23773

Log:
 r65582@frost:  paul | 2010-11-16 09:56:43 -0500
 Apply missed edit


Modified:
   trunk/refman-5.5/extending-mysql.xml

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:44270
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:65581
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
   + 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:44270
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:65582
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546


Modified: trunk/refman-5.5/extending-mysql.xml
===================================================================
--- trunk/refman-5.5/extending-mysql.xml	2010-11-16 16:02:36 UTC (rev 23772)
+++ trunk/refman-5.5/extending-mysql.xml	2010-11-16 16:02:44 UTC (rev 23773)
Changed blocks: 7, Lines Added: 33, Lines Deleted: 24; 5025 bytes

@@ -5627,6 +5627,13 @@
         </para>
 
         <para>
+          If a UDF will be referred to in statements that will be
+          replicated to slave servers, you must ensure that every slave
+          also has the function available. Otherwise, replication will
+          fail on the slaves when they attempt to invoke the function.
+        </para>
+
+        <para>
           The immediately following instructions are for Unix.
           Instructions for Windows are given later in this section.
         </para>

@@ -5685,6 +5692,13 @@
             </para>
           </listitem>
 
+          <listitem>
+            <para>
+              <literal>avgcost()</literal> returns an average cost. This
+              is an aggregate function.
+            </para>
+          </listitem>
+
         </itemizedlist>
 
         <para>

@@ -5742,7 +5756,7 @@
 
           <listitem>
             <para>
-              You need to obtain the Bazaar source repository for MySQL
+              Obtain the Bazaar source repository for MySQL
               &current-series;. See
               <xref linkend="installing-source-tree"/>.
             </para>

@@ -5750,7 +5764,7 @@
 
           <listitem>
             <para>
-              You must obtain the CMake build utility from
+              Obtain the CMake build utility, if necessary, from
               <ulink url="http://www.cmake.org"/>. (Version 2.4.2 or
               later is required).
             </para>

@@ -5813,24 +5827,27 @@
 
         <para>
           After the shared object file has been installed, notify
-          <command>mysqld</command> about the new functions with these
-          statements:
+          <command>mysqld</command> about the new functions with the
+          following statements. If object files have a suffix different
+          from <filename>.so</filename> on your system, substitute the
+          correct suffix throughout (for example,
+          <filename>.dll</filename> on Windows).
         </para>
 
 <programlisting>
-mysql&gt; <userinput>CREATE FUNCTION metaphon RETURNS STRING SONAME 'udf_example.dll';</userinput>
-mysql&gt; <userinput>CREATE FUNCTION myfunc_double RETURNS REAL SONAME 'udf_example.dll';</userinput>
-mysql&gt; <userinput>CREATE FUNCTION myfunc_int RETURNS INTEGER SONAME 'udf_example.dll';</userinput>
-mysql&gt; <userinput>CREATE FUNCTION sequence RETURNS INTEGER SONAME 'udf_example.dll';</userinput>
-mysql&gt; <userinput>CREATE FUNCTION lookup RETURNS STRING SONAME 'udf_example.dll';</userinput>
+mysql&gt; <userinput>CREATE FUNCTION metaphon RETURNS STRING SONAME 'udf_example.so';</userinput>
+mysql&gt; <userinput>CREATE FUNCTION myfunc_double RETURNS REAL SONAME 'udf_example.so';</userinput>
+mysql&gt; <userinput>CREATE FUNCTION myfunc_int RETURNS INTEGER SONAME 'udf_example.so';</userinput>
+mysql&gt; <userinput>CREATE FUNCTION sequence RETURNS INTEGER SONAME 'udf_example.so';</userinput>
+mysql&gt; <userinput>CREATE FUNCTION lookup RETURNS STRING SONAME 'udf_example.so';</userinput>
 mysql&gt; <userinput>CREATE FUNCTION reverse_lookup</userinput>
-    -&gt;        <userinput>RETURNS STRING SONAME 'udf_example.dll';</userinput>
+    -&gt;        <userinput>RETURNS STRING SONAME 'udf_example.so';</userinput>
 mysql&gt; <userinput>CREATE AGGREGATE FUNCTION avgcost</userinput>
-    -&gt;        <userinput>RETURNS REAL SONAME 'udf_example.dll';</userinput>
+    -&gt;        <userinput>RETURNS REAL SONAME 'udf_example.so';</userinput>
 </programlisting>
 
         <para>
-          Functions can be deleted using <literal role="stmt">DROP
+          To delete functions, use <literal role="stmt">DROP
           FUNCTION</literal>:
         </para>
 

@@ -5850,10 +5867,10 @@
           the <literal>func</literal> system table in the
           <literal>mysql</literal> database. The function's name, type
           and shared library name are saved in the table. You must have
-          the <literal role="priv">INSERT</literal> and
-          <literal role="priv">DELETE</literal> privileges for the
-          <literal>mysql</literal> database to create and drop
-          functions.
+          the <literal role="priv">INSERT</literal> or
+          <literal role="priv">DELETE</literal> privilege for the
+          <literal>mysql</literal> database to create or drop functions,
+          respectively.
         </para>
 
         <para>

@@ -5879,14 +5896,6 @@
           unavailable.
         </para>
 
-        <para>
-          If the new function will be referred to in statements that
-          will be replicated to slave servers, you must ensure that
-          every slave server also has the function available. Otherwise,
-          replication will fail on the slaves when they attempt to
-          invoke the function.
-        </para>
-
       </section>
 
       <section id="udf-security">


Thread
svn commit - mysqldoc@docsrva: r23773 - in trunk: . refman-5.5paul.dubois16 Nov