Changeset: 59d7192eb94a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=59d7192eb94a
Added Files:
sql/test/BugTracker-2014/Tests/select-having.Bug-3458.sql
sql/test/BugTracker-2014/Tests/select-having.Bug-3458.stable.err
sql/test/BugTracker-2014/Tests/select-having.Bug-3458.stable.out
Modified Files:
sql/backends/monet5/sql.c
sql/test/BugTracker-2014/Tests/All
Branch: default
Log Message:
Merge with Jan2014 branch.
diffs (38 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
@@ -488,7 +488,7 @@ table_has_updates(sql_trans *tr, sql_tab
for ( n = t->columns.set->h; !cnt && n; n = n->next) {
sql_column *c = n->data;
BAT *b = store_funcs.bind_col(tr, c, RD_UPD);
- cnt += BATcount(b);
+ cnt |= BATcount(b) > 0;
BBPunfix(b->batCacheid);
}
return cnt;
diff --git a/sql/test/BugTracker-2014/Tests/All
b/sql/test/BugTracker-2014/Tests/All
--- a/sql/test/BugTracker-2014/Tests/All
+++ b/sql/test/BugTracker-2014/Tests/All
@@ -11,3 +11,4 @@ indices.Bug-3435
utf8bom.Bug-3436
left-outer-join-with-and.Bug-3444
setreadonly_forgets_changes.Bug-3446
+select-having.Bug-3458
diff --git a/sql/test/BugTracker-2014/Tests/select-having.Bug-3458.sql
b/sql/test/BugTracker-2014/Tests/select-having.Bug-3458.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/select-having.Bug-3458.sql
@@ -0,0 +1,1 @@
+select count(*) from sys.tables having count(*) > 0;
diff --git a/sql/test/BugTracker-2014/Tests/select-having.Bug-3458.stable.err
b/sql/test/BugTracker-2014/Tests/select-having.Bug-3458.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/select-having.Bug-3458.stable.err
@@ -0,0 +1,1 @@
+This should not crash.
diff --git a/sql/test/BugTracker-2014/Tests/select-having.Bug-3458.stable.out
b/sql/test/BugTracker-2014/Tests/select-having.Bug-3458.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/select-having.Bug-3458.stable.out
@@ -0,0 +1,1 @@
+This should not crash.
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
