Update of /cvsroot/monetdb/sql/src/server
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv8022/src/server
Modified Files:
sql_mvc.mx
Log Message:
propagated changes of Friday Aug 07 2009
from the Aug2009 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/08/07 - nielsnes: src/server/sql_mvc.mx,1.223.2.2
bug fixing
prepare/execute statements now go to seperate query cache
check for ambiguous order by columns
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: sql_mvc.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_mvc.mx,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -d -r1.224 -r1.225
--- sql_mvc.mx 7 Aug 2009 13:31:08 -0000 1.224
+++ sql_mvc.mx 7 Aug 2009 21:24:52 -0000 1.225
@@ -83,6 +83,7 @@
sql_allocator *ra; /* allocator used during the relational phases
*/
sql_allocator *ba; /* allocator used for binary statement tree */
struct qc *qc;
+ struct qc *prepare_qc;
int clientid; /* id of the owner */
struct scanner scanner;
@@ -377,6 +378,10 @@
qc_destroy(m->qc);
m->qc = qc_create(m->clientid);
}
+ if (m->prepare_qc && (schema_changed || err)) {
+ qc_destroy(m->prepare_qc);
+ m->prepare_qc = qc_create(m->clientid);
+ }
if (m->session->active)
m->type = Q_TRANS;
store_unlock();
@@ -584,6 +589,7 @@
m->errstr[ERRSIZE-1] = '\0';
m->qc = qc_create(clientid);
+ m->prepare_qc = qc_create(clientid);
m->sa = sa_create();
m->params = NULL;
@@ -724,6 +730,9 @@
if (m->qc)
qc_destroy(m->qc);
m->qc = NULL;
+ if (m->prepare_qc)
+ qc_destroy(m->prepare_qc);
+ m->prepare_qc = NULL;
_DELETE(m->args);
m->args = NULL;
------------------------------------------------------------------------------
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
