Changeset: 3637d352f16e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/3637d352f16e
Modified Files:
MonetDB.spec
debian/control
Branch: default
Log Message:
Merge with Mar2025 branch.
diffs (106 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -563,6 +563,27 @@ embedded library (%{name}-embedded).
%endif
%{_libdir}/monetdb5*/lib_csv.so
%{_libdir}/monetdb5*/lib_generator.so
+%{_libdir}/monetdb5*/lib_monetdb_loader.so
+
+%package odbc-loader
+Summary: MonetDB ODBC loader module
+Group: Applications/Databases
+Requires: %{name}-server%{?_isa} = %{version}-%{release}
+
+%description odbc-loader
+MonetDB is a database management system that is developed from a
+main-memory perspective with use of a fully decomposed storage model,
+automatic index management, extensibility of data types and search
+accelerators. It also has an SQL front end.
+
+This package provides an interface to the MonetDB server through which
+data from remote databases can be loaded through an ODBC interface. In
+order to use this module, mserver5 needs to be run with the option
+--loadmodule odbc_loader.
+
+%files odbc-loader
+%defattr(-,root,root)
+%{_libdir}/monetdb5*/lib_odbc_loader.so
%package server
Summary: MonetDB - Monet Database Management System
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -169,6 +169,22 @@ Description: MonetDB SQL GIS support mod
This package contains the GIS (Geographic Information System)
extensions for monetdb-server.
+Package: monetdb-odbc-loader
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ monetdb-server (= ${source:Version})
+Description: MonetDB ODBC loader module
+ MonetDB is a database management system that is developed from a
+ main-memory perspective with use of a fully decomposed storage model,
+ automatic index management, extensibility of data types and search
+ accelerators. It also has an SQL front end.
+ .
+ This package provides an interface to the MonetDB server through which
+ data from remote databases can be loaded through an ODBC interface. In
+ order to use this module, mserver5 needs to be run with the option
+ --loadmodule odbc_loader.
+
Package: libmonetdb5-server-cfitsio
Architecture: all
Depends: monetdb-cfitsio
diff --git a/debian/monetdb-odbc-loader.install
b/debian/monetdb-odbc-loader.install
new file mode 100644
--- /dev/null
+++ b/debian/monetdb-odbc-loader.install
@@ -0,0 +1,1 @@
+debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5*/lib_odbc_loader.so
usr/lib/x86_64-linux-gnu/monetdb5
diff --git a/debian/monetdb-server.install b/debian/monetdb-server.install
--- a/debian/monetdb-server.install
+++ b/debian/monetdb-server.install
@@ -6,3 +6,4 @@ debian/tmp/usr/lib/x86_64-linux-gnu/libm
debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5*/lib_capi.so
usr/lib/x86_64-linux-gnu/monetdb5
debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5*/lib_csv.so
usr/lib/x86_64-linux-gnu/monetdb5
debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5*/lib_generator.so
usr/lib/x86_64-linux-gnu/monetdb5
+debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5*/lib_monetdb_loader.so
usr/lib/x86_64-linux-gnu/monetdb5
diff --git a/sql/server/sql_parser.y b/sql/server/sql_parser.y
--- a/sql/server/sql_parser.y
+++ b/sql/server/sql_parser.y
@@ -646,7 +646,7 @@ int yydebug=1;
%token MAXVALUE MINVALUE CYCLE
%token NEXT VALUE CACHE
%token GENERATED ALWAYS IDENTITY
-%token SERIAL BIGSERIAL AUTO_INCREMENT /* PostgreSQL and MySQL immitators */
+%token SERIAL BIGSERIAL AUTO_INCREMENT /* PostgreSQL and MySQL imitators */
/* SQL's terminator, the semi-colon */
%token SCOLON AT
@@ -1173,7 +1173,7 @@ opt_with_grant:
;
opt_with_admin:
- /* emtpy */ { $$ = 0; }
+ /* empty */ { $$ = 0; }
| WITH ADMIN OPTION { $$ = 1; }
;
diff --git a/tools/mserver/mserver5.1.in b/tools/mserver/mserver5.1.in
--- a/tools/mserver/mserver5.1.in
+++ b/tools/mserver/mserver5.1.in
@@ -120,6 +120,10 @@ sections.
Load extra module in the form of a dynamic link library (.dll or .so
file) which should be located in the lib/monetdb5 directory.
This option can be repeated for different modules.
+Also see the
+.B loadmodules
+entry in
+.IR monetdb (1).
.TP
.B \-\-without\-geom
Start the server without
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
