svn commit - mysqldoc@docsrva: r3627 - in trunk: . refman-5.0 refman-5.1

[paul]

Author: paul
Date: 2006-10-13 00:09:09 +0200 (Fri, 13 Oct 2006)
New Revision: 3627

Log:
 r10891@frost:  paul | 2006-10-12 17:08:41 -0500
 4.1 udf_example.cc seems to have been renamed to udf_example.c
 for 5.0 and up.  (Spotted by PeterG)


Modified:
   trunk/refman-5.0/extending-mysql.xml
   trunk/refman-5.0/installing.xml
   trunk/refman-5.1/extending-mysql.xml
   trunk/refman-5.1/installing.xml

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:14474
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:10879
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:10841
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:14474
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:10891
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:10841


Modified: trunk/refman-5.0/extending-mysql.xml
===================================================================
--- trunk/refman-5.0/extending-mysql.xml	2006-10-12 16:39:50 UTC (rev 3626)
+++ trunk/refman-5.0/extending-mysql.xml	2006-10-12 22:09:09 UTC (rev 3627)
Changed blocks: 7, Lines Added: 7, Lines Deleted: 7; 2993 bytes

@@ -348,7 +348,7 @@
 
     <para>
       For example source code that illustrates how to write UDFs, take a
-      look at the <filename>sql/udf_example.cc</filename> file that is
+      look at the <filename>sql/udf_example.c</filename> file that is
       provided in MySQL source distributions.
     </para>
 

@@ -611,7 +611,7 @@
         C++ (or another language that can use C calling conventions),
         and your operating system must support dynamic loading. The
         MySQL source distribution includes a file
-        <filename>sql/udf_example.cc</filename> that defines 5 new
+        <filename>sql/udf_example.c</filename> that defines 5 new
         functions. Consult this file to see how UDF calling conventions
         work. UDF-related symbols and data structures are defined in the
         <filename>include/mysql_com.h</filename> header file. (You need

@@ -640,7 +640,7 @@
         want to use a UDF that needs to access symbols from
         <command>mysqld</command> (for example, the
         <literal>metaphone</literal> function in
-        <filename>sql/udf_example.cc</filename> that uses
+        <filename>sql/udf_example.c</filename> that uses
         <literal>default_charset_info</literal>), you must link the
         program with <option>-rdynamic</option> (see <literal>man
         dlopen</literal>). If you plan to use UDFs, the rule of thumb is

@@ -1612,7 +1612,7 @@
           Files implementing UDFs must be compiled and installed on the
           host where the server runs. This process is described below
           for the example UDF file
-          <filename>sql/udf_example.cc</filename> that is included in
+          <filename>sql/udf_example.c</filename> that is included in
           the MySQL source distribution.
         </para>
 

@@ -1622,7 +1622,7 @@
         </para>
 
         <para>
-          The <filename>udf_example.cc</filename> file contains the
+          The <filename>udf_example.c</filename> file contains the
           following functions:
         </para>
 

@@ -1683,7 +1683,7 @@
         </para>
 
 <programlisting>
-shell&gt; <userinput>gcc -shared -o udf_example.so
udf_example.cc</userinput>
+shell&gt; <userinput>gcc -shared -o udf_example.so
udf_example.c</userinput>
 </programlisting>
 
         <para>

@@ -1701,7 +1701,7 @@
         <para>
           After you compile a shared object containing UDFs, you must
           install it and tell MySQL about it. Compiling a shared object
-          from <filename>udf_example.cc</filename> using
+          from <filename>udf_example.c</filename> using
           <command>gcc</command> directly produces a file named
           <filename>udf_example.so</filename>. Compiling the shared
           object using <command>make</command> produces a file named


Modified: trunk/refman-5.0/installing.xml
===================================================================
--- trunk/refman-5.0/installing.xml	2006-10-12 16:39:50 UTC (rev 3626)
+++ trunk/refman-5.0/installing.xml	2006-10-12 22:09:09 UTC (rev 3627)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 536 bytes

@@ -17479,7 +17479,7 @@
 
 <programlisting>
 gcc -Zdll -Zmt -Zcrtdll=pthrdrtl -I../include -I../regex -I.. \
-    -o example udf_example.cc -L../lib -lmysqlclient udf_example.def
+    -o example udf_example.c -L../lib -lmysqlclient udf_example.def
 mv example.dll example.udf
 </programlisting>
 


Modified: trunk/refman-5.1/extending-mysql.xml
===================================================================
--- trunk/refman-5.1/extending-mysql.xml	2006-10-12 16:39:50 UTC (rev 3626)
+++ trunk/refman-5.1/extending-mysql.xml	2006-10-12 22:09:09 UTC (rev 3627)
Changed blocks: 7, Lines Added: 7, Lines Deleted: 7; 3006 bytes

@@ -2505,7 +2505,7 @@
 
     <para>
       For example source code that illustrates how to write UDFs, take a
-      look at the <filename>sql/udf_example.cc</filename> file that is
+      look at the <filename>sql/udf_example.c</filename> file that is
       provided in MySQL source distributions.
     </para>
 

@@ -2771,7 +2771,7 @@
         For the UDF mechanism to work, functions must be written in C or
         C++ and your operating system must support dynamic loading. The
         MySQL source distribution includes a file
-        <filename>sql/udf_example.cc</filename> that defines 5 new
+        <filename>sql/udf_example.c</filename> that defines 5 new
         functions. Consult this file to see how UDF calling conventions
         work. UDF-related symbols and data structures are defined in the
         <filename>include/mysql_com.h</filename> header file. (You need

@@ -2800,7 +2800,7 @@
         want to use a UDF that needs to access symbols from
         <command>mysqld</command> (for example, the
         <literal>metaphone</literal> function in
-        <filename>sql/udf_example.cc</filename> that uses
+        <filename>sql/udf_example.c</filename> that uses
         <literal>default_charset_info</literal>), you must link the
         program with <option>-rdynamic</option> (see <literal>man
         dlopen</literal>). If you plan to use UDFs, the rule of thumb is

@@ -3763,7 +3763,7 @@
           Files implementing UDFs must be compiled and installed on the
           host where the server runs. This process is described below
           for the example UDF file
-          <filename>sql/udf_example.cc</filename> that is included in
+          <filename>sql/udf_example.c</filename> that is included in
           the MySQL source distribution.
         </para>
 

@@ -3773,7 +3773,7 @@
         </para>
 
         <para>
-          The <filename>udf_example.cc</filename> file contains the
+          The <filename>udf_example.c</filename> file contains the
           following functions:
         </para>
 

@@ -3834,7 +3834,7 @@
         </para>
 
 <programlisting>
-shell&gt; <userinput>gcc -shared -o udf_example.so
udf_example.cc</userinput>
+shell&gt; <userinput>gcc -shared -o udf_example.so
udf_example.c</userinput>
 </programlisting>
 
         <para>

@@ -3852,7 +3852,7 @@
         <para>
           After you compile a shared object containing UDFs, you must
           install it and tell MySQL about it. Compiling a shared object
-          from <filename>udf_example.cc</filename> using
+          from <filename>udf_example.c</filename> using
           <command>gcc</command> directly produces a file named
           <filename>udf_example.so</filename>. Compiling the shared
           object using <command>make</command> produces a file named


Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml	2006-10-12 16:39:50 UTC (rev 3626)
+++ trunk/refman-5.1/installing.xml	2006-10-12 22:09:09 UTC (rev 3627)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 536 bytes

@@ -16535,7 +16535,7 @@
 
 <programlisting>
 gcc -Zdll -Zmt -Zcrtdll=pthrdrtl -I../include -I../regex -I.. \
-    -o example udf_example.cc -L../lib -lmysqlclient udf_example.def
+    -o example udf_example.c -L../lib -lmysqlclient udf_example.def
 mv example.dll example.udf
 </programlisting>