Changeset: bcbc09442398 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bcbc09442398
Modified Files:
gdk/gdk_atoms.c
sql/backends/monet5/rel_bin.c
sql/jdbc/tests/Tests/Test_PSmetadata.stable.out
sql/server/rel_dump.c
sql/test/pg_regress/Tests/strings_cast.stable.err
sql/test/pg_regress/Tests/strings_cast.stable.out
Branch: default
Log Message:
Merge with Jan2014 branch.
diffs (55 lines):
diff --git a/gdk/gdk_atoms.c b/gdk/gdk_atoms.c
--- a/gdk/gdk_atoms.c
+++ b/gdk/gdk_atoms.c
@@ -1348,6 +1348,7 @@ strFromStr(const char *src, int *len, ch
if (p != NULL && (char *) p != str_nil && *len < l) {
GDKfree(p);
p = NULL;
+ *dst = NULL;
}
if (p == NULL || (char *) p == str_nil)
if ((p = GDKmalloc(*len = l)) == NULL)
diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c
--- a/sql/backends/monet5/rel_bin.c
+++ b/sql/backends/monet5/rel_bin.c
@@ -651,7 +651,8 @@ exp_bin(mvc *sql, sql_exp *e, stmt *left
}
ops = sa_list(sql->sa);
append(ops, r);
- append(ops, r2);
+ if (r2)
+ append(ops, r2);
r = stmt_list(sql->sa, ops);
s = stmt_genselect(sql->sa, l, r, e->f, sel);
if (s && is_anti(e))
diff --git a/sql/jdbc/tests/Tests/Test_PSmetadata.stable.out
b/sql/jdbc/tests/Tests/Test_PSmetadata.stable.out
--- a/sql/jdbc/tests/Tests/Test_PSmetadata.stable.out
+++ b/sql/jdbc/tests/Tests/Test_PSmetadata.stable.out
@@ -53,7 +53,7 @@ Ready.
0. false false
0. 6 columns: 6
1. mTests_sql_jdbc_tests
- classname java.lang.Integer
+ classname java.lang.Short
displaysize 8
label intnull
name intnull
diff --git a/sql/server/rel_dump.c b/sql/server/rel_dump.c
--- a/sql/server/rel_dump.c
+++ b/sql/server/rel_dump.c
@@ -323,12 +323,11 @@ rel_print_(mvc *sql, stream *fout, sql_
case op_table:
print_indent(sql, fout, depth);
mnstr_printf(fout, "table ");
- /*
- if (rel->l)
- rel_print_(sql, fout, rel->l, depth+1, refs);
- */
+
if (rel->r)
exp_print(sql, fout, rel->r, depth, 1, 0);
+ if (rel->l)
+ rel_print_(sql, fout, rel->l, 0, refs);
if (rel->exps)
exps_print(sql, fout, rel->exps, depth, 1, 0);
break;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
