Changeset: 26b0ccb742a0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=26b0ccb742a0
Modified Files:
clients/mapiclient/mclient.c
sql/backends/monet5/sql_gencode.c
sql/test/BugTracker-2015/Tests/cardinality.Bug-3761.sql
sql/test/BugTracker-2015/Tests/cardinality.Bug-3761.stable.out
sql/test/leaks/Tests/check0.stable.out
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/drop3.stable.out
sql/test/leaks/Tests/select1.stable.out
sql/test/leaks/Tests/select2.stable.out
sql/test/leaks/Tests/temp1.stable.out
sql/test/leaks/Tests/temp2.stable.out
sql/test/leaks/Tests/temp3.stable.out
Branch: default
Log Message:
Merge with Jul2015 branch.
diffs (196 lines):
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
@@ -820,8 +820,7 @@ static int
static int
dump_2(backend *sql, MalBlkPtr mb, stmt *s, char *mod, char *name)
{
- int o1 = _dumpstmt(sql, mb, s->op1);
- int o2 = _dumpstmt(sql, mb, s->op2);
+ int o1, o2;
if ((o1 = _dumpstmt(sql, mb, s->op1)) < 0)
return -1;
diff --git a/sql/test/BugTracker-2015/Tests/cardinality.Bug-3761.sql
b/sql/test/BugTracker-2015/Tests/cardinality.Bug-3761.sql
--- a/sql/test/BugTracker-2015/Tests/cardinality.Bug-3761.sql
+++ b/sql/test/BugTracker-2015/Tests/cardinality.Bug-3761.sql
@@ -77,8 +77,8 @@ 2106 "tmp" 2 3 true
6821 "json" 3 3 true
7176 "bam" 3 3 true
-SELECT NULL AS table_catalog, (SELECT s.name FROM schms s WHERE t.schema_id =
s.id) AS table_schema FROM tbls t;
-SELECT (SELECT s.name FROM schms s WHERE t.schema_id = s.id) AS table_schema,
NULL AS table_catalog FROM tbls t;
+SELECT NULL AS table_catalog, (SELECT s.name FROM schms s WHERE t.schema_id =
s.id) AS table_schema FROM tbls t ORDER BY table_schema;
+SELECT (SELECT s.name FROM schms s WHERE t.schema_id = s.id) AS table_schema,
NULL AS table_catalog FROM tbls t ORDER BY table_schema;
DROP TABLE schms;
DROP TABLE tbls;
diff --git a/sql/test/BugTracker-2015/Tests/cardinality.Bug-3761.stable.out
b/sql/test/BugTracker-2015/Tests/cardinality.Bug-3761.stable.out
--- a/sql/test/BugTracker-2015/Tests/cardinality.Bug-3761.stable.out
+++ b/sql/test/BugTracker-2015/Tests/cardinality.Bug-3761.stable.out
@@ -74,6 +74,41 @@ Ready.
% table_catalog, table_schema # name
% char, varchar # type
% 0, 3 # length
+[ NULL, "bam" ]
+[ NULL, "bam" ]
+[ NULL, "bam" ]
+[ NULL, "bam" ]
+[ NULL, "bam" ]
+[ NULL, "sys" ]
+[ NULL, "sys" ]
+[ NULL, "sys" ]
+[ NULL, "sys" ]
+[ NULL, "sys" ]
+[ NULL, "sys" ]
+[ NULL, "sys" ]
+[ NULL, "sys" ]
+[ NULL, "sys" ]
+[ NULL, "sys" ]
+[ NULL, "sys" ]
+[ NULL, "sys" ]
+[ NULL, "sys" ]
+[ NULL, "sys" ]
+[ NULL, "sys" ]
+[ NULL, "sys" ]
+[ NULL, "sys" ]
+[ NULL, "sys" ]
+[ NULL, "sys" ]
+[ NULL, "sys" ]
+[ NULL, "sys" ]
+[ NULL, "sys" ]
+[ NULL, "sys" ]
+[ NULL, "sys" ]
+[ NULL, "sys" ]
+[ NULL, "sys" ]
+[ NULL, "sys" ]
+[ NULL, "sys" ]
+[ NULL, "sys" ]
+[ NULL, "sys" ]
[ NULL, "sys" ]
[ NULL, "sys" ]
[ NULL, "sys" ]
@@ -93,46 +128,46 @@ Ready.
[ NULL, "tmp" ]
[ NULL, "tmp" ]
[ NULL, "tmp" ]
-[ NULL, "sys" ]
-[ NULL, "sys" ]
-[ NULL, "sys" ]
-[ NULL, "sys" ]
-[ NULL, "sys" ]
-[ NULL, "sys" ]
-[ NULL, "sys" ]
-[ NULL, "sys" ]
-[ NULL, "sys" ]
-[ NULL, "sys" ]
-[ NULL, "sys" ]
-[ NULL, "sys" ]
-[ NULL, "sys" ]
-[ NULL, "sys" ]
-[ NULL, "sys" ]
-[ NULL, "sys" ]
-[ NULL, "sys" ]
-[ NULL, "sys" ]
-[ NULL, "sys" ]
-[ NULL, "sys" ]
-[ NULL, "sys" ]
-[ NULL, "sys" ]
-[ NULL, "sys" ]
-[ NULL, "sys" ]
-[ NULL, "sys" ]
-[ NULL, "sys" ]
-[ NULL, "sys" ]
-[ NULL, "sys" ]
-[ NULL, "sys" ]
-[ NULL, "bam" ]
-[ NULL, "bam" ]
-[ NULL, "bam" ]
-[ NULL, "bam" ]
-[ NULL, "bam" ]
-[ NULL, "sys" ]
#SELECT (SELECT s.name FROM schms s WHERE t.schema_id = s.id) AS table_schema,
NULL AS table_catalog FROM tbls t;
% .L1, .L1 # table_name
% table_schema, table_catalog # name
% varchar, char # type
% 3, 0 # length
+[ "bam", NULL ]
+[ "bam", NULL ]
+[ "bam", NULL ]
+[ "bam", NULL ]
+[ "bam", NULL ]
+[ "sys", NULL ]
+[ "sys", NULL ]
+[ "sys", NULL ]
+[ "sys", NULL ]
+[ "sys", NULL ]
+[ "sys", NULL ]
+[ "sys", NULL ]
+[ "sys", NULL ]
+[ "sys", NULL ]
+[ "sys", NULL ]
+[ "sys", NULL ]
+[ "sys", NULL ]
+[ "sys", NULL ]
+[ "sys", NULL ]
+[ "sys", NULL ]
+[ "sys", NULL ]
+[ "sys", NULL ]
+[ "sys", NULL ]
+[ "sys", NULL ]
+[ "sys", NULL ]
+[ "sys", NULL ]
+[ "sys", NULL ]
+[ "sys", NULL ]
+[ "sys", NULL ]
+[ "sys", NULL ]
+[ "sys", NULL ]
+[ "sys", NULL ]
+[ "sys", NULL ]
+[ "sys", NULL ]
+[ "sys", NULL ]
[ "sys", NULL ]
[ "sys", NULL ]
[ "sys", NULL ]
@@ -152,41 +187,6 @@ Ready.
[ "tmp", NULL ]
[ "tmp", NULL ]
[ "tmp", NULL ]
-[ "sys", NULL ]
-[ "sys", NULL ]
-[ "sys", NULL ]
-[ "sys", NULL ]
-[ "sys", NULL ]
-[ "sys", NULL ]
-[ "sys", NULL ]
-[ "sys", NULL ]
-[ "sys", NULL ]
-[ "sys", NULL ]
-[ "sys", NULL ]
-[ "sys", NULL ]
-[ "sys", NULL ]
-[ "sys", NULL ]
-[ "sys", NULL ]
-[ "sys", NULL ]
-[ "sys", NULL ]
-[ "sys", NULL ]
-[ "sys", NULL ]
-[ "sys", NULL ]
-[ "sys", NULL ]
-[ "sys", NULL ]
-[ "sys", NULL ]
-[ "sys", NULL ]
-[ "sys", NULL ]
-[ "sys", NULL ]
-[ "sys", NULL ]
-[ "sys", NULL ]
-[ "sys", NULL ]
-[ "bam", NULL ]
-[ "bam", NULL ]
-[ "bam", NULL ]
-[ "bam", NULL ]
-[ "bam", NULL ]
-[ "sys", NULL ]
# 16:23:57 >
# 16:23:57 > "Done."
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
