MonetDB: default - Protect against NULL pointer.
Changeset: 9f8602e8c51d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9f8602e8c51d
Modified Files:
monetdb5/optimizer/opt_projectionpath.c
Branch: default
Log Message:
Protect against NULL pointer.
diffs (16 lines):
diff --git a/monetdb5/optimizer/opt_projectionpath.c
b/monetdb5/optimizer/opt_projectionpath.c
--- a/monetdb5/optimizer/opt_projectionpath.c
+++ b/monetdb5/optimizer/opt_projectionpath.c
@@ -236,8 +236,10 @@ OPTprojectionpathImplementation(Client c
/* inject the complete sub-path */
#ifdef DEBUG_OPT_PROJECTIONPATH
- fprintf(stderr,"#inject ");
- fprintInstruction(stderr,mb, 0, r,
LIST_MAL_ALL);
+ if (r) {
+ fprintf(stderr,"#inject ");
+ fprintInstruction(stderr,mb, 0, r,
LIST_MAL_ALL);
+ }
#endif
if ( getFunctionId(p) == projectionRef){
if( r && getModuleId(r)== algebraRef
&& ( getFunctionId(r)== projectionRef || getFunctionId(r)== projectionpathRef)
){
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: candidate-type - Merge with default branch.
Changeset: ab2cb6fb036d for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ab2cb6fb036d Added Files: clients/R/Tests/deps-install.timeout gdk/xoshiro256starstar.h sql/jdbc/tests/Tests/SQLcopyinto.SQL.bat sql/jdbc/tests/Tests/SQLcopyinto.SQL.sh sql/jdbc/tests/Tests/SQLcopyinto.stable.err sql/jdbc/tests/Tests/SQLcopyinto.stable.out sql/test/BugTracker-2018/Tests/convert-key.Bug-6648.sql sql/test/BugTracker-2018/Tests/convert-key.Bug-6648.stable.err sql/test/BugTracker-2018/Tests/convert-key.Bug-6648.stable.out sql/test/BugTracker-2018/Tests/in-subquery-having-Bug-6651.sql sql/test/BugTracker-2018/Tests/in-subquery-having-Bug-6651.stable.err sql/test/BugTracker-2018/Tests/in-subquery-having-Bug-6651.stable.out sql/test/BugTracker-2018/Tests/prepared-statement-with-udf.Bug-6650.sql sql/test/BugTracker-2018/Tests/timestamp-as-boolean.Bug-6642.sql sql/test/BugTracker-2018/Tests/timestamp-as-boolean.Bug-6642.stable.err sql/test/BugTracker-2018/Tests/timestamp-as-boolean.Bug-6642.stable.out sql/test/BugTracker-2018/Tests/timestamp-roundtrip.Bug-6640.sql sql/test/BugTracker-2018/Tests/timestamp-roundtrip.Bug-6640.stable.err sql/test/BugTracker-2018/Tests/timestamp-roundtrip.Bug-6640.stable.out sql/test/BugTracker-2018/Tests/update-transaction-select.Bug-6649.sql sql/test/BugTracker-2018/Tests/update-transaction-select.Bug-6649.stable.err sql/test/BugTracker-2018/Tests/update-transaction-select.Bug-6649.stable.out sql/test/sample/Tests/All sql/test/sample/Tests/sample.1.sql sql/test/sample/Tests/sample.1.stable.err sql/test/sample/Tests/sample.1.stable.out sql/test/sample/Tests/sample.10.sql sql/test/sample/Tests/sample.10.stable.err sql/test/sample/Tests/sample.10.stable.out sql/test/sample/Tests/sample.11.sql sql/test/sample/Tests/sample.11.stable.err sql/test/sample/Tests/sample.11.stable.out sql/test/sample/Tests/sample.12.sql sql/test/sample/Tests/sample.12.stable.err sql/test/sample/Tests/sample.12.stable.out sql/test/sample/Tests/sample.13.sql sql/test/sample/Tests/sample.13.stable.err sql/test/sample/Tests/sample.13.stable.out sql/test/sample/Tests/sample.14.sql sql/test/sample/Tests/sample.14.stable.err sql/test/sample/Tests/sample.14.stable.out sql/test/sample/Tests/sample.15.sql sql/test/sample/Tests/sample.15.stable.err sql/test/sample/Tests/sample.15.stable.out sql/test/sample/Tests/sample.2.sql sql/test/sample/Tests/sample.2.stable.err sql/test/sample/Tests/sample.2.stable.out sql/test/sample/Tests/sample.3.sql sql/test/sample/Tests/sample.3.stable.err sql/test/sample/Tests/sample.3.stable.out sql/test/sample/Tests/sample.4.sql sql/test/sample/Tests/sample.4.stable.err sql/test/sample/Tests/sample.4.stable.out sql/test/sample/Tests/sample.5.sql sql/test/sample/Tests/sample.5.stable.err sql/test/sample/Tests/sample.5.stable.out sql/test/sample/Tests/sample.6.sql sql/test/sample/Tests/sample.6.stable.err sql/test/sample/Tests/sample.6.stable.out sql/test/sample/Tests/sample.7.sql sql/test/sample/Tests/sample.7.stable.err sql/test/sample/Tests/sample.7.stable.out sql/test/sample/Tests/sample.8.sql sql/test/sample/Tests/sample.8.stable.err sql/test/sample/Tests/sample.8.stable.out sql/test/sample/Tests/sample.9.sql sql/test/sample/Tests/sample.9.stable.err sql/test/sample/Tests/sample.9.stable.out Removed Files: buildtools/autogen/setup.py Modified Files: .hgtags ChangeLog-Archive ChangeLog.Aug2018 MonetDB.spec NT/monetdb_config.h.in NT/rules.msc buildtools/ChangeLog-Archive buildtools/ChangeLog.Aug2018 buildtools/autogen/autogen/msc.py buildtools/doc/windowsbuild.rst clients/ChangeLog clients/R/Tests/dbapply.R clients/R/Tests/deps-install.R clients/R/Tests/deps-test.R clients/R/Tests/deps-test.timeout clients/R/Tests/dplyr-flights.R clients/R/Tests/dplyr-flights.stable.err clients/R/Tests/install.R clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out clients/examples/C/sample0.c clients/examples/C/sample1.c clients/examples/C/sample4.c clients/examples/C/smack00.c clients/examples/C/smack01.c clients/mapiclient/ReadlineTools.c clients/mapiclient/dump.c clients/mapiclient/eventparser.c clients/mapiclient/mclient.c
MonetDB: default - Typo.
Changeset: 1bc4eacae396 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1bc4eacae396 Modified Files: sql/test/BugTracker-2018/Tests/remote-table-where-is-null.Bug-6601.py Branch: default Log Message: Typo. diffs (12 lines): diff --git a/sql/test/BugTracker-2018/Tests/remote-table-where-is-null.Bug-6601.py b/sql/test/BugTracker-2018/Tests/remote-table-where-is-null.Bug-6601.py --- a/sql/test/BugTracker-2018/Tests/remote-table-where-is-null.Bug-6601.py +++ b/sql/test/BugTracker-2018/Tests/remote-table-where-is-null.Bug-6601.py @@ -71,7 +71,7 @@ out, err = node1_proc.communicate() sys.stdout.write(out) sys.stderr.write(err) -out, err = node1_proc.communicate() +out, err = node2_proc.communicate() sys.stdout.write(out) sys.stderr.write(err) ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: rename-sql - Approved test.
Changeset: c64feb6bbff1 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c64feb6bbff1 Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 Branch: rename-sql Log Message: Approved test. diffs (48 lines): diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -10453,10 +10453,6 @@ Ready. [ "language", "register", "pattern language.register(m:str, f:str, code:str, help:str):void ","CMDregisterFunction;", "Compile the code string to MAL and register it as a function." ] [ "language", "sink", "pattern language.sink(v:any...):void ", "MALgarbagesink;", "Variables to be considered together when triggering garbage collection.\nUsed in the dataflow blocks to avoid early release of values."] [ "language", "source", "pattern language.source(f:str):void ", "CMDevalFile;", "Merge the instructions stored in the file with the current program." ] -[ "lidar", "attach", "pattern lidar.attach(fname:str):void ", "LIDARattach;", "Open a LIDAR file and return catalog of the table HDUs" ] -[ "lidar", "export", "pattern lidar.export(tablename:str, fname:str, type:str):void ", "LIDARexportTable;","Exporta LIDAR table to a LAS/LAZ file" ] -[ "lidar", "load", "pattern lidar.load(tablename:str):void ", "LIDARloadTable;", "Load a LIDAR table from an attached file" ] -[ "lidar", "prelude", "command lidar.prelude():void ", "LIDARprelude;","" ] [ "mal", "manifold", "pattern mal.manifold(mod:str, fcn:str, a:any...):bat[:any] ", "MANIFOLDevaluate;","" ] [ "mal", "multiplex","pattern mal.multiplex(mod:str, fcn:str, a:any...):any... ","MANIFOLDremapMultiplex;", "" ] [ "manual","functions","pattern manual.functions() (mod:bat[:str], fcn:bat[:str], sig:bat[:str], adr:bat[:str], com:bat[:str]) ", "MANUALcreateOverview;","Produces a table with all MAL functions known" ] @@ -10901,9 +10897,6 @@ Ready. [ "sample","subuniform", "pattern sample.subuniform(b:bat[:any], p:dbl, sample_seed:int):bat[:oid] ","SAMPLEuniform;", "Returns the oids of a uniform sample of size = (p x count(b)), where 0 <= p <= 1.0 and where the prg is seeded with sample_seed" ] [ "sample","subuniform", "pattern sample.subuniform(b:bat[:any], sample_size:lng):bat[:oid] ", "SAMPLEuniform;", "Returns the oids of a uniform sample of size s"] [ "sample","subuniform", "pattern sample.subuniform(b:bat[:any], sample_size:lng, sample_seed:int):bat[:oid] ", "SAMPLEuniform;", "Returns the oids of a uniform sample of size s and where the prg is seeded with sample_seed" ] -[ "shp", "attach", "pattern shp.attach(filename:str):void ", "SHPattach;", "Register an ESRI Shapefile in the vault catalog" ] -[ "shp", "import", "pattern shp.import(fileid:int):void ", "SHPimport;", "Import an ESRI Shapefile with given id into the vault" ] -[ "shp", "import", "pattern shp.import(fileid:int, po:wkb):void ", "SHPpartialimport;","Partially import an ESRI Shapefile with given id into the vault" ] [ "sql", "abort","pattern sql.abort():void ","SQLabort;", "Trigger the abort operation for a MAL block" ] [ "sql", "affectedRows", "pattern sql.affectedRows(mvc:int, nr:lng):int ", "mvc_affected_rows_wrap;", "export the number of affected rows by the current query" ] [ "sql", "all", "inline function sql.all(b:bat[:any_1], gp:bat[:oid], gpe:bat[:oid], no_nil:bit):bat[:any_1];", "", "" ] diff --git a/clients/Tests/MAL-signatures.stable.out.int128 b/clients/Tests/MAL-signatures.stable.out.int128 --- a/clients/Tests/MAL-signatures.stable.out.int128 +++ b/clients/Tests/MAL-signatures.stable.out.int128 @@ -14666,10 +14666,6 @@ Ready. [ "language", "register", "pattern language.register(m:str, f:str, code:str, help:str):void ","CMDregisterFunction;", "Compile the code string to MAL and register it as a function." ] [ "language", "sink", "pattern language.sink(v:any...):void ", "MALgarbagesink;", "Variables to be considered together when triggering garbage collection.\nUsed in the dataflow blocks to avoid early release of values."] [ "language", "source", "pattern language.source(f:str):void ", "CMDevalFile;", "Merge the instructions stored in the file with the current program." ] -[ "lidar", "attach", "pattern lidar.attach(fname:str):void ", "LIDARattach;", "Open a LIDAR file and return catalog of the table HDUs" ] -[ "lidar", "export", "pattern lidar.export(tablename:str, fname:str,
MonetDB: rename-sql - Merge with default
Changeset: f02b13a3278f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f02b13a3278f
Added Files:
sql/test/BugTracker-2018/Tests/in-subquery-having-Bug-6651.sql
sql/test/BugTracker-2018/Tests/in-subquery-having-Bug-6651.stable.err
sql/test/BugTracker-2018/Tests/in-subquery-having-Bug-6651.stable.out
sql/test/BugTracker-2018/Tests/prepared-statement-with-udf.Bug-6650.sql
Modified Files:
MonetDB.spec
NT/monetdb_config.h.in
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
clients/mapiclient/mclient.c
clients/mapilib/mapi.c
clients/mapilib/mapi.h
common/stream/stream.c
configure.ag
gdk/gdk_logger.c
gdk/gdk_logger.h
gdk/gdk_qsort.c
gdk/gdk_qsort_impl.h
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
monetdb5/mal/mal_client.c
monetdb5/mal/mal_client.h
monetdb5/mal/mal_session.c
sql/ChangeLog
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql.mal
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_result.h
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_statement.h
sql/backends/monet5/vaults/bam/bam_db_interface.c
sql/benchmarks/tpch/load-sf-0.01-LOCKED.sql
sql/benchmarks/tpch/load-sf-0.01.sql
sql/benchmarks/tpch/load-sf-1.sql
sql/common/sql_list.c
sql/common/sql_types.c
sql/server/rel_optimizer.c
sql/server/rel_updates.c
sql/server/sql_parser.y
sql/server/sql_scan.c
sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out
sql/test/BugTracker-2018/Tests/All
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions.stable.out.int128
sql/test/Users/Tests/copyinto.stable.err
sql/test/Users/Tests/copyinto.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out.powerpc64.int128
testing/Mtest.py.in
testing/exportutils.py
testing/listexports.py.in
tools/mserver/monet_version.c.in
Branch: rename-sql
Log Message:
Merge with default
diffs (truncated from 4417 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -878,10 +878,10 @@ Group: Applications/Databases
%if "%{?_selinux_policy_version}" != ""
Requires: selinux-policy >= %{?_selinux_policy_version}
%endif
-Requires(post): MonetDB5-server = %{version}-%{release}
-Requires(postun): MonetDB5-server
-Requires(post): %{name}-SQL-server5 = %{version}-%{release}
-Requires(postun): %{name}-SQL-server5
+Requires(post): MonetDB5-server%{?_isa} = %{version}-%{release}
+Requires(postun): MonetDB5-server%{?_isa} = %{version}-%{release}
+Requires(post): %{name}-SQL-server5%{?_isa} = %{version}-%{release}
+Requires(postun): %{name}-SQL-server5%{?_isa} = %{version}-%{release}
Requires(post): /usr/sbin/semodule, /sbin/restorecon, /sbin/fixfiles
Requires(postun): /usr/sbin/semodule, /sbin/restorecon, /sbin/fixfiles
BuildArch: noarch
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
@@ -910,5 +910,6 @@ typedef __uint128_t uhge;
#define PROMPT1"\001\001\n"/* prompt: ready for new query
*/
#define PROMPT2"\001\002\n"/* prompt: more data needed */
+#define PROMPT3"\001\003\n"/* prompt: get file content */
#endif /* _SEEN_MONETDB_CONFIG_H */
diff --git a/clients/Tests/MAL-signatures.stable.out
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -10929,7 +10929,7 @@ Ready.
[ "sql", "bind_idxbat", "pattern sql.bind_idxbat(mvc:int, schema:str,
table:str, index:str, access:int, part_nr:int, nr_parts:int):bat[:any_1] ",
"mvc_bind_idxbat_wrap;","Bind the 'schema.table.index' BAT with
access kind:\n\t0 - base table\n\t1 - inserts\n\t2 - updates" ]
[ "sql", "clear_table", "pattern sql.clear_table(sname:str,
tname:str):lng ", "mvc_clear_table_wrap;","Clear the table
sname.tname." ]
[ "sql", "commit", "pattern sql.commit():void ", "SQLcommit;",
"Trigger the commit operation for a MAL block" ]
-[ "sql", "copy_from","pattern
MonetDB: analytics - Added missing SQL function prototypes, clea...
Changeset: 6a76eda3f5d1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6a76eda3f5d1
Modified Files:
clients/mapiclient/mhelp.c
gdk/gdk_analytic_func.c
sql/backends/monet5/sql_rank.c
sql/common/sql_types.c
sql/server/rel_select.c
Branch: analytics
Log Message:
Added missing SQL function prototypes, cleaned bounds type checking and
compilation fixes.
diffs (truncated from 336 to 300 lines):
diff --git a/clients/mapiclient/mhelp.c b/clients/mapiclient/mhelp.c
--- a/clients/mapiclient/mhelp.c
+++ b/clients/mapiclient/mhelp.c
@@ -788,7 +788,7 @@ SQLhelp sqlhelp[] = {
NULL},
{"window_aggregate_function",
NULL,
-"{ AVG '(' query_expression ')' | COUNT '(' [ '*' | query_expression ]
')' | MAX '(' query_expression ')'\n"
+"{ AVG '(' query_expression ')' | COUNT '(' { '*' | query_expression }
')' | MAX '(' query_expression ')'\n"
"| MIN '(' query_expression ')' | PROD '(' query_expression ')' | SUM
'(' query_expression ')' }",
"query_expression",
NULL},
@@ -818,7 +818,7 @@ SQLhelp sqlhelp[] = {
NULL},
{"window_specification",
NULL,
-"[ PARTITION BY column_ref ... ]\n"
+"[ PARTITION BY column_ref [ ',' ... ] ]\n"
"[ ORDER BY sort_spec ]\n"
"[ { ROWS | RANGE | GROUPS } { window_frame_start | BETWEEN
window_bound AND window_bound }\n"
" [ EXCLUDING { CURRENT ROW | GROUP | TIES | NO OTHERS } ] ]",
diff --git a/gdk/gdk_analytic_func.c b/gdk/gdk_analytic_func.c
--- a/gdk/gdk_analytic_func.c
+++ b/gdk/gdk_analytic_func.c
@@ -258,7 +258,7 @@ GDKanalyticalfirst(BAT *r, BAT *b, BAT *
void *curval;
for(; i start[i]) ? BUNtail(bpi,
start[i]) : (void*) nil;
+ curval = (end[i] > start[i]) ? BUNtail(bpi,
(BUN)start[i]) : (void*) nil;
if (BUNappend(r, curval, false) != GDK_SUCCEED)
goto allocation_error;
if (atomcmp(curval, nil) == 0)
@@ -335,7 +335,7 @@ GDKanalyticallast(BAT *r, BAT *b, BAT *s
void *curval;
for(; i start[i]) ? BUNtail(bpi,
end[i] - 1) : (void*) nil;
+ curval = (end[i] > start[i]) ? BUNtail(bpi,
(BUN)(end[i] - 1)) : (void*) nil;
if (BUNappend(r, curval, false) != GDK_SUCCEED)
goto allocation_error;
if (atomcmp(curval, nil) == 0)
diff --git a/sql/backends/monet5/sql_rank.c b/sql/backends/monet5/sql_rank.c
--- a/sql/backends/monet5/sql_rank.c
+++ b/sql/backends/monet5/sql_rank.c
@@ -104,19 +104,6 @@ doSQLwindowbound(Client cntxt, MalBlkPtr
is_a_bat = isaBatType(tpe);
if(is_a_bat)
tpe = getBatType(tpe);
- if((unit == FRAME_ROWS || unit == FRAME_GROUPS) && (tpe ==
TYPE_flt || tpe == TYPE_dbl)) {
- BBPunfix(b->batCacheid);
- throw(SQL, mod, SQLSTATE(42000) "Values on %s boundary
on %s frame can't be a floating-point type",
- preceding ? "PRECEDING" : "FOLLOWING", (unit
== FRAME_ROWS) ? "rows":"groups");
- } else if(unit == FRAME_RANGE && (tpe == TYPE_flt || tpe ==
TYPE_dbl) && (tp1 != TYPE_flt && tp1 != TYPE_dbl)) {
- BBPunfix(b->batCacheid);
- throw(SQL, mod, SQLSTATE(42000) "Values in the input
column aren't floating-point while on %s boundary are",
- preceding ? "PRECEDING" : "FOLLOWING");
- } else if(unit == FRAME_RANGE && (tp1 == TYPE_flt || tp1 ==
TYPE_dbl) && (tpe != TYPE_flt && tpe != TYPE_dbl)) {
- BBPunfix(b->batCacheid);
- throw(SQL, mod, SQLSTATE(42000) "Values on %s boundary
aren't floating-point while on input column are",
- preceding ? "PRECEDING" : "FOLLOWING");
- }
voidresultBAT(r, TYPE_lng, BATcount(b), b, mod);
if(is_a_bat) {
diff --git a/sql/common/sql_types.c b/sql/common/sql_types.c
--- a/sql/common/sql_types.c
+++ b/sql/common/sql_types.c
@@ -1656,6 +1656,31 @@ sqltypeinit( sql_allocator *sa)
sql_create_analytic5(sa, "window_preceding_bound", "sql",
"window_preceding_bound", ANY, INT, INT, LNG, DBL, LNG, SCALE_NONE);
sql_create_analytic6(sa, "window_preceding_bound", "sql",
"window_preceding_bound", BIT, ANY, INT, INT, LNG, DBL, LNG, SCALE_NONE);
+ t = decimals; /* BTE */
+ sql_create_analytic5(sa, "window_preceding_bound", "sql",
"window_preceding_bound", ANY, INT, INT, LNG, *(t), LNG, SCALE_NONE);
+ sql_create_analytic6(sa, "window_preceding_bound", "sql",
"window_preceding_bound", BIT, ANY, INT, INT, LNG,
MonetDB: default - Plug some holes.
Changeset: 13ad2af15cd3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=13ad2af15cd3
Modified Files:
sql/backends/monet5/sql.c
Branch: default
Log Message:
Plug some holes.
diffs (27 lines):
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -2773,6 +2773,7 @@ mvc_import_table_wrap(Client cntxt, MalB
GDKfree(fn);
return msg;
}
+ GDKfree(fn);
}
if (fixed_widths && strcmp(fixed_widths, str_nil) != 0) {
@@ -3053,6 +3054,7 @@ mvc_bin_import_table_wrap(Client cntxt,
/* this code should be extended to
* deal with larger text strings. */
FILE *f = fopen(fn, "r");
+ GDKfree(fn);
if (f == NULL) {
BBPreclaim(c);
msg = createException(SQL, "sql",
SQLSTATE(42000) "Failed to re-open file %s", fname);
@@ -3083,6 +3085,7 @@ mvc_bin_import_table_wrap(Client cntxt,
GDKfree(buf);
} else {
c = BATattach(tpe, fn, TRANSIENT);
+ GDKfree(fn);
}
if (c == NULL) {
msg = createException(SQL, "sql",
SQLSTATE(42000) "Failed to attach file %s", fname);
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Aug2018 - Typo in changelog.
Changeset: aa9a78629261 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=aa9a78629261 Modified Files: MonetDB.spec buildtools/ChangeLog-Archive debian/changelog Branch: Aug2018 Log Message: Typo in changelog. diffs (36 lines): diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -1039,7 +1039,7 @@ done * Wed Oct 3 2018 Sjoerd Mullender - 11.31.9-20181005 - buildtools: On Ubuntu 18.10 (Cosmic Cuttlefish), the libmonetdb5-server-bam package cannot be built because of an incompatibility in the libbam library - (it cannot be used in a shared object. + (it cannot be used in a shared object). * Wed Aug 29 2018 Sjoerd Mullender - 11.31.7-20180829 - Rebuilt. diff --git a/buildtools/ChangeLog-Archive b/buildtools/ChangeLog-Archive --- a/buildtools/ChangeLog-Archive +++ b/buildtools/ChangeLog-Archive @@ -4,7 +4,7 @@ * Wed Oct 3 2018 Sjoerd Mullender - 11.31.9-20181005 - On Ubuntu 18.10 (Cosmic Cuttlefish), the libmonetdb5-server-bam package cannot be built because of an incompatibility in the libbam library - (it cannot be used in a shared object. + (it cannot be used in a shared object). * Tue Aug 28 2018 Sjoerd Mullender - 11.31.5-20180829 - Build the MonetDB-cfitsio RPM and libmonetdb5-server-cfitsio diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -26,7 +26,7 @@ monetdb (11.31.9) unstable; urgency=low * buildtools: On Ubuntu 18.10 (Cosmic Cuttlefish), the libmonetdb5-server-bam package cannot be built because of an incompatibility in the libbam library -(it cannot be used in a shared object. +(it cannot be used in a shared object). -- Sjoerd Mullender Wed, 3 Oct 2018 09:50:02 +0200 ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
