Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32396/src/backends/monet5
Modified Files:
sql_scenario.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/monet5/sql_scenario.mx,1.307.2.3
include the schema into the hash key, fixes bug
constraint_with_schemas.SF-2080219.sql
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: sql_scenario.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_scenario.mx,v
retrieving revision 1.319
retrieving revision 1.320
diff -u -d -r1.319 -r1.320
--- sql_scenario.mx 7 Sep 2008 14:27:07 -0000 1.319
+++ sql_scenario.mx 12 Sep 2008 08:33:35 -0000 1.320
@@ -1009,7 +1009,7 @@
goto finalize;
}
m->emode = m_inplace;
- } else if ((be->q = qc_match(m->qc, m->sym, m->args, m->argc,
m->scanner.key))) {
+ } else if ((be->q = qc_match(m->qc, m->sym, m->args, m->argc,
m->scanner.key ^ m->session->schema->base.id))) {
if (m->emod & mod_trace)
SQLsetTimer(c, TRUE);
if (m->emod & mod_debug)
@@ -1046,7 +1046,7 @@
m->sym, /* the sql symbol tree */
m->args, /* the argument list */
m->argc,
- m->scanner.key,/* the statement hash
key */
+ m->scanner.key ^
m->session->schema->base.id,/* the statement hash key */
m->type,/* the type of the statement
*/
sql_escape_str(QUERY(m->scanner)));
-------------------------------------------------------------------------
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
