Changeset: ed9a718d0661 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ed9a718d0661
Added Files:
sql/test/pg_regress/monetdb/abstime.sql
sql/test/pg_regress/monetdb/aggregates.sql
sql/test/pg_regress/monetdb/alter_table.sql
sql/test/pg_regress/monetdb/arrays.sql
sql/test/pg_regress/monetdb/bit.sql
sql/test/pg_regress/monetdb/boolean.sql
sql/test/pg_regress/monetdb/box.sql
sql/test/pg_regress/monetdb/btree_index.sql
sql/test/pg_regress/monetdb/case.sql
sql/test/pg_regress/monetdb/circle.sql
sql/test/pg_regress/monetdb/cluster.sql
sql/test/pg_regress/monetdb/comments.sql
sql/test/pg_regress/monetdb/conversion.sql
sql/test/pg_regress/monetdb/copy2.sql
sql/test/pg_regress/monetdb/create_aggregate.sql
sql/test/pg_regress/monetdb/create_index.sql
sql/test/pg_regress/monetdb/create_misc.sql
sql/test/pg_regress/monetdb/create_operator.sql
sql/test/pg_regress/monetdb/create_type.sql
sql/test/pg_regress/monetdb/create_view.sql
sql/test/pg_regress/monetdb/date.sql
sql/test/pg_regress/monetdb/domain.sql
sql/test/pg_regress/monetdb/drop.sql
sql/test/pg_regress/monetdb/errors.sql
sql/test/pg_regress/monetdb/float4.sql
sql/test/pg_regress/monetdb/float8.sql
sql/test/pg_regress/monetdb/foreign_key.sql
sql/test/pg_regress/monetdb/geometry.sql
sql/test/pg_regress/monetdb/hash_index.sql
sql/test/pg_regress/monetdb/horology.sql
sql/test/pg_regress/monetdb/inet.sql
sql/test/pg_regress/monetdb/inherit.sql
sql/test/pg_regress/monetdb/insert.sql
sql/test/pg_regress/monetdb/int2.sql
sql/test/pg_regress/monetdb/int4.sql
sql/test/pg_regress/monetdb/int8.sql
sql/test/pg_regress/monetdb/interval.sql
sql/test/pg_regress/monetdb/join.sql
sql/test/pg_regress/monetdb/limit.sql
sql/test/pg_regress/monetdb/lseg.sql
sql/test/pg_regress/monetdb/mule_internal.sql
sql/test/pg_regress/monetdb/name.sql
sql/test/pg_regress/monetdb/namespace.sql
sql/test/pg_regress/monetdb/numeric.sql
sql/test/pg_regress/monetdb/numeric_big.sql
sql/test/pg_regress/monetdb/numerology.sql
sql/test/pg_regress/monetdb/oid.sql
sql/test/pg_regress/monetdb/oidjoins.sql
sql/test/pg_regress/monetdb/opr_sanity.sql
sql/test/pg_regress/monetdb/path.sql
sql/test/pg_regress/monetdb/plpgsql.sql
sql/test/pg_regress/monetdb/point.sql
sql/test/pg_regress/monetdb/polygon.sql
sql/test/pg_regress/monetdb/polymorphism.sql
sql/test/pg_regress/monetdb/portals.sql
sql/test/pg_regress/monetdb/portals_p2.sql
sql/test/pg_regress/monetdb/prepare.sql
sql/test/pg_regress/monetdb/privileges.sql
sql/test/pg_regress/monetdb/random.sql
sql/test/pg_regress/monetdb/rangefuncs.sql
sql/test/pg_regress/monetdb/reltime.sql
sql/test/pg_regress/monetdb/rowtypes.sql
sql/test/pg_regress/monetdb/rules.sql
sql/test/pg_regress/monetdb/sanity_check.sql
sql/test/pg_regress/monetdb/select.sql
sql/test/pg_regress/monetdb/select_distinct.sql
sql/test/pg_regress/monetdb/select_distinct_on.sql
sql/test/pg_regress/monetdb/select_having.sql
sql/test/pg_regress/monetdb/select_implicit.sql
sql/test/pg_regress/monetdb/select_into.sql
sql/test/pg_regress/monetdb/select_views.sql
sql/test/pg_regress/monetdb/sequence.sql
sql/test/pg_regress/monetdb/sql_ascii.sql
sql/test/pg_regress/monetdb/stats.sql
sql/test/pg_regress/monetdb/strings.sql
sql/test/pg_regress/monetdb/subselect.sql
sql/test/pg_regress/monetdb/temp.sql
sql/test/pg_regress/monetdb/time.sql
sql/test/pg_regress/monetdb/timestamp.sql
sql/test/pg_regress/monetdb/timestamptz.sql
sql/test/pg_regress/monetdb/timetz.sql
sql/test/pg_regress/monetdb/tinterval.sql
sql/test/pg_regress/monetdb/transactions.sql
sql/test/pg_regress/monetdb/triggers.sql
sql/test/pg_regress/monetdb/truncate.sql
sql/test/pg_regress/monetdb/type_sanity.sql
sql/test/pg_regress/monetdb/union.sql
sql/test/pg_regress/monetdb/update.sql
sql/test/pg_regress/monetdb/vacuum.sql
sql/test/pg_regress/monetdb/without_oid.sql
Modified Files:
.hgtags
MonetDB.spec
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
NT/monetdb_config.h.in
NT/rules.msc
bootstrap
clients/R/MonetDB.R/src/mapi.c
clients/mapilib/mapi.rc
clients/odbc/driver/ODBCUtil.c
clients/odbc/driver/SQLGetInfo.c
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
clients/python2/setup.py
clients/python2/test/capabilities.py
clients/python3/setup.py
clients/python3/test/capabilities.py
common/stream/stream.c
configure.ag
debian/changelog
debian/control
gdk/gdk_atoms.c
gdk/libbat.rc
java/src/nl/cwi/monetdb/jdbc/MonetResultSet.java
libversions
monetdb5/extras/jaql/parser/jaql.y
monetdb5/modules/mal/tablet.c
monetdb5/tools/libmonetdb5.rc
sql/backends/monet5/rel_bin.c
sql/jdbc/tests/Tests/Test_PSmetadata.stable.out
sql/server/rel_dump.c
sql/server/rel_select.c
sql/server/sql_parser.y
sql/test/pg_regress/Tests/strings_cast.stable.err
sql/test/pg_regress/Tests/strings_cast.stable.out
sql/test/pg_regress/monetdb/char.sql
testing/Mtest.py.in
vertoo.data
Branch: Jan2014
Log Message:
merger
diffs (truncated from 21545 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -564,3 +564,6 @@ fa6872e2a8cf8bb3b4fb25a3b356946316f52a6b
242fe4b4960f54c339f7a6fb79aedd8f3b5e217a Jan2014_SP1_release
c91c4d792dee1074ce6f489e94ce4bfc480edfb3 Jan2014_15
13e1b24f442791f5ab790fa77453d3bd4e88a9c8 Jan2014_SP2_release
+c3051f066a9eea814487dfb0b7cf7070ae16cd21 Jan2014_17
+13e1b24f442791f5ab790fa77453d3bd4e88a9c8 Jan2014_SP2_release
+389f5f0d4c43ab689e31c28e01b43c8b7ba8de9c Jan2014_SP2_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
%define name MonetDB
-%define version 11.17.16
+%define version 11.17.18
%{!?buildno: %define buildno %(date +%Y%m%d)}
# groups of related archs
@@ -827,6 +827,10 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/MonetD
rm -fr $RPM_BUILD_ROOT
%changelog
+* Wed May 14 2014 Sjoerd Mullender <[email protected]> - 11.17.17-20140514
+- Rebuilt.
+- BZ#3482: Crossproduct error
+
* Thu May 08 2014 Sjoerd Mullender <[email protected]> - 11.17.15-20140508
- Rebuilt.
- BZ#3424: numeric values at the front of strings determines whether
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,15 +566,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB ODBC Driver"
- "ProductCode" = "8:{F8351679-BA45-4C51-897F-138A4712197F}"
- "PackageCode" = "8:{48D0C51A-DD47-4E8C-9C9B-766817EBCE86}"
+ "ProductCode" = "8:{089BF3EC-8C43-48FF-BC98-D98D3AAE525D}"
+ "PackageCode" = "8:{0232FABC-DCD8-4C73-88B7-E8BCE875B70F}"
"UpgradeCode" = "8:{C1F69378-3F5C-4120-8224-32F07D3458F3}"
"AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.17.16"
+ "ProductVersion" = "8:11.17.18"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.monetdb.org/";
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
@@ -425,14 +425,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB5 SQL GIS Module"
- "ProductCode" = "8:{4541B333-73C5-4825-9F93-463B42029D69}"
- "PackageCode" = "8:{F7763C29-A3DF-498A-91A5-37267E18F77F}"
+ "ProductCode" = "8:{808008B3-C232-4AE8-AA63-95B058C81DE1}"
+ "PackageCode" = "8:{9F5B798E-389F-4932-9C8C-4FC45A832968}"
"UpgradeCode" = "8:{92C89C36-0E86-45E1-B3D8-0D6C91108F30}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.17.16"
+ "ProductVersion" = "8:11.17.18"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.monetdb.org/";
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
@@ -2407,7 +2407,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.17.16\\dump-restore.txt"
+ "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.17.18\\dump-restore.txt"
"TargetName" = "8:dump-restore.txt"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -3207,7 +3207,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.17.16\\dump-restore.html"
+ "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.17.18\\dump-restore.html"
"TargetName" = "8:dump-restore.html"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -4511,7 +4511,7 @@
{
"{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37"
{
- "Name" = "8:MonetDB-SQL-11.17.16"
+ "Name" = "8:MonetDB-SQL-11.17.18"
"AlwaysCreate" = "11:FALSE"
"Condition" = "8:"
"Transitive" = "11:FALSE"
@@ -4553,15 +4553,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB5"
- "ProductCode" = "8:{5C371644-499B-402C-8689-5905391E14E8}"
- "PackageCode" = "8:{DFDD6CE1-08A7-41E0-8DC5-98763193E90A}"
+ "ProductCode" = "8:{D12286F7-EA83-4E6D-B4E7-20565C78C554}"
+ "PackageCode" = "8:{8A52E677-1A8C-4C03-AC7E-0087B519C751}"
"UpgradeCode" = "8:{730C595B-DBA6-48D7-94B8-A98780AC92B6}"
"AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.17.16"
+ "ProductVersion" = "8:11.17.18"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer64/MonetDB-ODBC-Installer.vdproj
b/NT/installer64/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer64/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer64/MonetDB-ODBC-Installer.vdproj
@@ -566,15 +566,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB ODBC Driver"
- "ProductCode" = "8:{AE05DD9B-75DC-4F9D-96EA-C6B94B87DDEA}"
- "PackageCode" = "8:{9FE6246C-AD45-4212-B4A2-660CE4DC674D}"
+ "ProductCode" = "8:{093B4B51-EB5B-4C31-8D20-A2D7C52659E9}"
+ "PackageCode" = "8:{7FF991C3-F9A2-4E70-ABB4-F8A6881F3BB7}"
"UpgradeCode" = "8:{95ACBC8C-BC4B-4901-AF70-48B54A5C20F7}"
"AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.17.16"
+ "ProductVersion" = "8:11.17.18"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer64/MonetDB5-Geom-Module.vdproj
b/NT/installer64/MonetDB5-Geom-Module.vdproj
--- a/NT/installer64/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer64/MonetDB5-Geom-Module.vdproj
@@ -425,14 +425,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB5 SQL GIS Module"
- "ProductCode" = "8:{B0DFC2B5-7A58-4B29-9052-AC63569824F7}"
- "PackageCode" = "8:{65778A40-1327-4451-A90A-EB102AD2DEEB}"
+ "ProductCode" = "8:{D0831235-7732-4099-A9DB-58540419D8B8}"
+ "PackageCode" = "8:{E67F2F7E-7949-498C-878F-146B0FCC4016}"
"UpgradeCode" = "8:{8E6CDFDE-39B9-43D9-97B3-2440C012845C}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.17.16"
+ "ProductVersion" = "8:11.17.18"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer64/MonetDB5-SQL-Installer.vdproj
b/NT/installer64/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer64/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer64/MonetDB5-SQL-Installer.vdproj
@@ -2407,7 +2407,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.17.16\\dump-restore.txt"
+ "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.17.18\\dump-restore.txt"
"TargetName" = "8:dump-restore.txt"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -3207,7 +3207,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.17.16\\dump-restore.html"
+ "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.17.18\\dump-restore.html"
"TargetName" = "8:dump-restore.html"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -4511,7 +4511,7 @@
{
"{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37"
{
- "Name" = "8:MonetDB-SQL-11.17.16"
+ "Name" = "8:MonetDB-SQL-11.17.18"
"AlwaysCreate" = "11:FALSE"
"Condition" = "8:"
"Transitive" = "11:FALSE"
@@ -4553,15 +4553,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB5"
- "ProductCode" = "8:{A84A3E71-CDEF-4BD5-8198-FB7814CF994C}"
- "PackageCode" = "8:{13FBEDD2-C70B-4DC8-B552-1EC4E2A030B2}"
+ "ProductCode" = "8:{AB41AA36-C030-4498-A4C4-D86E150582B9}"
+ "PackageCode" = "8:{F0A09134-7513-486C-8816-7C8627CBEABF}"
"UpgradeCode" = "8:{839D3C90-B578-41E2-A004-431440F9E899}"
"AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.17.16"
+ "ProductVersion" = "8:11.17.18"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -778,13 +778,13 @@
#define PACKAGE_NAME "MonetDB"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "MonetDB 11.17.16"
+#define PACKAGE_STRING "MonetDB 11.17.18"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "MonetDB"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "11.17.16"
+#define PACKAGE_VERSION "11.17.18"
/* Define to the home page for this package. */
#define PACKAGE_URL ""
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -17,7 +17,7 @@
# Copyright August 2008-2014 MonetDB B.V.
# All Rights Reserved.
-VERSION=11.17.16
+VERSION=11.17.18
# ^^^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [email protected] for details and/or
assistance.
diff --git a/bootstrap b/bootstrap
--- a/bootstrap
+++ b/bootstrap
@@ -29,6 +29,17 @@ type -P glibtoolize > /dev/null \
&& libtoolize=glibtoolize \
|| libtoolize=libtoolize
+# cope with systems where aclocal is known as aclocal-1.10 (and
+# automake as automake-1.10), e.g. OpenIndiana
+amv=
+if ! type -P aclocal > /dev/null; then
+ if type -P aclocal-1.11 > /dev/null; then
+ amv=-1.11
+ elif type -P aclocal-1.10 > /dev/null; then
+ amv=-1.10
+ fi
+fi
+
_m4_extra_dirs=
if [[ -n ${M4DIRS} ]] ; then
for d in ${M4DIRS} ; do
@@ -52,9 +63,9 @@ while read f; do [ -x $f.in ] && echo "A
sed '1,/^AC_CONFIG_FILES/d' configure.ag
) > configure.ac &&
$libtoolize -c -f &&
-aclocal ${_m4_extra_dirs} &&
+aclocal$amv ${_m4_extra_dirs} &&
autoheader &&
-automake --add-missing --copy --foreign &&
+automake$amv --add-missing --copy --foreign &&
autoconf
if [ -f buildtools/conf/install-sh -a ! -x buildtools/conf/install-sh ]; then
chmod +x buildtools/conf/install-sh
diff --git a/clients/R/MonetDB.R/src/mapi.c b/clients/R/MonetDB.R/src/mapi.c
--- a/clients/R/MonetDB.R/src/mapi.c
+++ b/clients/R/MonetDB.R/src/mapi.c
@@ -257,8 +257,8 @@ SEXP mapiRead(SEXP conn) {
while (response_buf_offset + block_length > response_buf_len) {
response_buf_len += ALLOCSIZE;
if (DEBUG) {
- printf("II: Reallocating memory, new size
%lu\n",
- (unsigned long)
response_buf_len);
+ printf("II: Reallocating memory, new size
"SZFMT"\n",
+ response_buf_len);
}
response_buf = realloc(response_buf, response_buf_len);
if (response_buf == NULL) {
@@ -278,7 +278,7 @@ SEXP mapiRead(SEXP conn) {
size_t i;
for (i = 0; i < response_buf_offset; i++) {
if (response_buf[i] == '\0') {
- warning("Removed a NULL character from response at
offset %lu of %lu",(unsigned long) i,(unsigned long) response_buf_offset);
+ warning("Removed a NULL character from response at
offset "SZFMT" of "SZFMT"",i,response_buf_offset);
response_buf[i] = '\t';
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
