MonetDB: default - Merge with Jun2010 branch.

[Sjoerd Mullender]

Changeset: 4b7de918e706 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4b7de918e706
Modified Files:
        MonetDB5/src/mal/mal_scenario.mx
        sql/src/backends/monet5/sql_scenario.mx
Branch: default
Log Message:

Merge with Jun2010 branch.


diffs (35 lines):

diff -r 0c493ed52585 -r 4b7de918e706 MonetDB5/src/mal/mal_scenario.mx
--- a/MonetDB5/src/mal/mal_scenario.mx  Mon Aug 30 14:54:09 2010 +0200
+++ b/MonetDB5/src/mal/mal_scenario.mx  Mon Aug 30 17:00:00 2010 +0200
@@ -623,7 +623,7 @@
        if (setjmp( c->exception_buf) < 0) 
                c->mode = FINISHING;
 #ifdef HAVE_TIMES
-               times(&t0);
+       times(&t0);
 #endif
        while (c->mode > FINISHING || msg != MAL_SUCCEED) {
                if (msg != MAL_SUCCEED){
diff -r 0c493ed52585 -r 4b7de918e706 sql/src/backends/monet5/sql_scenario.mx
--- a/sql/src/backends/monet5/sql_scenario.mx   Mon Aug 30 14:54:09 2010 +0200
+++ b/sql/src/backends/monet5/sql_scenario.mx   Mon Aug 30 17:00:00 2010 +0200
@@ -1306,6 +1306,10 @@
                                          m->type,/* the type of the statement 
*/
                                          sql_escape_str(QUERY(m->scanner)));
 
+                       /* passed over to query cache */
+                       m->sa = NULL; 
+                       m->sym = NULL;
+
                        scanner_query_processed(&(m->scanner));
                        be->q->code = 
                                (backend_code)backend_dumpproc(be, c, be->q, s);
@@ -1314,8 +1318,6 @@
                        be->q->name = putName(be->q->name, strlen(be->q->name));
                        if (m->emode == m_normal && m->emod == mod_none)
                                m->emode = m_inplace; 
-                       m->sa = NULL;
-                       m->sym = NULL;
                } 
                stmt_destroy(s);
        }
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list