Changeset: 33decfa69353 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=33decfa69353
Modified Files:
configure.ag
gdk/gdk.h
gdk/gdk_atoms.c
gdk/gdk_cbp.c
gdk/gdk_storage.c
geom/monetdb5/geom.mx
monetdb5/mal/Makefile.ag
monetdb5/mal/mal_authorize.c
monetdb5/mal/mal_authorize.h
monetdb5/mal/mal_instruction.c
monetdb5/modules/mal/clients.c
monetdb5/modules/mal/remote.c
monetdb5/modules/mal/remote.h
monetdb5/modules/mal/remote.mal
monetdb5/optimizer/Tests/dataflow.mal
monetdb5/optimizer/opt_garbagecollector.c
monetdb5/optimizer/opt_pipes.c
monetdb5/scheduler/run_octopus.c
sql/backends/monet5/Makefile.ag
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_user.c
testing/Mtest.py.in
Branch: headless
Log Message:
Merge with default branch.
diffs (truncated from 5216 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -64,7 +64,7 @@ Obsoletes: %{name}-devel
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, SQL- and XML- frontends.
+accelerators. It also has an SQL frontend.
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
@@ -82,7 +82,7 @@ Group: Applications/Databases
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, SQL- and XML- frontends.
+accelerators. It also has an SQL frontend.
This package contains a shared library (libstream) which is needed by
various other components.
@@ -103,7 +103,7 @@ Requires: zlib-devel
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, SQL- and XML- frontends.
+accelerators. It also has an SQL frontend.
This package contains the files to develop with the %{name}-stream
library.
@@ -125,7 +125,7 @@ Group: Applications/Databases
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, SQL- and XML- frontends.
+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
@@ -135,6 +135,7 @@ MonetDB, you will very likely need this
%files client
%defattr(-,root,root)
%{_bindir}/mclient
+%{_bindir}/mnc
%{_bindir}/msqldump
%{_bindir}/stethoscope
%{_libdir}/libmapi.so.*
@@ -152,7 +153,7 @@ Requires: openssl-devel
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, SQL- and XML- frontends.
+accelerators. It also has an SQL frontend.
This package contains the files needed to develop with the
%{name}-client package.
@@ -175,7 +176,7 @@ Requires(pre): unixODBC
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, SQL- and XML- frontends.
+accelerators. It also has an SQL frontend.
This package contains the MonetDB ODBC driver.
@@ -212,7 +213,7 @@ BuildArch: noarch
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, SQL- and XML- frontends.
+accelerators. It also has an SQL frontend.
This package contains the files needed to use MonetDB from a PHP
program.
@@ -232,7 +233,7 @@ Requires: perl
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, SQL- and XML- frontends.
+accelerators. It also has an SQL frontend.
This package contains the files needed to use MonetDB from a Perl
program.
@@ -251,7 +252,7 @@ BuildArch: noarch
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, SQL- and XML- frontends.
+accelerators. It also has an SQL frontend.
This package contains the files needed to use MonetDB from a Ruby
program.
@@ -284,7 +285,7 @@ Requires: python-monetdb = %{version}-%{
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, SQL- and XML- frontends.
+accelerators. It also has an SQL frontend.
This package contains the sample MAPI programs used for testing other
MonetDB packages. You probably don't need this, unless you are a
@@ -318,7 +319,7 @@ Obsoletes: %{name}-geom-devel
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, SQL- and XML- frontends.
+accelerators. It also has an SQL frontend.
This package contains the GIS (Geographic Information System)
extensions for MonetDB-SQL-server5.
@@ -343,7 +344,7 @@ Obsoletes: MonetDB5-server-rdf
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, SQL- and XML- frontends.
+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
@@ -405,7 +406,7 @@ fi
# 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, SQL- and XML- frontends.
+# accelerators. It also has an SQL frontend.
# This package contains the MonetDB5 RDF module.
@@ -431,7 +432,7 @@ Obsoletes: %{name}-SQL
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, SQL- and XML- frontends.
+accelerators. It also has an SQL frontend.
This package contains the SQL frontend for MonetDB5. If you want to
use SQL with MonetDB, you will need to install this package.
@@ -481,7 +482,7 @@ Obsoletes: MonetDB-client-python
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, SQL- and XQuery- frontends.
+accelerators. It also has an SQL frontend.
This package contains the files needed to use MonetDB from a Python
program.
@@ -502,7 +503,7 @@ Obsoletes: MonetDB-python
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, SQL- and XML- frontends.
+accelerators. It also has an SQL frontend.
This package contains the programs and files needed for testing the
MonetDB packages. You probably don't need this, unless you are a
@@ -527,7 +528,7 @@ BuildArch: noarch
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, SQL- and XML- frontends.
+accelerators. It also has an SQL frontend.
This package contains the Python programs and files needed for testing
the MonetDB packages. You probably don't need this, unless you are a
diff --git a/NT/installer32/MonetDB-ODBC-Installer.vdproj
b/NT/installer32/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer32/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer32/MonetDB-ODBC-Installer.vdproj
@@ -250,7 +250,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2E74F1B1BDE548A7922BAD968E690A3A"
{
- "SourcePath" =
"8:C:\\Libraries\\bzip2-1.0.5.win32-vs10\\bin\\libbz2.dll"
+ "SourcePath" =
"8:C:\\Libraries\\bzip2-1.0.6.win32-vs10\\bin\\libbz2.dll"
"TargetName" = "8:libbz2.dll"
"Tag" = "8:"
"Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
@@ -330,7 +330,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_84999A6BF369454381F5ACB44DAAD420"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0a.win32-vs10\\bin\\libeay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0d.win32-vs10\\bin\\libeay32.dll"
"TargetName" = "8:libeay32.dll"
"Tag" = "8:"
"Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
@@ -370,7 +370,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B4FE8AF57D0147A5926576F3D73B9B3B"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0a.win32-vs10\\bin\\ssleay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0d.win32-vs10\\bin\\ssleay32.dll"
"TargetName" = "8:ssleay32.dll"
"Tag" = "8:"
"Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
diff --git a/NT/installer32/MonetDB5-Geom-Module.vdproj
b/NT/installer32/MonetDB5-Geom-Module.vdproj
--- a/NT/installer32/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer32/MonetDB5-Geom-Module.vdproj
@@ -231,7 +231,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6C07D912740F414490DD35D5A179D268"
{
- "SourcePath" =
"8:C:\\Libraries\\geos-3.2.2.win32-vs10\\bin\\geos_c.dll"
+ "SourcePath" =
"8:C:\\Libraries\\geos-3.3.0.win32-vs10\\bin\\geos_c.dll"
"TargetName" = "8:geos_c.dll"
"Tag" = "8:"
"Folder" = "8:_4D9CE65EDD774551869CFD46B59B4F9E"
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
@@ -1321,7 +1321,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0607DD25BFA34B92B0BF84584D3D8BCA"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0a.win32-vs10\\lib\\libeay32.lib"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0d.win32-vs10\\lib\\libeay32.lib"
"TargetName" = "8:libeay32.lib"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -1441,7 +1441,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0D84516ED4054FEA84A5E2C60F42AFE3"
{
- "SourcePath" =
"8:C:\\Libraries\\bzip2-1.0.5.win32-vs10\\bin\\libbz2.dll"
+ "SourcePath" =
"8:C:\\Libraries\\bzip2-1.0.6.win32-vs10\\bin\\libbz2.dll"
"TargetName" = "8:libbz2.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -1541,7 +1541,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_13440C2EDE6842BF8D9F24F554EEB87F"
{
- "SourcePath" =
"8:C:\\Libraries\\libxml2-2.7.7.win32-vs10\\lib\\libxml2.dll"
+ "SourcePath" =
"8:C:\\Libraries\\libxml2-2.7.8.win32-vs10\\lib\\libxml2.dll"
"TargetName" = "8:libxml2.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -1981,7 +1981,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2CC8B012C0CB4DFC8F2223F62310125F"
{
- "SourcePath" =
"8:C:\\Libraries\\libxml2-2.7.7.win32-vs10\\lib\\libxml2.lib"
+ "SourcePath" =
"8:C:\\Libraries\\libxml2-2.7.8.win32-vs10\\lib\\libxml2.lib"
"TargetName" = "8:libxml2.lib"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -2521,7 +2521,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_52DCEC5806254D3F9246489B9C5DFC27"
{
- "SourcePath" = "8:C:\\Program Files\\PCRE-vs10\\bin\\pcre.dll"
+ "SourcePath" =
"8:C:\\Libraries\\pcre-8.13.win32-vs10\\bin\\pcre.dll"
"TargetName" = "8:pcre.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -3221,7 +3221,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_929EE4AE7E524A1CBC69C7718D412876"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0a.win32-vs10\\bin\\libeay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0d.win32-vs10\\bin\\libeay32.dll"
"TargetName" = "8:libeay32.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -3501,7 +3501,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A3D31DA50E0F4AE1873E390D5B7F1F33"
{
- "SourcePath" = "8:C:\\Program Files\\PCRE-vs10\\lib\\pcre.lib"
+ "SourcePath" =
"8:C:\\Libraries\\pcre-8.13.win32-vs10\\lib\\pcre.lib"
"TargetName" = "8:pcre.lib"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -3901,7 +3901,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_BA22F04D137D421199EB04EE1D228A8F"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0a.win32-vs10\\lib\\ssleay32.lib"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0d.win32-vs10\\lib\\ssleay32.lib"
"TargetName" = "8:ssleay32.lib"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -4041,7 +4041,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C3D9984F15D64164AECDEFF66981A97E"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0a.win32-vs10\\bin\\ssleay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0d.win32-vs10\\bin\\ssleay32.dll"
"TargetName" = "8:ssleay32.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -4161,7 +4161,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CA3CFDD1291E474EAE85329E4C5E5D45"
{
- "SourcePath" =
"8:C:\\Libraries\\bzip2-1.0.5.win32-vs10\\lib\\libbz2.lib"
+ "SourcePath" =
"8:C:\\Libraries\\bzip2-1.0.6.win32-vs10\\lib\\libbz2.lib"
"TargetName" = "8:libbz2.lib"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
diff --git a/NT/installer64/MonetDB-ODBC-Installer.vdproj
b/NT/installer64/MonetDB-ODBC-Installer.vdproj
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
