Changeset: 748b0b321f0c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=748b0b321f0c
Added Files:
sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.stable.err.Windows
sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.stable.out.Windows
sql/test/BugTracker-2017/Tests/crash-dce.Bug-6330.sql
sql/test/BugTracker-2017/Tests/crash-dce.Bug-6330.stable.err
sql/test/BugTracker-2017/Tests/crash-dce.Bug-6330.stable.out
sql/test/BugTracker-2017/Tests/crash-dce.Bug-6330.stable.out.int128
sql/test/BugTracker-2017/Tests/crash-select_after_MAL_error.Bug-6332.sql
sql/test/BugTracker-2017/Tests/crash-select_after_MAL_error.Bug-6332.stable.err
sql/test/BugTracker-2017/Tests/crash-select_after_MAL_error.Bug-6332.stable.out
sql/test/BugTracker-2017/Tests/crash-select_after_MAL_error.Bug-6332.stable.out.int128
sql/test/BugTracker-2017/Tests/create_table_as-missing_not_null.Bug-6329.sql
sql/test/BugTracker-2017/Tests/create_table_as-missing_not_null.Bug-6329.stable.err
sql/test/BugTracker-2017/Tests/create_table_as-missing_not_null.Bug-6329.stable.out
sql/test/BugTracker-2017/Tests/simplify_math.Bug-6324.sql
sql/test/BugTracker-2017/Tests/simplify_math.Bug-6324.stable.err
sql/test/BugTracker-2017/Tests/simplify_math.Bug-6324.stable.out
sql/test/BugTracker-2017/Tests/statistics_nils_not_eq_zero.Bug-6331.sql
sql/test/BugTracker-2017/Tests/statistics_nils_not_eq_zero.Bug-6331.stable.err
sql/test/BugTracker-2017/Tests/statistics_nils_not_eq_zero.Bug-6331.stable.out
sql/test/malloc_fail/Tests/setmemorylimit-fail2.stable.err
sql/test/malloc_fail/Tests/setmemorylimit-fail2.stable.out
Removed Files:
sql/test/pg_regress/Tests/oid.stable.out.oid32
sql/test/pg_regress/Tests/without_oid.stable.out.oid32
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
clients/ChangeLog.Dec2016
clients/mapilib/mapi.rc
clients/odbc/driver/SQLTables.c
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
common/stream/stream.c
configure.ag
gdk/gdk_bat.c
gdk/gdk_bbp.c
gdk/gdk_hash.c
gdk/gdk_heap.c
gdk/gdk_imprints.c
gdk/gdk_join.c
gdk/gdk_select.c
gdk/gdk_utils.c
gdk/libbat.rc
monetdb5/modules/kernel/status.c
monetdb5/modules/mal/bbp.c
monetdb5/modules/mal/clients.c
monetdb5/modules/mal/inspect.c
monetdb5/modules/mal/mdb.c
monetdb5/modules/mal/remote.c
monetdb5/tools/libmonetdb5.rc
sql/backends/monet5/sql_execute.c
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_statistics.c
sql/server/rel_dump.c
sql/server/rel_exp.c
sql/server/rel_exp.h
sql/server/rel_optimizer.c
sql/server/rel_updates.c
sql/storage/store.c
sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out
sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows
sql/test/BugTracker-2009/Tests/use_order_column_first.SF-2686008.stable.out
sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
sql/test/BugTracker-2010/Tests/ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606.stable.out
sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.sql
sql/test/BugTracker-2011/Tests/count-count-distinct.Bug-2808.sql
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128
sql/test/BugTracker-2012/Tests/aggregate_vs_positional_column_crash.Bug-3085.sql
sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.sql
sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
sql/test/BugTracker-2013/Tests/qualified_aggrname.Bug-3332.sql
sql/test/BugTracker-2013/Tests/qualified_aggrname.Bug-3332.stable.out
sql/test/BugTracker-2013/Tests/rangejoin_optimizer.Bug-3411.stable.out
sql/test/BugTracker-2013/Tests/swapped_likejoin.Bug-3375.sql
sql/test/BugTracker-2013/Tests/swapped_likejoin.Bug-3375.stable.out
sql/test/BugTracker-2014/Tests/select-having.Bug-3458.sql
sql/test/BugTracker-2015/Tests/cardinality.Bug-3761.sql
sql/test/BugTracker-2015/Tests/cardinality.Bug-3761.stable.out
sql/test/BugTracker-2015/Tests/crash.Bug-3736.stable.out
sql/test/BugTracker-2015/Tests/large_join.Bug-3809.stable.out
sql/test/BugTracker-2015/Tests/quantile_function_resolution.Bug-3773.stable.out
sql/test/BugTracker-2015/Tests/schema_view.Bug-3708.stable.out
sql/test/BugTracker-2016/Tests/memory-consumption-query-PLAN-25joins.Bug-3972.stable.out
sql/test/BugTracker-2016/Tests/merge_project.Bug-3955.stable.out
sql/test/BugTracker-2017/Tests/All
sql/test/BugTracker-2017/Tests/nestedoperators.Bug-6292.stable.err
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/Tests/copy-into-fwf.sql.in
sql/test/Tests/order_by_complex_exp.stable.out
sql/test/bugs/Tests/crash_order_by.sql
sql/test/bugs/Tests/simple_view.sql
sql/test/bugs/insert_delete-bug-sf-904025.sql
sql/test/leaks/Tests/check1.stable.out.int128
sql/test/mergetables/Tests/part-elim.stable.out
sql/test/pg_regress/Tests/alter_table.stable.err
sql/test/pg_regress/Tests/insert.stable.err
sql/test/sys-schema/Tests/check_AlternateKey_uniqueness.sql
sql/test/sys-schema/Tests/check_AlternateKey_uniqueness.stable.out
tools/merovingian/utils/control.c
vertoo.data
Branch: exanest
Log Message:
Merge with Dec2016
diffs (truncated from 6176 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -670,3 +670,5 @@ c57454c6c6f6e77fbbdf70de32a7cc845b67d1dd
05f4e62bc67911a25f19be7fe742009ab1ee41c7 Dec2016_21
c57454c6c6f6e77fbbdf70de32a7cc845b67d1dd Dec2016_SP4_release
05f4e62bc67911a25f19be7fe742009ab1ee41c7 Dec2016_SP4_release
+8b3d3f7c487cb6e34dab1167797a61862cba2124 Dec2016_23
+8b3d3f7c487cb6e34dab1167797a61862cba2124 Dec2016_SP5_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.25.23
+%define version 11.25.24
%{!?buildno: %global buildno %(date +%Y%m%d)}
# groups of related archs
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
@@ -574,7 +574,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.25.23"
+ "ProductVersion" = "8:11.25.24"
"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
@@ -439,7 +439,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.25.23"
+ "ProductVersion" = "8:11.25.24"
"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
@@ -4322,7 +4322,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.25.23"
+ "ProductVersion" = "8:11.25.24"
"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
@@ -574,7 +574,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.25.23"
+ "ProductVersion" = "8:11.25.24"
"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
@@ -439,7 +439,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.25.23"
+ "ProductVersion" = "8:11.25.24"
"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
@@ -4322,7 +4322,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.25.23"
+ "ProductVersion" = "8:11.25.24"
"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
@@ -754,7 +754,7 @@
#define MONETDB5_PASSWDHASH_TOKEN SHA512
/* Release name or "unreleased" */
-#define MONETDB_RELEASE "Dec2016-SP5"
+#define MONETDB_RELEASE "unreleased"
/* Suffix for C++ files */
#define MX_CXX_SUFFIX "cxx"
@@ -772,13 +772,13 @@
#define PACKAGE_NAME "MonetDB"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "MonetDB 11.25.23"
+#define PACKAGE_STRING "MonetDB 11.25.24"
/* 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.25.23"
+#define PACKAGE_VERSION "11.25.24"
/* 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
@@ -6,7 +6,7 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2017 MonetDB B.V.
-VERSION=11.25.23
+VERSION=11.25.24
# ^^^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
diff --git a/clients/ChangeLog.Dec2016 b/clients/ChangeLog.Dec2016
--- a/clients/ChangeLog.Dec2016
+++ b/clients/ChangeLog.Dec2016
@@ -1,3 +1,7 @@
# ChangeLog file for clients
# This file is updated with Maddlog
+* Mon Jun 12 2017 Sjoerd Mullender <sjo...@acm.org>
+- A bug was fixed in the implementation of the functions SQLTables in
+ the ODBC driver where not enough memory was allocated.
+
diff --git a/clients/mapilib/mapi.rc b/clients/mapilib/mapi.rc
--- a/clients/mapilib/mapi.rc
+++ b/clients/mapilib/mapi.rc
@@ -3,8 +3,8 @@
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
1 VERSIONINFO
- FILEVERSION 11,25,23,1
- PRODUCTVERSION 11,25,23,1
+ FILEVERSION 11,25,24,1
+ PRODUCTVERSION 11,25,24,1
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -18,7 +18,7 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB Application Interface DLL\0"
- VALUE "FileVersion", "11.25.23\0"
+ VALUE "FileVersion", "11.25.24\0"
// ^^^^^^^^
// Maintained via vertoo. Please don't modify by hand!
// Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
@@ -28,7 +28,7 @@ BEGIN
VALUE "OriginalFilename", "Mapi.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB Client Libraries\0"
- VALUE "ProductVersion", "11.25.23\0"
+ VALUE "ProductVersion", "11.25.24\0"
// ^^^^^^^^
// Maintained via vertoo. Please don't modify by hand!
// Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
diff --git a/clients/odbc/driver/SQLTables.c b/clients/odbc/driver/SQLTables.c
--- a/clients/odbc/driver/SQLTables.c
+++ b/clients/odbc/driver/SQLTables.c
@@ -224,7 +224,7 @@ MNDBTables(ODBCStmt *stmt,
}
/* construct the query now */
- query = (char *) malloc(1200 + (cat ? strlen(cat) : 0) + (sch ?
strlen(sch) : 0) + (tab ? strlen(tab) : 0) + ((NameLength4 + 1) / 5) * 67);
+ query = (char *) malloc(2000 + (cat ? strlen(cat) : 0) + (sch ?
strlen(sch) : 0) + (tab ? strlen(tab) : 0) + ((NameLength4 + 1) / 5) * 67);
if (query == NULL)
goto nomem;
query_end = query;
@@ -295,7 +295,7 @@ MNDBTables(ODBCStmt *stmt,
"sys.env() e "
"where s.id = t.schema_id and "
"e.name = 'gdk_dbname'");
- assert(strlen(query) < 1100);
+ assert(strlen(query) < 1900);
query_end += strlen(query_end);
/* dependent on the input parameter values we must add a
diff --git a/clients/odbc/driver/driver.rc b/clients/odbc/driver/driver.rc
--- a/clients/odbc/driver/driver.rc
+++ b/clients/odbc/driver/driver.rc
@@ -3,8 +3,8 @@
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
1 VERSIONINFO
- FILEVERSION 11,25,23,1
- PRODUCTVERSION 11,25,23,1
+ FILEVERSION 11,25,24,1
+ PRODUCTVERSION 11,25,24,1
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -18,7 +18,7 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB ODBC Driver DLL\0"
- VALUE "FileVersion", "11.25.23\0"
+ VALUE "FileVersion", "11.25.24\0"
// ^^^^^^^^
// Maintained via vertoo. Please don't modify by hand!
// Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
@@ -28,7 +28,7 @@ BEGIN
VALUE "OriginalFilename", "libMonetODBC.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB SQL Server\0"
- VALUE "ProductVersion", "11.25.23\0"
+ VALUE "ProductVersion", "11.25.24\0"
// ^^^^^^^^
// Maintained via vertoo. Please don't modify by hand!
// Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
diff --git a/clients/odbc/winsetup/setup.rc b/clients/odbc/winsetup/setup.rc
--- a/clients/odbc/winsetup/setup.rc
+++ b/clients/odbc/winsetup/setup.rc
@@ -62,8 +62,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 11,25,23,1
- PRODUCTVERSION 11,25,23,1
+ FILEVERSION 11,25,24,1
+ PRODUCTVERSION 11,25,24,1
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -80,12 +80,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "MonetDB B.V."
VALUE "FileDescription", "MonetDB ODBC Setup DLL"
- VALUE "FileVersion", "11.25.23"
+ VALUE "FileVersion", "11.25.24"
VALUE "InternalName", "libMonetODBCs.dll"
VALUE "LegalCopyright", "Copyright © MonetDB B.V. 2008-2017"
VALUE "OriginalFilename", "libMonetODBCs.dll"
VALUE "ProductName", "MonetDB SQL Server"
- VALUE "ProductVersion", "11.25.23"
+ VALUE "ProductVersion", "11.25.24"
END
END
BLOCK "VarFileInfo"
diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -4712,11 +4712,11 @@ typedef struct {
char filler;
// state
size_t line_len;
- char* in_buf;
- char* out_buf;
+ char *in_buf;
+ char *out_buf;
size_t out_buf_start;
size_t out_buf_remaining;
- char* nl_buf;
+ char nl_buf[1];
} stream_fwf_data;
@@ -4726,10 +4726,11 @@ stream_fwf_read(stream *s, void *buf, si
stream_fwf_data *fsd;
size_t to_write = cnt;
size_t buf_written = 0;
- if (strcmp(s->name, STREAM_FWF_NAME) != 0 || elmsize != 1) {
+
+ fsd = (stream_fwf_data*) s->stream_data.p;
+ if (fsd == NULL || elmsize != 1) {
return -1;
}
- fsd = (stream_fwf_data*) s->stream_data.p;
while (to_write > 0) {
// input conversion
@@ -4767,12 +4768,12 @@ stream_fwf_read(stream *s, void *buf, si
// now we know something is in output_buf so deliver it
if (fsd->out_buf_remaining <= to_write) {
- memcpy((char*)buf + buf_written, fsd->out_buf +
fsd->out_buf_start, fsd->out_buf_remaining);
+ memcpy((char *) buf + buf_written, fsd->out_buf +
fsd->out_buf_start, fsd->out_buf_remaining);
to_write -= fsd->out_buf_remaining;
buf_written += fsd->out_buf_remaining;
fsd->out_buf_remaining = 0;
} else {
- memcpy((char*) buf + buf_written, fsd->out_buf +
fsd->out_buf_start, to_write);
+ memcpy((char *) buf + buf_written, fsd->out_buf +
fsd->out_buf_start, to_write);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
