Changeset: fdefb0f9071a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fdefb0f9071a
Modified Files:
clients/mapiclient/Tests/mclient--help.stable.err.Windows
sql/backends/monet5/sql_scenario.c
Branch: Feb2013
Log Message:
Merge with Oct2012 branch.
diffs (23 lines):
diff --git a/clients/mapiclient/Tests/mclient--help.stable.err.Windows
b/clients/mapiclient/Tests/mclient--help.stable.err.Windows
--- a/clients/mapiclient/Tests/mclient--help.stable.err.Windows
+++ b/clients/mapiclient/Tests/mclient--help.stable.err.Windows
@@ -27,6 +27,7 @@ Options are:
-s stmt | --statement=stmt run single statement
-X | --Xdebug trace mapi network interaction
-z | --timezone do not tell server our timezone
+ -v | --version show version information and exit
-? | --help show this usage message
SQL specific opions
diff --git a/sql/backends/monet5/sql_scenario.c
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -1584,7 +1584,7 @@ SQLparser(Client c)
}
m->emode = m_inplace;
scanner_query_processed(&(m->scanner));
- } else if (cachable(m, NULL) &&
+ } else if (cachable(m, NULL) && m->emode != m_prepare &&
(be->q = qc_match(m->qc, m->sym, m->args, m->argc,
m->scanner.key ^ m->session->schema->base.id)) != NULL) {
if (m->emod & mod_debug)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
