Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv11323/src/backends/monet5
Modified Files:
Tag: Aug2009
sql_scenario.mx
Log Message:
bug fixing
prepare/execute statements now go to seperate query cache
check for ambiguous order by columns
U sql_scenario.mx
Index: sql_scenario.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_scenario.mx,v
retrieving revision 1.352
retrieving revision 1.352.2.1
diff -u -d -r1.352 -r1.352.2.1
--- sql_scenario.mx 20 Jul 2009 13:39:06 -0000 1.352
+++ sql_scenario.mx 7 Aug 2009 14:26:03 -0000 1.352.2.1
@@ -541,6 +541,7 @@
m->type= Q_PARSE;
sql = backend_create(m, c);
m->qc = NULL;
+ m->prepare_qc = NULL;
m->cache = 0;
m->user_id = m->role_id = USER_MONETDB;
@@ -1006,7 +1007,7 @@
be->q = NULL;
if (m->emode == m_execute) {
assert(m->sym->data.lval->h->type == type_int);
- be->q = qc_find(m->qc, m->sym->data.lval->h->data.i_val);
+ be->q = qc_find(m->prepare_qc,
m->sym->data.lval->h->data.i_val);
if (!be->q) {
err = -1;
sql_error(m, 2, "no prepared statement with the given
id\n");
@@ -1049,7 +1050,7 @@
m->emode = m_normal;
} else {
/* generate a factory instantiation */
- be->q = qc_insert(m->qc,
+ be->q = qc_insert((m->emode ==
m_prepare)?m->prepare_qc:m->qc,
m->sa, /* the allocator */
m->sym, /* the sql symbol tree */
m->args, /* the argument list */
------------------------------------------------------------------------------
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
