Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv2963
Modified Files:
Tag: Nov2009
sql.mx sql_optimizer.mx
Log Message:
Avoid double error messages.
Index: sql_optimizer.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_optimizer.mx,v
retrieving revision 1.230.2.9
retrieving revision 1.230.2.10
diff -u -d -r1.230.2.9 -r1.230.2.10
--- sql_optimizer.mx 15 Nov 2009 16:55:27 -0000 1.230.2.9
+++ sql_optimizer.mx 15 Nov 2009 18:36:40 -0000 1.230.2.10
@@ -569,10 +569,12 @@
if (top <= 1 && pipe == NULL){
showException(SQL,"optimizer","Optimizer '%s' pipeline does not
exist, use default pipe instead\n", optimizerpipe?optimizerpipe:"undefined");
setOptimizers("default_pipe");
+ return GDKstrdup("default_pipe");
}else
if (top == 256){
showException(SQL,"optimizer","Too many optimizer steps, use
default pipe instead\n");
setOptimizers("default_pipe");
+ return GDKstrdup("default_pipe");
}
return GDKstrdup(optimizerpipe);
}
Index: sql.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql.mx,v
retrieving revision 1.358.2.11
retrieving revision 1.358.2.12
diff -u -d -r1.358.2.11 -r1.358.2.12
--- sql.mx 15 Nov 2009 16:55:27 -0000 1.358.2.11
+++ sql.mx 15 Nov 2009 18:36:39 -0000 1.358.2.12
@@ -1418,7 +1418,9 @@
if (mtype < 0 || mtype >= 255)
throw(SQL, "sql.setVariable", "failed");
if ( strcmp("optimizer", varname)== 0) {
- setOptimizers(*(str *) getArgReference(stk,pci,2));
+ msg = setOptimizers(*(str *) getArgReference(stk,pci,2));
+ if ( msg != NULL && strcmp(msg,"default_pipe") == 0 &&
strcmp(msg,varname))
+ return MAL_SUCCEED;
msg = SQLvalidatePipeline();
if ( msg ){
setOptimizers("default_pipe");
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
