Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv32067/src/backends/monet5
Modified Files:
sql_gencode.mx
Log Message:
propagated changes of Tuesday Feb 10 2009
from the Feb2009 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/02/10 - mlkersten: src/backends/monet5/sql_gencode.mx,1.312.2.2
Make sure the query string is back into place.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: sql_gencode.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_gencode.mx,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -d -r1.313 -r1.314
--- sql_gencode.mx 31 Jan 2009 00:00:38 -0000 1.313
+++ sql_gencode.mx 10 Feb 2009 20:24:53 -0000 1.314
@@ -2007,15 +2007,18 @@
m->Tparse = Toptimize - m->Tparse;
if (m->history) {
- char *t = sql_escape_str(QUERY(m->scanner) + m->scanner.as);
+ char *t;
oid queryid = OIDnew(1);
InstrPtr q;
-
- while( t && isspace((int) *t) )
- t++;
+ if ( be->q && be->q->codestring) {
+ t = GDKstrdup( be->q->codestring);
+ while( t && isspace((int) *t) )
+ t++;
+ } else
+ t = GDKstrdup("-- no query");
- q = newStmt(mb, userRef, "keepquery");
+ q = newStmt(mb, userRef, "keepquery");
q->token = REMsymbol;
q = pushWrd(mb, q, queryid);
q = pushStr(mb, q, t);
------------------------------------------------------------------------------
Create and Deploy Rich Internet Apps outside the browser with Adobe(R)AIR(TM)
software. With Adobe AIR, Ajax developers can use existing skills and code to
build responsive, highly engaging applications that combine the power of local
resources and data with the reach of the web. Download the Adobe AIR SDK and
Ajax docs to start building applications today-http://p.sf.net/sfu/adobe-com
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
