Changeset: 26032e5aa99c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=26032e5aa99c
Added Files:
sql/backends/monet5/gsl/Tests/gsl00.malC
sql/backends/monet5/vaults/72_fits.sql
sql/test/BugTracker-2015/Tests/acidity2-fail.Bug-3635.stable.err
sql/test/BugTracker-2015/Tests/acidity2-fail.Bug-3635.stable.out
sql/test/BugTracker-2015/Tests/incorrect-ROW_NUMBER.Bug-3663.sql
sql/test/BugTracker-2015/Tests/incorrect-ROW_NUMBER.Bug-3663.stable.err
sql/test/BugTracker-2015/Tests/incorrect-ROW_NUMBER.Bug-3663.stable.out
sql/test/BugTracker-2015/Tests/inet-ordering.Bug-3660.sql
sql/test/BugTracker-2015/Tests/inet-ordering.Bug-3660.stable.err
sql/test/BugTracker-2015/Tests/inet-ordering.Bug-3660.stable.out
sql/test/BugTracker-2015/Tests/row-value-constructor-crash.Bug-3662.sql
sql/test/BugTracker-2015/Tests/row-value-constructor-crash.Bug-3662.stable.err
sql/test/BugTracker-2015/Tests/row-value-constructor-crash.Bug-3662.stable.out
Removed Files:
monetdb5/mal/Tests/tst274.stable.out.oid64
monetdb5/modules/atoms/identifier.h
monetdb5/modules/atoms/inet.h
sql/backends/monet5/gsl/Tests/gsl00.mal
sql/backends/monet5/vaults/fits.sql
sql/test/bugs/Tests/temporal.sql.src
sql/test/bugs/Tests/temporal.stable.err
sql/test/bugs/Tests/temporal.stable.out
Modified Files:
NT/installer32/MonetDB-ODBC-Installer.vdproj
NT/installer32/MonetDB5-Geom-Module.vdproj
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
buildtools/ChangeLog.Oct2014
clients/Tests/MAL-signatures_all.stable.out
clients/Tests/MAL-signatures_all.stable.out.int128
clients/Tests/MAL-signatures_fits_geom.stable.out
clients/Tests/MAL-signatures_fits_geom.stable.out.int128
clients/Tests/MAL-signatures_geom.stable.out
clients/Tests/MAL-signatures_geom.stable.out.int128
clients/Tests/MAL-signatures_none.stable.out
clients/Tests/MAL-signatures_none.stable.out.int128
clients/Tests/SQL-dump_all.stable.out
clients/Tests/SQL-dump_all.stable.out.int128
clients/Tests/SQL-dump_geom.stable.out
clients/Tests/SQL-dump_geom.stable.out.int128
clients/Tests/exports.stable.out
debian/control
debian/rules
gdk/ChangeLog
gdk/gdk.h
gdk/gdk_aggr.c
gdk/gdk_align.c
gdk/gdk_atoms.c
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_bbp.c
gdk/gdk_calc.c
gdk/gdk_calc_compare.h
gdk/gdk_delta.c
gdk/gdk_firstn.c
gdk/gdk_group.c
gdk/gdk_heap.c
gdk/gdk_imprints.c
gdk/gdk_join.c
gdk/gdk_logger.c
gdk/gdk_private.h
gdk/gdk_qsort.c
gdk/gdk_sample.c
gdk/gdk_search.c
gdk/gdk_search.h
gdk/gdk_select.c
gdk/gdk_select_legacy.c
gdk/gdk_setop.c
gdk/gdk_ssort_impl.h
gdk/gdk_storage.c
gdk/gdk_unique.c
gdk/gdk_utils.c
java/src/nl/cwi/monetdb/jdbc/MonetResultSet.java
java/src/nl/cwi/monetdb/jdbc/MonetStatement.java
monetdb5/extras/rdf/rdf_shredder.c
monetdb5/extras/rdf/rdfalgebra.c
monetdb5/mal/Tests/tst273.mal
monetdb5/mal/Tests/tst273.stable.out
monetdb5/mal/Tests/tst274.mal
monetdb5/mal/Tests/tst274.stable.out
monetdb5/mal/mal_profiler.c
monetdb5/modules/atoms/Makefile.ag
monetdb5/modules/atoms/batxml.c
monetdb5/modules/atoms/identifier.c
monetdb5/modules/atoms/inet.c
monetdb5/modules/atoms/inet.mal
monetdb5/modules/atoms/mtime.c
monetdb5/modules/kernel/aggr.c
monetdb5/modules/kernel/aggr.mal.sh
monetdb5/modules/kernel/algebra.c
monetdb5/modules/kernel/bat5.c
monetdb5/modules/kernel/bat5.h
monetdb5/modules/kernel/bat5.mal
monetdb5/modules/kernel/batcolor.c
monetdb5/modules/kernel/batmmath.c
monetdb5/modules/kernel/batstr.c
monetdb5/modules/kernel/microbenchmark.c
monetdb5/modules/kernel/status.c
monetdb5/modules/mal/Tests/mat.stable.out
monetdb5/modules/mal/batcalc.c
monetdb5/modules/mal/bbp.c
monetdb5/modules/mal/clients.c
monetdb5/modules/mal/cluster.c
monetdb5/modules/mal/inspect.c
monetdb5/modules/mal/joinpath.c
monetdb5/modules/mal/mal_io.c
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/manifold.c
monetdb5/modules/mal/mat.c
monetdb5/modules/mal/mdb.c
monetdb5/modules/mal/pcre.c
monetdb5/modules/mal/querylog.c
monetdb5/modules/mal/tablet.c
monetdb5/modules/mal/tokenizer.c
monetdb5/modules/mal/txtsim.c
monetdb5/modules/mal/zorder.c
monetdb5/optimizer/Tests/All
sql/backends/monet5/Tests/limithack.sql
sql/backends/monet5/Tests/limithack.stable.err
sql/backends/monet5/Tests/limithack.stable.out
sql/backends/monet5/datacell/basket.c
sql/backends/monet5/datacell/dcoperator.c
sql/backends/monet5/generator/generator.c
sql/backends/monet5/gsl/Tests/gsl00.stable.out
sql/backends/monet5/sql.c
sql/backends/monet5/sql_cast_impl_down_from_int.h
sql/backends/monet5/sql_cast_impl_up_to_flt.h
sql/backends/monet5/sql_cast_impl_up_to_int.h
sql/backends/monet5/sql_result.c
sql/backends/monet5/vaults/Makefile.ag
sql/storage/bat/bat_logger.c
sql/storage/bat/bat_storage.c
sql/storage/store.c
sql/test/BugTracker-2015/Tests/All
sql/test/bugs/Tests/All
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/dump.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
testing/Mtest.py.in
Branch: transaction-replication
Log Message:
Merge with default branch
Resolve merge conflics afrer changes in GDK interfaces (return gdk_return
instead of int).
diffs (truncated from 21474 to 300 lines):
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
@@ -566,8 +566,8 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB ODBC Driver"
- "ProductCode" = "8:{2343A06A-C2EE-4093-A9D0-76BD33BD911E}"
- "PackageCode" = "8:{3D25FE62-3ACA-4E4F-8C44-00F612B05AF2}"
+ "ProductCode" = "8:{5B108DEE-F274-43CF-B986-16021B022170}"
+ "PackageCode" = "8:{5C32B67B-1F03-4C7A-AE0D-71C24985DCE3}"
"UpgradeCode" = "8:{C1F69378-3F5C-4120-8224-32F07D3458F3}"
"AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
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
@@ -229,7 +229,7 @@
"SourcePath" = "8:C:\\Libraries\\geos-3.4.2.win32\\bin\\geos_c.dll"
"TargetName" = "8:geos_c.dll"
"Tag" = "8:"
- "Folder" = "8:_272635DA3D924F9CB05C410645076698"
+ "Folder" = "8:_5A4CF78A6BC241B6AAEFF30075ECAE13"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -331,17 +331,6 @@
"Property" = "8:NEWPROPERTY1"
"Folders"
{
-
"{9EF0B969-E518-4E46-987F-47570745A589}:_272635DA3D924F9CB05C410645076698"
- {
- "Name" = "8:bin"
- "AlwaysCreate" = "11:FALSE"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Property" = "8:_4D04B65294AD4B5CBCD4EE336AF9B51A"
- "Folders"
- {
- }
- }
"{9EF0B969-E518-4E46-987F-47570745A589}:_4D9CE65EDD774551869CFD46B59B4F9E"
{
"Name" = "8:lib"
@@ -386,6 +375,17 @@
}
}
}
+
"{9EF0B969-E518-4E46-987F-47570745A589}:_5A4CF78A6BC241B6AAEFF30075ECAE13"
+ {
+ "Name" = "8:bin"
+ "AlwaysCreate" = "11:FALSE"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Property" = "8:_8243C459978C4243AD7AACC0339F371E"
+ "Folders"
+ {
+ }
+ }
}
}
"{3C67513D-01DD-4637-8A68-80971EB9504F}:_D9A7267FC9784D8BBD3CBC6EC1754DBE"
@@ -431,8 +431,8 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB5 SQL GIS Module"
- "ProductCode" = "8:{C3E5CF14-CA74-4A9C-8051-AC733123C5F6}"
- "PackageCode" = "8:{E77DD8EF-7830-4D56-97BE-26A2296F7008}"
+ "ProductCode" = "8:{49D21FF6-D17E-4037-8EC5-CDBD58AB6738}"
+ "PackageCode" = "8:{F161B791-C91B-43F4-A915-9D2FA8C59AC7}"
"UpgradeCode" = "8:{92C89C36-0E86-45E1-B3D8-0D6C91108F30}"
"AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
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
@@ -15,13 +15,13 @@
{
"Entry"
{
- "MsmKey" = "8:_00B0B80DC7654AB9A6B0E65404051359"
+ "MsmKey" = "8:_00254E461FF14CF588756AEF1B36F2AC"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_0341F375A2D14CB9AA258F9C7F59D853"
+ "MsmKey" = "8:_023E6BF2FACE4557AF196C75487BDEB5"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
@@ -33,13 +33,13 @@
}
"Entry"
{
- "MsmKey" = "8:_03B895AFEB174D65990EBB22D5BA9751"
+ "MsmKey" = "8:_03CF05EFB02B4531B8766111D581EC06"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_04BC8A80401A4DD88F4B11ADECEC7117"
+ "MsmKey" = "8:_058ED50F0528440696254640ED80BD92"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
@@ -51,7 +51,25 @@
}
"Entry"
{
- "MsmKey" = "8:_08795D45D2654619B8ADE4F57F9DF48A"
+ "MsmKey" = "8:_0646BAED741B451BA0E3BD26C82AD4B5"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_076DB41FCD394A23B579C471B0340D78"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_089BE1648F634FB1B8D5F0FD67422959"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_08C185D141A64405BE756D244F9DBF3D"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
@@ -63,7 +81,13 @@
}
"Entry"
{
- "MsmKey" = "8:_0ABBD1FDD22F46B9911009DC834A525D"
+ "MsmKey" = "8:_0AE7CEC472424498BE91110C8D49AA47"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_0CDB70435AB445EFA241C339B1B8F894"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
@@ -75,25 +99,13 @@
}
"Entry"
{
- "MsmKey" = "8:_0D89A4DB4F994D099C13CBFBBCF06A43"
+ "MsmKey" = "8:_0E18252D4E224A0CAF305750224DFE98"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_0E56D43B0AA940B2A39CD5C933BECE5C"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_0F3C74EE5A994455A420D3D0F5C351BC"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_1174853D3D9F4EDEAF358D86741B87F7"
+ "MsmKey" = "8:_10AA61E141204740AE8E2714C0193F9F"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
@@ -105,43 +117,49 @@
}
"Entry"
{
- "MsmKey" = "8:_14F914914617485AACBCFF39FA5F646B"
+ "MsmKey" = "8:_13AABB7CCFD34C6BB389B81F4CB77401"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_15E8239F241546D8ACD6C527E322C0CD"
+ "MsmKey" = "8:_13FEB0A975F8410DBC860E7A6557DC16"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_16E3FD1FDF22415A99B8FE81A6231248"
+ "MsmKey" = "8:_161D8A7890854F1691E4CDC8BC879F34"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_17D9C20FFF4345058C198380646E66B8"
+ "MsmKey" = "8:_16F028BE8C544E7B933EF459FD314C06"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_18D048C1AFBB4F709307E109E01C05BA"
+ "MsmKey" = "8:_170EDFB3FC38443CB2B703841250E38C"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_192FFF7D660645789A6A0CD24AA61909"
+ "MsmKey" = "8:_180C704BBB674E438C8A29F1579062FD"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_1ADF926ECD534ACDBF4105DF3A46C54B"
+ "MsmKey" = "8:_19585692353446199E183C23D1FCD695"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_19A67EBC426B4C1C87367D01F34C9B82"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
@@ -153,13 +171,13 @@
}
"Entry"
{
- "MsmKey" = "8:_1D5ACA855B234C93B22861A37A1B4663"
+ "MsmKey" = "8:_1D029A986AA44C02AC04765B2855BF65"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_1DA15FCBB5174B64968065B5F8CB8FAF"
+ "MsmKey" = "8:_1DA13DE1A8A24C5FB5CF49CD4DB61DF7"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
@@ -171,19 +189,13 @@
}
"Entry"
{
- "MsmKey" = "8:_1FEF2B135F2C4C9FA8C8E7CB566F8372"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_210ACB4F1EA444B4B72F5B60E9953FEE"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_243ACA00391A4A0BA72D3D74EDFF7EA1"
+ "MsmKey" = "8:_2289039FD04A44AD8169CB12C81DF8FF"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
@@ -201,25 +213,13 @@
}
"Entry"
{
- "MsmKey" = "8:_28521FFD6F674CA7A690F286C44272EB"
+ "MsmKey" = "8:_2A69C8F0B6A34975B94A9D8F8BD184B9"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_28692FB6E5F04903B3967A03CD6C79E2"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_2B886D7761FE4A4EBC3BE01D165333B1"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_2C1CFEB2DFF940BBBAF32D7554F9A893"
+ "MsmKey" = "8:_2B17C9166D0D40288BB0CABF731F8DB8"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
