Changeset: afc81ae80ff1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=afc81ae80ff1
Modified Files:
MonetDB5/optimizer/opt_constants.c
MonetDB5/optimizer/opt_evaluate.c
MonetDB5/optimizer/opt_remap.c
sql/backends/monet5/sql_user.c
Branch: gdk-tracer
Log Message:
Fixes for compilation errors
diffs (58 lines):
diff --git a/MonetDB5/optimizer/opt_constants.c
b/MonetDB5/optimizer/opt_constants.c
--- a/MonetDB5/optimizer/opt_constants.c
+++ b/MonetDB5/optimizer/opt_constants.c
@@ -40,7 +40,7 @@ OPTconstantsImplementation(Client cntxt,
cst= (VarPtr*) GDKzalloc(sizeof(VarPtr) * mb->vtop);
index= (int*) GDKzalloc(sizeof(int) * mb->vtop);
- DEBUG(MAL_OPT_CONSTANTS) "CONSTANTS optimizer enter\n");
+ DEBUG(MAL_OPT_CONSTANTS, "CONSTANTS optimizer enter\n");
if ( alias == NULL || cst == NULL || index == NULL){
msg = createException(MAL,"optimizer.constants",
SQLSTATE(HY001) MAL_MALLOC_FAIL);
diff --git a/MonetDB5/optimizer/opt_evaluate.c
b/MonetDB5/optimizer/opt_evaluate.c
--- a/MonetDB5/optimizer/opt_evaluate.c
+++ b/MonetDB5/optimizer/opt_evaluate.c
@@ -216,10 +216,8 @@ OPTevaluateImplementation(Client cntxt,
/* freeze the type */
setVarFixed(mb,getArg(p,1));
setVarUDFtype(mb,getArg(p,1));
- str tpename;
DEBUG(MAL_OPT_EVALUATE, "Evaluated new
constant=%d -> %d:%s\n",
-
getArg(p, 0), getArg(p, 1), tpename = getTypeName(getArgType(mb, p, 1)));
- GDKfree(tpename);
+
getArg(p, 0), getArg(p, 1), getTypeName(getArgType(mb, p, 1)));
} else {
/* if there is an error, we should postpone
message handling,
as the actual error (eg. division by
zero ) may not happen) */
diff --git a/MonetDB5/optimizer/opt_remap.c b/MonetDB5/optimizer/opt_remap.c
--- a/MonetDB5/optimizer/opt_remap.c
+++ b/MonetDB5/optimizer/opt_remap.c
@@ -119,11 +119,12 @@ OPTmultiplexInline(Client cntxt, MalBlkP
if( s== NULL || !isSideEffectFree(s->def) ||
getInstrPtr(s->def,0)->retc != p->retc ) {
- if( s== NULL)
+ if( s== NULL) {
DEBUG(MAL_OPT_REMAP, "Not found\n");
- else
+ } else {
DEBUG(MAL_OPT_REMAP, "Side effects\n");
-
+ }
+
return 0;
}
/*
diff --git a/sql/backends/monet5/sql_user.c b/sql/backends/monet5/sql_user.c
--- a/sql/backends/monet5/sql_user.c
+++ b/sql/backends/monet5/sql_user.c
@@ -233,7 +233,7 @@ monet5_create_privileges(ptr _mvc, sql_s
"\"sys\".\"db_user_info\" AS ui "
"ON u.\"name\" = ui.\"name\";");
if (!t) {
- CRITICAL(SQL_USER "Failed to create 'users' view\n");
+ CRITICAL(SQL_USER, "Failed to create 'users' view\n");
return ;
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
