Changeset: d6c5b3910715 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d6c5b3910715
Added Files:
NT/installer32/cv64-32.sh
sql/test/BugTracker-2013/Tests/syntaxerror.Bug-3399.stable.err
sql/test/BugTracker-2013/Tests/syntaxerror.Bug-3399.stable.out
sql/test/BugTracker-2013/Tests/timestamp.Bug-3401.sql
sql/test/BugTracker-2013/Tests/timestamp.Bug-3401.stable.err
sql/test/BugTracker-2013/Tests/timestamp.Bug-3401.stable.out
Modified Files:
MonetDB.spec
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
NT/installer64/cv32-64.sh
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures_nocfitsio.stable.out
clients/Tests/MAL-signatures_nogeom.stable.out
clients/Tests/MAL-signatures_sphinxclient.stable.out
clients/Tests/exports.stable.out
clients/mapiclient/tomograph.c
debian/control
debian/libmonetdb-client-odbc.postinst
debian/monetdb5-server.install
debian/monetdb5-sql.install
debian/python-monetdb.install
debian/python3-monetdb.install
monetdb5/modules/atoms/mtime.c
monetdb5/modules/atoms/mtime.h
monetdb5/modules/atoms/mtime.mal
monetdb5/modules/mal/pqueue.c
monetdb5/optimizer/opt_mitosis.c
sql/backends/monet5/sql_scenario.c
sql/server/rel_select.c
sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out.32bit
sql/test/BugTracker-2013/Tests/All
sql/test/BugTracker-2013/Tests/syntaxerror.Bug-3399.sql
Branch: default
Log Message:
Merge with Jan2014 branch.
diffs (truncated from 16419 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -16,7 +16,7 @@
%define oidsuf .oid32
%endif
-%define release %{buildno}%{?dist}%{?oidsuf:.oidsuf}
+%define release %{buildno}%{?dist}%{?oidsuf}
Name: %{name}
Version: %{version}
@@ -73,7 +73,9 @@ accelerators. It also has an SQL fronte
This package contains the core components of MonetDB in the form of a
single shared library. If you want to use MonetDB, you will certainly
-need this package, but you will also need one of the server packages.
+need this package, but you will also need at least the MonetDB5-server
+package, and most likely also %{name}-SQL-server5, as well as one or
+more client packages.
%files
%defattr(-,root,root)
@@ -154,8 +156,8 @@ automatic index management, extensibilit
accelerators. It also has an SQL frontend.
This package contains mclient, the main client program to communicate
-with the database server, and msqldump, a program to dump the SQL
-database so that it can be loaded back later. If you want to use
+with the MonetDB database server, and msqldump, a program to dump the
+SQL database so that it can be loaded back later. If you want to use
MonetDB, you will very likely need this package.
%files client
@@ -177,7 +179,8 @@ main-memory perspective with use of a fu
automatic index management, extensibility of data types and search
accelerators. It also has an SQL frontend.
-This package contains stethoscope and tomograph.
+This package contains stethoscope and tomograph. These tools can be
+used to monitor the MonetDB database server.
%files client-tools
%defattr(-,root,root)
@@ -223,7 +226,7 @@ This package contains the MonetDB ODBC d
%post client-odbc
# install driver if first install of package or if driver not installed yet
-if [ "$1" -eq 1 ] || ! grep -q MonetDB /etc/odbcinst.ini; then
+if [ "$1" -eq 1 ] || ! odbcinst -d -q -n MonetDB >& /dev/null; then
odbcinst -i -d -r <<EOF
[MonetDB]
Description = ODBC for MonetDB
@@ -388,7 +391,7 @@ automatic index management, extensibilit
accelerators. It also has an SQL frontend.
This package contains the GIS (Geographic Information System)
-extensions for MonetDB-SQL-server5.
+extensions for %{name}-SQL-server5.
%files geom-MonetDB5
%defattr(-,root,root)
@@ -409,7 +412,7 @@ main-memory perspective with use of a fu
automatic index management, extensibility of data types and search
accelerators. It also has an SQL frontend.
-This package contains the JAQL extension for MonetDB5. JAQL is a
+This package contains the JAQL extension for MonetDB. JAQL is a
querly language for JavaScript Object Notation (JSON).
%files jaql
@@ -433,10 +436,9 @@ main-memory perspective with use of a fu
automatic index management, extensibility of data types and search
accelerators. It also has an SQL frontend.
-This package contains the MonetDB5 server component. You need this
-package if you want to work using the MAL language, or if you want to
-use the SQL frontend (in which case you need MonetDB-SQL-server5 as
-well).
+This package contains the MonetDB server component. You need this
+package if you want to use the MonetDB database system. If you want
+to use the SQL frontend, you also need %{name}-SQL-server5.
%pre -n MonetDB5-server
getent group monetdb >/dev/null || groupadd -r monetdb
@@ -547,7 +549,7 @@ main-memory perspective with use of a fu
automatic index management, extensibility of data types and search
accelerators. It also has an SQL frontend.
-This package contains the SQL frontend for MonetDB5. If you want to
+This package contains the SQL frontend for MonetDB. If you want to
use SQL with MonetDB, you will need to install this package.
%if %{?rhel:0}%{!?rhel:1}
@@ -603,7 +605,8 @@ automatic index management, extensibilit
accelerators. It also has an SQL frontend.
This package contains the files needed to use MonetDB from a Python
-program.
+program. This package is for Python version 2. If you want to use
+Python version 3, you need %{name}-python3-monetdb.
%files -n python-monetdb
%defattr(-,root,root)
@@ -626,7 +629,8 @@ automatic index management, extensibilit
accelerators. It also has an SQL frontend.
This package contains the files needed to use MonetDB from a Python3
-program.
+program. This package is for Python version 3. If you want to use
+Python version 2, you need %{name}-python-monetdb.
%files -n python3-monetdb
%defattr(-,root,root)
diff --git a/NT/installer32/MonetDB5-SQL-Installer.vdproj
b/NT/installer32/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer32/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer32/MonetDB5-SQL-Installer.vdproj
@@ -21,13 +21,7 @@
}
"Entry"
{
- "MsmKey" = "8:_03E4CB5550E2405DB1D01450DAB51EB3"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_0589C6F724D0421C9C909F12DA19B36A"
+ "MsmKey" = "8:_04BC8A80401A4DD88F4B11ADECEC7117"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
@@ -39,31 +33,13 @@
}
"Entry"
{
- "MsmKey" = "8:_0629084AD55F45E68F61C23D1DE3973D"
+ "MsmKey" = "8:_071834FD53814185A888F1EC6A4025E2"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_075F8DA3DD8740C3BBFDECF4C22753E6"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_083F00FFC47943FBB0CCF0732224E356"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_097F3173DEB845F0998FCE5A271A4172"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_098B2F0F79864EABA37FAB89DFBAF9ED"
+ "MsmKey" = "8:_0ABBD1FDD22F46B9911009DC834A525D"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
@@ -75,13 +51,25 @@
}
"Entry"
{
- "MsmKey" = "8:_0F6F78A51A25478E8B515B0F145D4C3D"
+ "MsmKey" = "8:_0DF0975111624D2AB740CA6833E66215"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_10584133EE8047D688FBC01F2AED6EB0"
+ "MsmKey" = "8:_0F3C74EE5A994455A420D3D0F5C351BC"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_109EBAB5786E465FB15408375015A8D3"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_128044D658F44F5B8D20E530D93D3DBD"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
@@ -93,19 +81,25 @@
}
"Entry"
{
- "MsmKey" = "8:_1445035540B54519B1090EBEAF8B9F5C"
+ "MsmKey" = "8:_17DB9CADC23C47BE854BDCE45693602C"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_15E2F9C224BC494DBFDBDC5F2240C5B8"
+ "MsmKey" = "8:_19415106E4B1432D975EE7A145C81565"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_194A6F995A234CC5B8650C94DB016E7D"
+ "MsmKey" = "8:_194B3297FB234BF180CEC8201CA42B7C"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_1ADF926ECD534ACDBF4105DF3A46C54B"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
@@ -117,19 +111,13 @@
}
"Entry"
{
- "MsmKey" = "8:_1B77C60FBDE542DC8D16D828ABA210DF"
+ "MsmKey" = "8:_1D83F06AB65540BE9769A6D308F99623"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_1CEA949308354E9F9C3A8AD29AC6C6D8"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_1E80BC799FF44127BE32F37A3BBC82DE"
+ "MsmKey" = "8:_1FCA305559B8494AAA8E07011A5752BC"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
@@ -141,25 +129,19 @@
}
"Entry"
{
- "MsmKey" = "8:_20D37B4660DB4235841D507F0F6EC928"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_210ACB4F1EA444B4B72F5B60E9953FEE"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_21FB7083CF534CECA100E30891462617"
+ "MsmKey" = "8:_23E800B98466457F844942F753998D3E"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_2267095870CB48B3954DC1293ADF4ED1"
+ "MsmKey" = "8:_24E9AD62F38141BCB1BDA389463A1ADF"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
@@ -171,13 +153,37 @@
}
"Entry"
{
- "MsmKey" = "8:_28929876B0E14579B2017751625AE460"
+ "MsmKey" = "8:_29B82F2F5DA64B2DB36EBB67F59F9E21"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_29235355A89E4CE398E353AC8D8C5589"
+ "MsmKey" = "8:_2A0EF716219C4D5C93C9935D0FFA3A1F"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_2A50C08957E64DF69B51E1111A16EAEA"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_2AAA56EEBA684F408B6069FE8196DD6F"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
