Update of /cvsroot/monetdb/sql/src/backends/monet4
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32090/src/backends/monet4
Modified Files:
sql_session.mx
Log Message:
propagated changes of Tuesday Sep 09 2008 - Friday Sep 12 2008
from the SQL_2-24 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/09/09 - nielsnes: src/backends/monet4/sql_session.mx,1.242.2.1
include the schema into the hash key, fixes bug
constraint_with_schemas.SF-2080219.sql
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: sql_session.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet4/sql_session.mx,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -d -r1.243 -r1.244
--- sql_session.mx 6 Sep 2008 20:02:39 -0000 1.243
+++ sql_session.mx 12 Sep 2008 08:33:25 -0000 1.244
@@ -275,7 +275,7 @@
if (err)
return sqlcleanup(c, err);
} else if (c->emode == m_inplace || c->emode == m_explain || !c->cache
||
- !(q = qc_match(c->qc, c->sym, c->args, c->argc,
c->scanner.key))) {
+ !(q = qc_match(c->qc, c->sym, c->args, c->argc,
c->scanner.key ^ c->session->schema->base.id))) {
stmt *s = sql_symbol2stmt(c);
if (!s && (err = mvc_status(c))) /* semantic errors */
@@ -285,7 +285,7 @@
err = backend_explain(be, s, out);
} else {
if (c->cache && s->type != st_none) {
- q = qc_insert(c->qc, c->sa, c->sym, c->args,
c->argc, c->scanner.key, c->type, sql_escape_str(QUERY(c->scanner)));
+ q = qc_insert(c->qc, c->sa, c->sym, c->args,
c->argc, c->scanner.key ^ c->session->schema->base.id, c->type,
sql_escape_str(QUERY(c->scanner)));
c->sa = NULL;
c->sym = NULL;
}
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
