Changeset: afa68e3be37f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=afa68e3be37f
Removed Files:
        monetdb5/tests/BugReports/Tests/no.146.stable.out
Modified Files:
        clients/Makefile.ag
        clients/Tests/SQL-dump.stable.out
        clients/Tests/SQL-dump.stable.out.int128
        geom/sql/Makefile.ag
        sql/backends/monet5/UDF/README
Branch: default
Log Message:

Merge with Jun2016 branch.


diffs (55 lines):

diff --git a/clients/Makefile.ag b/clients/Makefile.ag
--- a/clients/Makefile.ag
+++ b/clients/Makefile.ag
@@ -6,4 +6,4 @@
 
 SUBDIRS = HAVE_MAPI?mapilib HAVE_MAPI?mapiclient HAVE_ODBC?odbc HAVE_PERL?perl 
php examples NATIVE_WIN32?NT
 
-EXTRA_DIST_DIR = Tests ruby
+EXTRA_DIST_DIR = Tests ruby R
diff --git a/clients/Tests/SQL-dump.stable.out 
b/clients/Tests/SQL-dump.stable.out
--- a/clients/Tests/SQL-dump.stable.out
+++ b/clients/Tests/SQL-dump.stable.out
@@ -7179,6 +7179,7 @@ drop function pcre_replace(string, strin
 [ 12,  "SEQUENCE"      ]
 [ 13,  "PROCEDURE"     ]
 [ 14,  "BE_DROPPED"    ]
+[ 15,  "TYPE"  ]
 #drop function pcre_replace(string, string, string, string);
 
 # 13:32:07 >  
diff --git a/clients/Tests/SQL-dump.stable.out.int128 
b/clients/Tests/SQL-dump.stable.out.int128
--- a/clients/Tests/SQL-dump.stable.out.int128
+++ b/clients/Tests/SQL-dump.stable.out.int128
@@ -7728,6 +7728,7 @@ drop function pcre_replace(string, strin
 [ 12,  "SEQUENCE"      ]
 [ 13,  "PROCEDURE"     ]
 [ 14,  "BE_DROPPED"    ]
+[ 15,  "TYPE"  ]
 #drop function pcre_replace(string, string, string, string);
 
 # 15:15:20 >  
diff --git a/geom/sql/Makefile.ag b/geom/sql/Makefile.ag
--- a/geom/sql/Makefile.ag
+++ b/geom/sql/Makefile.ag
@@ -10,4 +10,4 @@ headers_sql = {
        SOURCES = 40_geom.sql
 }
 
-EXTRA_DIST_DIR = Tests
+EXTRA_DIST_DIR = Tests conformance functions pg_regression
diff --git a/monetdb5/tests/BugReports/Tests/no.146.stable.out 
b/monetdb5/tests/BugReports/Tests/no.146.stable.out
deleted file mode 100644
diff --git a/sql/backends/monet5/UDF/README b/sql/backends/monet5/UDF/README
--- a/sql/backends/monet5/UDF/README
+++ b/sql/backends/monet5/UDF/README
@@ -1,3 +1,7 @@
-This directory is a template for extending SQL with a new scalar type.
-For further documentation, see the MonetDB website at
+This directory is a template for extending SQL with a new user-defined
+function (UDF).  For further documentation, see the MonetDB website at
 http://www.monetdb.org/Documentation/Cookbooks/SQLrecipes/UserDefinedFunction
+as well as the Mercurial repository at
+http://dev.monetdb.org/hg/MonetDB-extend
+and especially the file reverse/README.rst in there, which contains a
+lot of hands-on information for creating a UDF.
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to