MonetDB: Oct2014 - Merged with Jan2014 branch.
Changeset: 972d327c8d5f for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=972d327c8d5f Modified Files: sql/test/BugTracker-2014/Tests/All Branch: Oct2014 Log Message: Merged with Jan2014 branch. diffs (12 lines): diff --git a/sql/test/BugTracker-2014/Tests/All b/sql/test/BugTracker-2014/Tests/All --- a/sql/test/BugTracker-2014/Tests/All +++ b/sql/test/BugTracker-2014/Tests/All @@ -22,7 +22,7 @@ local-temp-2.Bug-3468 select_in_crash.Bug-3491 boolean_not.Bug-3505 varchar_conversion_crash.Bug-3506 -bug_in_cse.Bug-3511 +HAVE_GEOM?bug_in_cse.Bug-3511 stringfloatshtcompare.Bug-3512 oid-table-assert.Bug-3514 round-properties.Bug-3515 ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Oct2014 - Merged with Jan2014 branch.
Changeset: 5e3c36afc54d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5e3c36afc54d
Modified Files:
NT/installer32/MonetDB-ODBC-Installer.vdproj
NT/installer32/MonetDB5-Geom-Module.vdproj
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB-ODBC-Installer.vdproj
NT/installer64/MonetDB5-Geom-Module.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
monetdb5/mal/mal_interpreter.c
Branch: Oct2014
Log Message:
Merged with Jan2014 branch.
diffs (truncated from 390 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
@@ -230,7 +230,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_17D7FB69076E415C8973295D502161C5"
{
-"SourcePath" =
"8:C:\\Libraries\\iconv-1.11.1.win32-vs10\\bin\\iconv.dll"
+"SourcePath" =
"8:C:\\Libraries\\iconv-1.11.1.win32\\bin\\iconv.dll"
"TargetName" = "8:iconv.dll"
"Tag" = "8:"
"Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
@@ -250,7 +250,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2E74F1B1BDE548A7922BAD968E690A3A"
{
-"SourcePath" =
"8:C:\\Libraries\\bzip2-1.0.6.win32-vs10\\bin\\libbz2.dll"
+"SourcePath" =
"8:C:\\Libraries\\bzip2-1.0.6.win32\\bin\\libbz2.dll"
"TargetName" = "8:libbz2.dll"
"Tag" = "8:"
"Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
@@ -290,7 +290,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4F0D2367141846EFA634DA35B05CDA4D"
{
-"SourcePath" =
"8:C:\\Libraries\\zlib-1.2.5.win32-vs10\\bin\\zlib1.dll"
+"SourcePath" = "8:C:\\Libraries\\zlib-1.2.5.win32\\bin\\zlib1.dll"
"TargetName" = "8:zlib1.dll"
"Tag" = "8:"
"Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
@@ -330,7 +330,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_779449EF5BAD4B068A50802402E52278"
{
-"SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1g.win32-vs10\\bin\\libeay32.dll"
+"SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1g.win32\\bin\\libeay32.dll"
"TargetName" = "8:libeay32.dll"
"Tag" = "8:"
"Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
@@ -370,7 +370,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B1B1C0011D7945F892A77F529772EA72"
{
-"SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1g.win32-vs10\\bin\\ssleay32.dll"
+"SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1g.win32\\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
@@ -226,7 +226,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6C07D912740F414490DD35D5A179D268"
{
-"SourcePath" =
"8:C:\\Libraries\\geos-3.4.2.win32-vs10\\bin\\geos_c.dll"
+"SourcePath" = "8:C:\\Libraries\\geos-3.4.2.win32\\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
@@ -1042,7 +1042,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_03431EDC85094776AD217020CB3E26D4"
{
-"SourcePath" =
"8:C:\\Libraries\\zlib-1.2.5.win32-vs10\\lib\\zdll.lib"
+"SourcePath" = "8:C:\\Libraries\\zlib-1.2.5.win32\\lib\\zdll.lib"
"TargetName" = "8:zdll.lib"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -1182,7 +1182,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0D84516ED4054FEA84A5E2C60F42AFE3"
{
-"SourcePath" =
"8:C:\\Libraries\\bzip2-1.0.6.win32-vs10\\bin\\libbz2.dll"
+"SourcePath" =
"8:C:\\Libraries\\bzip2-1.0.6.win32\\bin\\libbz2.dll"
"TargetName" = "8:libbz2.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -1282,7 +1282,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_13440C2EDE6842BF8D9F24F554EEB87F"
{
-"SourcePath" =
"8:C:\\Libraries\\libxml2-2.7.8.win32-vs10\\lib\\libxml2.dll"
+"SourcePath" =
"8:C:\\
MonetDB: Oct2014 - Merged with Jan2014 branch.
Changeset: a006d5a4e431 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a006d5a4e431 Added Files: clients/Tests/MAL-signatures_all.malC clients/Tests/MAL-signatures_fits_geom.malC.src clients/Tests/MAL-signatures_fits_geom.stable.err clients/Tests/MAL-signatures_fits_geom.stable.out clients/Tests/MAL-signatures_geom.malC.src clients/Tests/MAL-signatures_geom.stable.err clients/Tests/MAL-signatures_geom.stable.out clients/Tests/SQL-dump_all.sql clients/Tests/SQL-dump_geom.sql.src clients/Tests/SQL-dump_geom.stable.err clients/Tests/SQL-dump_geom.stable.out clients/Tests/SQL-dump_geom.stable.out.32bit clients/Tests/SQL-dump_geom.stable.out.64bit.oid32 Removed Files: clients/Tests/MAL-signatures.malC clients/Tests/MAL-signatures.stable.err clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures_R.malC.src clients/Tests/MAL-signatures_R.stable.err clients/Tests/MAL-signatures_R.stable.out clients/Tests/MAL-signatures_all.malC.src clients/Tests/MAL-signatures_bam.malC.src clients/Tests/MAL-signatures_bam.stable.err clients/Tests/MAL-signatures_bam.stable.out clients/Tests/MAL-signatures_gsl.malC.src clients/Tests/MAL-signatures_gsl.stable.err clients/Tests/MAL-signatures_gsl.stable.out clients/Tests/MAL-signatures_nocfitsio.malC.src clients/Tests/MAL-signatures_nocfitsio.stable.err clients/Tests/MAL-signatures_nocfitsio.stable.out clients/Tests/SQL-dump.sql clients/Tests/SQL-dump.stable.err clients/Tests/SQL-dump.stable.out clients/Tests/SQL-dump.stable.out.32bit clients/Tests/SQL-dump.stable.out.64bit.oid32 clients/Tests/SQL-dump.timeout clients/Tests/SQL-dump_all.sql.src Modified Files: clients/Tests/All clients/Tests/MAL-signatures_none.malC.src clients/Tests/SQL-dump_none.sql.src Branch: Oct2014 Log Message: Merged with Jan2014 branch. diffs (truncated from 128642 to 300 lines): diff --git a/clients/Tests/All b/clients/Tests/All --- a/clients/Tests/All +++ b/clients/Tests/All @@ -1,11 +1,8 @@ exports -HAVE_CFITSIO&HAVE_GEOM&!HAVE_GSL&!HAVE_LIBR&!HAVE_SAMTOOLS&!HAVE_SPHINXCLIENT?MAL-signatures -HAVE_CFITSIO&HAVE_GEOM&HAVE_GSL&!HAVE_LIBR&!HAVE_SAMTOOLS&!HAVE_SPHINXCLIENT?MAL-signatures_gsl -HAVE_CFITSIO&HAVE_GEOM&HAVE_GSL&!HAVE_LIBR&HAVE_SAMTOOLS&!HAVE_SPHINXCLIENT?MAL-signatures_bam -HAVE_CFITSIO&HAVE_GEOM&HAVE_GSL&HAVE_LIBR&HAVE_SAMTOOLS&!HAVE_SPHINXCLIENT?MAL-signatures_R -!HAVE_CFITSIO&HAVE_GEOM&!HAVE_GSL&!HAVE_LIBR&!HAVE_SAMTOOLS&!HAVE_SPHINXCLIENT?MAL-signatures_nocfitsio HAVE_CFITSIO&HAVE_GEOM&HAVE_GSL&HAVE_LIBR&HAVE_SAMTOOLS&HAVE_SPHINXCLIENT?MAL-signatures_all +HAVE_CFITSIO&HAVE_GEOM&!HAVE_GSL&!HAVE_LIBR&!HAVE_SAMTOOLS&!HAVE_SPHINXCLIENT?MAL-signatures_fits_geom +!HAVE_CFITSIO&HAVE_GEOM&!HAVE_GSL&!HAVE_LIBR&!HAVE_SAMTOOLS&!HAVE_SPHINXCLIENT?MAL-signatures_geom !HAVE_CFITSIO&!HAVE_GEOM&!HAVE_GSL&!HAVE_LIBR&!HAVE_SAMTOOLS&!HAVE_SPHINXCLIENT?MAL-signatures_none -HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS?SQL-dump HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS?SQL-dump_all +HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS?SQL-dump_geom !HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS?SQL-dump_none diff --git a/clients/Tests/MAL-signatures_R.malC.src b/clients/Tests/MAL-signatures_R.malC.src deleted file mode 100644 --- a/clients/Tests/MAL-signatures_R.malC.src +++ /dev/null @@ -1,1 +0,0 @@ -$RELSRCDIR/MAL-signatures.malC diff --git a/clients/Tests/MAL-signatures_R.stable.err b/clients/Tests/MAL-signatures_R.stable.err deleted file mode 100644 --- a/clients/Tests/MAL-signatures_R.stable.err +++ /dev/null @@ -1,35 +0,0 @@ -stderr of test 'MAL-signatures_R` in directory 'clients` itself: - - -# 14:24:10 > -# 14:24:10 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=31236" "--set" "mapi_usock=/var/tmp/mtest-21213/.s.monetdb.31236" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_clients" "--set" "mal_listing=2" -# 14:24:10 > - -# builtin opt gdk_dbpath = /ufs/sjoerd/Monet-candidate/var/monetdb5/dbfarm/demo -# builtin opt gdk_debug = 0 -# builtin opt gdk_vmtrim = yes -# builtin opt monet_prompt = > -# builtin opt monet_daemon = no -# builtin opt mapi_port = 5 -# builtin opt mapi_open = false -# builtin opt mapi_autosense = false -# builtin opt sql_optimizer = default_pipe -# builtin opt sql_debug = 0 -# cmdline opt gdk_nr_threads = 0 -# cmdline opt mapi_open = true -# cmdline opt mapi_port = 31236 -# cmdline opt mapi_usock = /var/tmp/mtest-21213/.s.monetdb.31236 -# cmdline opt monet_prompt = -# cmdline opt mal_listing = 2 -# cmdline opt gdk_dbpath = /ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_clients -# cmdline opt mal_listing = 2 - -# 14:24:10 > -#
MonetDB: Oct2014 - Merged with Jan2014 branch.
Changeset: c33c47d8a00c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c33c47d8a00c Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures_gsl.stable.out clients/Tests/MAL-signatures_nocfitsio.stable.out clients/Tests/MAL-signatures_sphinxclient.stable.out clients/Tests/SQL-dump.stable.out.64bit.oid32 Branch: Oct2014 Log Message: Merged with Jan2014 branch. diffs (29 lines): diff --git a/clients/Tests/SQL-dump.stable.out.64bit.oid32 b/clients/Tests/SQL-dump.stable.out.64bit.oid32 --- a/clients/Tests/SQL-dump.stable.out.64bit.oid32 +++ b/clients/Tests/SQL-dump.stable.out.64bit.oid32 @@ -5752,7 +5752,7 @@ CREATE TABLE "sys"."functions" ( "vararg" BOOLEAN, "schema_id" INTEGER ); -COPY 1308 RECORDS INTO "sys"."functions" FROM stdin USING DELIMITERS '\t','\n','"'; +COPY 1318 RECORDS INTO "sys"."functions" FROM stdin USING DELIMITERS '\t','\n','"'; 28 "not_uniques" "not_uniques" "sql" 0 1 false false false 0 29 "not_uniques" "not_uniques" "sql" 0 1 false false false 0 30 "hash" "hash" "mkey" 0 1 false false false 0 @@ -7061,6 +7061,16 @@ 6487 "reverse" "-- The contents of this 6491 "fuse" "-- fuse two (1-byte) tinyint values into one (2-byte) smallint value\ncreate function fuse(one tinyint, two tinyint)\nreturns smallint external name udf.fuse;""udf" 1 1 false false false 2000 6496 "fuse" "-- fuse two (2-byte) smallint values into one (4-byte) integer value\ncreate function fuse(one smallint, two smallint)\nreturns integer external name udf.fuse;" "udf" 1 1 false false false 2000 6501 "fuse" "-- fuse two (4-byte) integer values into one (8-byte) bigint value\ncreate function fuse(one integer, two integer)\nreturns bigint external name udf.fuse;""udf" 1 1 false false false 2000 +6506 "generate_series" "-- The contents of this file are subject to the MonetDB Public License\n-- Version 1.1 (the ""License""); you may not use this file except in\n-- compliance with the License. You may obtain a copy of the License at\n-- http://www.monetdb.org/Legal/MonetDBLicense\n--\n-- Software distributed under the License is distributed on an ""AS IS""\n-- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the\n-- License for the specific language governing rights and limitations\n-- under the License.\n--\n-- The Original Code is the MonetDB Database System.\n--\n-- The Initial Developer of the Original Code is CWI.\n-- Portions created by CWI are Copyright (C) 1997-July 2008 CWI.\n-- Copyright August 2008-2014 MonetDB B.V.\n-- All Rights Reserved.\n\n-- (c) Author M.Kersten\n\ncreate function sys.generate_series(first tinyint, last tinyint)\nreturns table (value tinyint)\nexternal name generator.series;" "generator" 1 5 false false false 2000 +6511 "generate_series" "create function sys.generate_series(first tinyint, last tinyint, stepsize tinyint)\nreturns table (value tinyint)\nexternal name generator.series;""generator" 1 5 false false false 2000 +6517 "generate_series" "create function sys.generate_series(first int, last int)\nreturns table (value int)\nexternal name generator.series;" "generator" 1 5 false false false 2000 +6522 "generate_series" "create function sys.generate_series(first int, last int, stepsize int)\nreturns table (value int)\nexternal name generator.series;""generator" 1 5 false false false 2000 +6528 "generate_series" "create function sys.generate_series(first bigint, last bigint)\nreturns table (value bigint)\nexternal name generator.series;" "generator" 1 5 false false false 2000 +6533 "generate_series" "create function sys.generate_series(first bigint, last bigint, stepsize bigint)\nreturns table (value bigint)\nexternal name generator.series;""generator" 1 5 false false false 2000 +6539 "generate_series" "create function sys.generate_series(first real, last real, stepsize real)\nreturns table (value real)\nexternal name generator.series;""generator" 1 5 false false false 2000 +6545 "generate_series" "create function sys.generate_series(first double, last double, stepsize double)\nreturns table (value double)\nexternal name generator.series;""generator" 1 5 false false false 2000 +6551 "generate_series" "create function sys.generate_series(first decimal(10,2), last decimal(10,2), stepsize decimal(10,2))\nreturns table (value decimal(10,2))\nexternal name generator.series;""generator" 1 5 false false false 2000 +6557 "generate_s
