Changeset: 0299c71fd6aa for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0299c71fd6aa
Modified Files:
.hgtags
MonetDB.spec
NT/monetdb_config.h.in
NT/rules.msc
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
debian/changelog
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
sql/server/rel_select.c
Branch: mbedded
Log Message:
merged
diffs (67 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -766,3 +766,6 @@ 179977ed07cd8095f99a6a07968b8e9d1affa753
6b76e1fa9b32421197acf26f63948c858e487d6a Jun2020_root
03ea637c10b5217782acf5db261b4cd71a9afb25 Jun2020_1
03ea637c10b5217782acf5db261b4cd71a9afb25 Jun2020_release
+0d51d6758f2b1f3f1804415545f8551a38da1848 Jun2020_3
+03ea637c10b5217782acf5db261b4cd71a9afb25 Jun2020_release
+0d51d6758f2b1f3f1804415545f8551a38da1848 Jun2020_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -984,6 +984,10 @@ fi
%postun -p /sbin/ldconfig
%changelog
+* Mon May 18 2020 Sjoerd Mullender <sjo...@acm.org> - 11.37.3-20200518
+- Rebuilt.
+- BZ#6863: thash files not released upon drop table
+
* Mon May 11 2020 Sjoerd Mullender <sjo...@acm.org> - 11.37.1-20200511
- Rebuilt.
- BZ#6298: unexpectedly slow execution of SELECT length(fieldname)
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+monetdb (11.37.3) unstable; urgency=low
+
+ * Rebuilt.
+ * BZ#6863: thash files not released upon drop table
+
+ -- Sjoerd Mullender <sjo...@acm.org> Mon, 18 May 2020 11:29:29 +0200
+
monetdb (11.37.1) unstable; urgency=low
* Rebuilt.
diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -2133,13 +2133,13 @@ rel_in_value_exp(sql_query *query, sql_r
supertype(&super, exp_subtype(values), exp_subtype(le));
/* on selection/join cases we can generate cmp
expressions instead of anyequal for trivial cases */
- if (is_sql_where(f) && !is_sql_farg(f) &&
exps_are_atoms(vals)) {
- if (list_length(vals) == 1) { /* use cmp_equal
instead of anyequal for 1 constant */
+ if (is_sql_where(f) && !is_sql_farg(f) &&
!exp_has_rel(le)) {
+ if (list_length(vals) == 1 &&
!exps_have_rel_exp(vals)) { /* use cmp_equal instead of cmp_in for 1 expression
*/
sql_exp *first = vals->h->data;
if (rel_convert_types(sql, rel ? *rel :
NULL, rel ? *rel : NULL, &le, &first, 1, type_equal_no_any) < 0)
return NULL;
e = exp_compare(sql->sa, le, first,
(sc->token == SQL_IN) ? cmp_equal : cmp_notequal);
- } else { /* use cmp_in instead of anyequal for
n constants */
+ } else if (exps_are_atoms(vals)) { /* use
cmp_in instead of anyequal for n simple expressions */
for (node *n = vals->h ; n ; n =
n->next)
if ((n->data =
rel_check_type(sql, &super, rel ? *rel : NULL, n->data, type_equal)) == NULL)
return NULL;
@@ -2169,7 +2169,7 @@ rel_in_exp(sql_query *query, sql_rel *re
if (!e || !rel)
return NULL;
- if (e->type == e_cmp) /* it's a exp_in or cmp_equal of constants, push
down early on if possible */
+ if (e->type == e_cmp) /* it's a exp_in or cmp_equal of simple
expressions, push down early on if possible */
return rel_select_push_exp_down(sql, rel, e, e->l, e->l, e->r,
e->r, NULL, f);
return rel_select_add_exp(sql->sa, rel, e);
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
