Changeset: cb48895ab6bb for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/cb48895ab6bb
Modified Files:
sql/server/rel_rel.c
sql/storage/bat/bat_storage.c
Branch: Jul2021
Log Message:
fix compilation
diffs (35 lines):
diff --git a/sql/server/rel_rel.c b/sql/server/rel_rel.c
--- a/sql/server/rel_rel.c
+++ b/sql/server/rel_rel.c
@@ -1128,9 +1128,7 @@ rel_select_push_exp_down(mvc *sql, sql_r
return rel;
}
-/* ls is the left expression of the select, rs is a simple atom, e is the
- select expression.
- */
+/* ls is the left expression of the select, e is the select expression. */
sql_rel *
rel_push_select(mvc *sql, sql_rel *rel, sql_exp *ls, sql_exp *e, int f)
{
diff --git a/sql/storage/bat/bat_storage.c b/sql/storage/bat/bat_storage.c
--- a/sql/storage/bat/bat_storage.c
+++ b/sql/storage/bat/bat_storage.c
@@ -982,7 +982,7 @@ cs_update_bat( sql_trans *tr, column_sto
if (void_inplace(b,
rid, upd, true) != GDK_SUCCEED)
res = LOG_ERR;
- int word = rid/32;
+ oid word = rid/32;
int pos = rid%32;
msk[word] |= 1U<<pos;
cnt++;
@@ -1022,7 +1022,7 @@ cs_update_bat( sql_trans *tr, column_sto
if (void_inplace(b, rid[i],
upd, true) != GDK_SUCCEED)
res = LOG_ERR;
- int word = rid[i]/32;
+ oid word = rid[i]/32;
int pos = rid[i]%32;
msk[word] |= 1U<<pos;
cnt++;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
