Changeset: 8abe0bb42559 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8abe0bb42559
Modified Files:
sql/backends/monet5/sql_optimizer.mx
Branch: default
Log Message:
Fix optimizer off/on switches
diffs (37 lines):
diff --git a/sql/backends/monet5/sql_optimizer.mx
b/sql/backends/monet5/sql_optimizer.mx
--- a/sql/backends/monet5/sql_optimizer.mx
+++ b/sql/backends/monet5/sql_optimizer.mx
@@ -556,7 +556,7 @@
char *base=0, *nxt, *nme, *pipe="notdefined";
/* do nothing if the pipe line is already set */
- if ( optimizerpipe && optimizer && strcmp(optimizerpipe,optimizer) == 0
)
+ if ( optimizerpipe && optimizer && strcmp(optimizerpipe,optimizer) == 0
&& strcmp(optimizer,"off") )
return optimizerpipe;
/* catch minimal pipes */
@@ -568,20 +568,19 @@
optimizer = pipe;
} else
/* optimizers can be temporarily turned on/off */
- if(strcmp(optimizer,"off")==0){
- if( previouspipe )
+ if(strcmp(optimizer,"off")==0 ) {
+ if ( previouspipe )
return optimizerpipe;
previouspipe = optimizerpipe; /* give reference away */
optimizerpipe = NULL;
- pipe = GDKgetenv(minimalPipe);
+ pipe= getPipeDefinition(minimalPipe);
if ( pipe )
optimizer = pipe;
} else
if (strcmp(optimizer,"on")==0){
- if (previouspipe == NULL)
+ if ( previouspipe == NULL)
return optimizerpipe;
optimizer= previouspipe;
- base = previouspipe; /* free this later */
previouspipe = 0;
} else {
/* the optimizer may be an environment alias */
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
