Changeset: ba969ac4d66b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ba969ac4d66b
Modified Files:
sql/backends/monet5/sql.c
sql/backends/monet5/sql_gencode.c
sql/common/sql_types.c
sql/scripts/17_temporal.sql
sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
Branch: notepad
Log Message:
Merge from default branch.
diffs (96 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
@@ -2779,7 +2779,7 @@ mvc_import_table_wrap(Client cntxt, MalB
BAT **b = NULL;
unsigned char *tsep = NULL, *rsep = NULL, *ssep = NULL, *ns = NULL;
ssize_t len = 0;
- str filename, cs;
+ str filename = NULL, cs;
sql_table *t = *(sql_table **) getArgReference(stk, pci, pci->retc + 0);
unsigned char **T = (unsigned char **) getArgReference_str(stk, pci,
pci->retc + 1);
unsigned char **R = (unsigned char **) getArgReference_str(stk, pci,
pci->retc + 2);
diff --git a/sql/backends/monet5/sql_gencode.c
b/sql/backends/monet5/sql_gencode.c
--- a/sql/backends/monet5/sql_gencode.c
+++ b/sql/backends/monet5/sql_gencode.c
@@ -26,7 +26,6 @@
* reduce the cost to prepare MAL statements significantly.
*
* A dummy module is needed to load properly.
- * @-
*/
#include "monetdb_config.h"
#include "sql_gencode.h"
@@ -58,7 +57,7 @@ static int backend_dumpstmt(backend *be,
*
* The catalog relations should be maintained in a MAL box, which
* provides the handle for transaction management.
- * @-
+ *
* The atoms produced by the parser should be converted back into
* MAL constants. Ideally, this should not be necessary when the
* SQL parser keeps the string representation around.
@@ -109,7 +108,6 @@ argumentZero(MalBlkPtr mb, int tpe)
}
/*
- * @-
* To speedup code generation we freeze the references to the major modules.
* This safes table lookups.
*/
@@ -128,7 +126,6 @@ initSQLreferences(void)
}
/*
- * @-
* The dump_header produces a sequence of instructions for
* the front-end to prepare presentation of a result table.
*/
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
@@ -1618,7 +1618,7 @@ sqltypeinit( sql_allocator *sa)
sres, FALSE, F_FUNC, SCALE_FIX);
}
sres = create_arg(sa, NULL, sql_create_subtype(sa, TABLE, 0, 0),
ARG_OUT);
- /* copyfrom fname (arg 6) */
+ /* copyfrom fname (arg 8) */
f=sql_create_func_(sa, "copyfrom", "sql", "copy_from",
list_append( list_append( list_append( list_append(list_append
(list_append (list_append(list_append(sa_list(sa),
create_arg(sa, NULL, sql_create_subtype(sa, STR, 0, 0),
ARG_IN)),
diff --git a/sql/scripts/17_temporal.sql b/sql/scripts/17_temporal.sql
--- a/sql/scripts/17_temporal.sql
+++ b/sql/scripts/17_temporal.sql
@@ -6,7 +6,7 @@
-- assume milliseconds when converted to TIMESTAMP
create function "epoch"(sec BIGINT) returns TIMESTAMP
- external name timestamp."epoch";
+ external name timestamp."epoch";
create function "epoch"(sec INT) returns TIMESTAMP
external name timestamp."epoch";
diff --git
a/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
b/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
---
a/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
+++
b/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
@@ -38,8 +38,9 @@ Ready.
% .explain # table_name
% mal # name
% clob # type
-% 94 # length
+% 113 # length
function user.s5_1{autoCommit=true}():void;
+ X_50:void := querylog.define("explain select count(*) from t2564 group by
c1, c2, c3;","sequential_pipe",28);
X_2 := sql.mvc();
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","t2564");
X_6:bat[:oid,:int] := sql.bind(X_2,"sys","t2564","c3",0);
@@ -65,8 +66,7 @@ function user.s5_1{autoCommit=true}():vo
sql.rsColumn(X_41,"sys.L1","L1","wrd",32,0,X_39);
X_48 := io.stdout();
sql.exportResult(X_48,X_41);
-end s5_1;
-# querylog.define("explain select count(*) from t2564 group by c1, c2,
c3;","sequential_pipe")
+end user.s5_1;
#select count(*) from t2564 group by c1, c2, c3;
% sys.L1 # table_name
% L1 # name
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
