Author: paul
Date: 2008-07-31 01:31:01 +0200 (Thu, 31 Jul 2008)
New Revision: 11458
Log:
r33125@frost: paul | 2008-07-30 14:17:34 -0500
Update Windows UDF-compiling example.
(Bug#36945)
Modified:
trunk/refman-4.1/extending-mysql.xml
trunk/refman-5.0/extending-mysql.xml
trunk/refman-5.1/extending-mysql.xml
trunk/refman-6.0/extending-mysql.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:33123
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:32606
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:33125
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:32606
Modified: trunk/refman-4.1/extending-mysql.xml
===================================================================
--- trunk/refman-4.1/extending-mysql.xml 2008-07-30 23:00:20 UTC (rev 11457)
+++ trunk/refman-4.1/extending-mysql.xml 2008-07-30 23:31:01 UTC (rev 11458)
Changed blocks: 2, Lines Added: 8, Lines Deleted: 6; 2131 bytes
@@ -1648,14 +1648,15 @@
</para>
<programlisting>
-mysql> <userinput>CREATE FUNCTION metaphon RETURNS STRING SONAME
'udf_example.so';</userinput>
-mysql> <userinput>CREATE FUNCTION myfunc_double RETURNS REAL SONAME
'udf_example.so';</userinput>
-mysql> <userinput>CREATE FUNCTION myfunc_int RETURNS INTEGER SONAME
'udf_example.so';</userinput>
-mysql> <userinput>CREATE FUNCTION lookup RETURNS STRING SONAME
'udf_example.so';</userinput>
+mysql> <userinput>CREATE FUNCTION metaphon RETURNS STRING SONAME
'udf_example.dll';</userinput>
+mysql> <userinput>CREATE FUNCTION myfunc_double RETURNS REAL SONAME
'udf_example.dll';</userinput>
+mysql> <userinput>CREATE FUNCTION myfunc_int RETURNS INTEGER SONAME
'udf_example.dll';</userinput>
+mysql> <userinput>CREATE FUNCTION sequence RETURNS INTEGER SONAME
'udf_example.dll';</userinput>
+mysql> <userinput>CREATE FUNCTION lookup RETURNS STRING SONAME
'udf_example.dll';</userinput>
mysql> <userinput>CREATE FUNCTION reverse_lookup</userinput>
- -> <userinput>RETURNS STRING SONAME
'udf_example.so';</userinput>
+ -> <userinput>RETURNS STRING SONAME
'udf_example.dll';</userinput>
mysql> <userinput>CREATE AGGREGATE FUNCTION avgcost</userinput>
- -> <userinput>RETURNS REAL SONAME
'udf_example.so';</userinput>
+ -> <userinput>RETURNS REAL SONAME
'udf_example.dll';</userinput>
</programlisting>
<para>
@@ -1667,6 +1668,7 @@
mysql> <userinput>DROP FUNCTION metaphon;</userinput>
mysql> <userinput>DROP FUNCTION myfunc_double;</userinput>
mysql> <userinput>DROP FUNCTION myfunc_int;</userinput>
+mysql> <userinput>DROP FUNCTION sequence;</userinput>
mysql> <userinput>DROP FUNCTION lookup;</userinput>
mysql> <userinput>DROP FUNCTION reverse_lookup;</userinput>
mysql> <userinput>DROP FUNCTION avgcost;</userinput>
Modified: trunk/refman-5.0/extending-mysql.xml
===================================================================
--- trunk/refman-5.0/extending-mysql.xml 2008-07-30 23:00:20 UTC (rev 11457)
+++ trunk/refman-5.0/extending-mysql.xml 2008-07-30 23:31:01 UTC (rev 11458)
Changed blocks: 3, Lines Added: 10, Lines Deleted: 8; 2457 bytes
@@ -1721,8 +1721,8 @@
<listitem>
<para>
- Create a CMake <filename>makefile</filename> with these
- contents:
+ Create a CMake <filename>makefile</filename>
+ (<filename>CMakeLists.txt</filename>) with these contents:
</para>
<programlisting>
@@ -1771,14 +1771,15 @@
</para>
<programlisting>
-mysql> <userinput>CREATE FUNCTION metaphon RETURNS STRING SONAME
'udf_example.so';</userinput>
-mysql> <userinput>CREATE FUNCTION myfunc_double RETURNS REAL SONAME
'udf_example.so';</userinput>
-mysql> <userinput>CREATE FUNCTION myfunc_int RETURNS INTEGER SONAME
'udf_example.so';</userinput>
-mysql> <userinput>CREATE FUNCTION lookup RETURNS STRING SONAME
'udf_example.so';</userinput>
+mysql> <userinput>CREATE FUNCTION metaphon RETURNS STRING SONAME
'udf_example.dll';</userinput>
+mysql> <userinput>CREATE FUNCTION myfunc_double RETURNS REAL SONAME
'udf_example.dll';</userinput>
+mysql> <userinput>CREATE FUNCTION myfunc_int RETURNS INTEGER SONAME
'udf_example.dll';</userinput>
+mysql> <userinput>CREATE FUNCTION sequence RETURNS INTEGER SONAME
'udf_example.dll';</userinput>
+mysql> <userinput>CREATE FUNCTION lookup RETURNS STRING SONAME
'udf_example.dll';</userinput>
mysql> <userinput>CREATE FUNCTION reverse_lookup</userinput>
- -> <userinput>RETURNS STRING SONAME
'udf_example.so';</userinput>
+ -> <userinput>RETURNS STRING SONAME
'udf_example.dll';</userinput>
mysql> <userinput>CREATE AGGREGATE FUNCTION avgcost</userinput>
- -> <userinput>RETURNS REAL SONAME
'udf_example.so';</userinput>
+ -> <userinput>RETURNS REAL SONAME
'udf_example.dll';</userinput>
</programlisting>
<para>
@@ -1790,6 +1791,7 @@
mysql> <userinput>DROP FUNCTION metaphon;</userinput>
mysql> <userinput>DROP FUNCTION myfunc_double;</userinput>
mysql> <userinput>DROP FUNCTION myfunc_int;</userinput>
+mysql> <userinput>DROP FUNCTION sequence;</userinput>
mysql> <userinput>DROP FUNCTION lookup;</userinput>
mysql> <userinput>DROP FUNCTION reverse_lookup;</userinput>
mysql> <userinput>DROP FUNCTION avgcost;</userinput>
Modified: trunk/refman-5.1/extending-mysql.xml
===================================================================
--- trunk/refman-5.1/extending-mysql.xml 2008-07-30 23:00:20 UTC (rev 11457)
+++ trunk/refman-5.1/extending-mysql.xml 2008-07-30 23:31:01 UTC (rev 11458)
Changed blocks: 3, Lines Added: 10, Lines Deleted: 8; 2457 bytes
@@ -3789,8 +3789,8 @@
<listitem>
<para>
- Create a CMake <filename>makefile</filename> with these
- contents:
+ Create a CMake <filename>makefile</filename>
+ (<filename>CMakeLists.txt</filename>) with these contents:
</para>
<programlisting>
@@ -3839,14 +3839,15 @@
</para>
<programlisting>
-mysql> <userinput>CREATE FUNCTION metaphon RETURNS STRING SONAME
'udf_example.so';</userinput>
-mysql> <userinput>CREATE FUNCTION myfunc_double RETURNS REAL SONAME
'udf_example.so';</userinput>
-mysql> <userinput>CREATE FUNCTION myfunc_int RETURNS INTEGER SONAME
'udf_example.so';</userinput>
-mysql> <userinput>CREATE FUNCTION lookup RETURNS STRING SONAME
'udf_example.so';</userinput>
+mysql> <userinput>CREATE FUNCTION metaphon RETURNS STRING SONAME
'udf_example.dll';</userinput>
+mysql> <userinput>CREATE FUNCTION myfunc_double RETURNS REAL SONAME
'udf_example.dll';</userinput>
+mysql> <userinput>CREATE FUNCTION myfunc_int RETURNS INTEGER SONAME
'udf_example.dll';</userinput>
+mysql> <userinput>CREATE FUNCTION sequence RETURNS INTEGER SONAME
'udf_example.dll';</userinput>
+mysql> <userinput>CREATE FUNCTION lookup RETURNS STRING SONAME
'udf_example.dll';</userinput>
mysql> <userinput>CREATE FUNCTION reverse_lookup</userinput>
- -> <userinput>RETURNS STRING SONAME
'udf_example.so';</userinput>
+ -> <userinput>RETURNS STRING SONAME
'udf_example.dll';</userinput>
mysql> <userinput>CREATE AGGREGATE FUNCTION avgcost</userinput>
- -> <userinput>RETURNS REAL SONAME
'udf_example.so';</userinput>
+ -> <userinput>RETURNS REAL SONAME
'udf_example.dll';</userinput>
</programlisting>
<para>
@@ -3858,6 +3859,7 @@
mysql> <userinput>DROP FUNCTION metaphon;</userinput>
mysql> <userinput>DROP FUNCTION myfunc_double;</userinput>
mysql> <userinput>DROP FUNCTION myfunc_int;</userinput>
+mysql> <userinput>DROP FUNCTION sequence;</userinput>
mysql> <userinput>DROP FUNCTION lookup;</userinput>
mysql> <userinput>DROP FUNCTION reverse_lookup;</userinput>
mysql> <userinput>DROP FUNCTION avgcost;</userinput>
Modified: trunk/refman-6.0/extending-mysql.xml
===================================================================
--- trunk/refman-6.0/extending-mysql.xml 2008-07-30 23:00:20 UTC (rev 11457)
+++ trunk/refman-6.0/extending-mysql.xml 2008-07-30 23:31:01 UTC (rev 11458)
Changed blocks: 3, Lines Added: 10, Lines Deleted: 8; 2457 bytes
@@ -3830,8 +3830,8 @@
<listitem>
<para>
- Create a CMake <filename>makefile</filename> with these
- contents:
+ Create a CMake <filename>makefile</filename>
+ (<filename>CMakeLists.txt</filename>) with these contents:
</para>
<programlisting>
@@ -3880,14 +3880,15 @@
</para>
<programlisting>
-mysql> <userinput>CREATE FUNCTION metaphon RETURNS STRING SONAME
'udf_example.so';</userinput>
-mysql> <userinput>CREATE FUNCTION myfunc_double RETURNS REAL SONAME
'udf_example.so';</userinput>
-mysql> <userinput>CREATE FUNCTION myfunc_int RETURNS INTEGER SONAME
'udf_example.so';</userinput>
-mysql> <userinput>CREATE FUNCTION lookup RETURNS STRING SONAME
'udf_example.so';</userinput>
+mysql> <userinput>CREATE FUNCTION metaphon RETURNS STRING SONAME
'udf_example.dll';</userinput>
+mysql> <userinput>CREATE FUNCTION myfunc_double RETURNS REAL SONAME
'udf_example.dll';</userinput>
+mysql> <userinput>CREATE FUNCTION myfunc_int RETURNS INTEGER SONAME
'udf_example.dll';</userinput>
+mysql> <userinput>CREATE FUNCTION sequence RETURNS INTEGER SONAME
'udf_example.dll';</userinput>
+mysql> <userinput>CREATE FUNCTION lookup RETURNS STRING SONAME
'udf_example.dll';</userinput>
mysql> <userinput>CREATE FUNCTION reverse_lookup</userinput>
- -> <userinput>RETURNS STRING SONAME
'udf_example.so';</userinput>
+ -> <userinput>RETURNS STRING SONAME
'udf_example.dll';</userinput>
mysql> <userinput>CREATE AGGREGATE FUNCTION avgcost</userinput>
- -> <userinput>RETURNS REAL SONAME
'udf_example.so';</userinput>
+ -> <userinput>RETURNS REAL SONAME
'udf_example.dll';</userinput>
</programlisting>
<para>
@@ -3899,6 +3900,7 @@
mysql> <userinput>DROP FUNCTION metaphon;</userinput>
mysql> <userinput>DROP FUNCTION myfunc_double;</userinput>
mysql> <userinput>DROP FUNCTION myfunc_int;</userinput>
+mysql> <userinput>DROP FUNCTION sequence;</userinput>
mysql> <userinput>DROP FUNCTION lookup;</userinput>
mysql> <userinput>DROP FUNCTION reverse_lookup;</userinput>
mysql> <userinput>DROP FUNCTION avgcost;</userinput>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r11458 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-6.0 | paul.dubois | 31 Jul |