Update of /cvsroot/monetdb/sql/src/server
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9464/src/server

Modified Files:
        sql_mvc.mx 
Log Message:
propagated changes of Thursday Jun 28 2007 - Sunday Jul 01 2007
from the SQL_2-18 branch to the development trunk

NOTE:

I hope, I resolved the conflicts in 

        src/backends/monet4/sql_server.mx
        src/backends/monet5/sql.mx
        src/backends/monet5/sql_optimizer.mx
        src/test/Dependencies/Tests/Dependencies.stable.out

correctly --- please double-check!



Index: sql_mvc.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_mvc.mx,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -d -r1.186 -r1.187
--- sql_mvc.mx  29 Jun 2007 11:28:59 -0000      1.186
+++ sql_mvc.mx  1 Jul 2007 14:34:36 -0000       1.187
@@ -401,6 +401,7 @@
                m->type = Q_TRANS;
                if (mvc_debug)
                        fprintf(stderr, "mvc_commit %s done\n", (name) ? name : 
"");
+               m->last = NULL;
                return 0;
        }
 
@@ -420,6 +421,7 @@
                sql_trans_begin(m->session);
        store_unlock();
        m->type = Q_TRANS;
+       m->last = NULL;
        if (mvc_debug)
                fprintf(stderr, "mvc_commit %s done\n", (name) ? name : "");
        return ok;


-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins

Reply via email to