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

Modified Files:
        sql_psm.mx sql_select.mx 
Log Message:
propagated changes of Monday Oct 29 2007 - Wednesday Oct 31 2007
from the SQL_2-20 branch to the development trunk


Index: sql_psm.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_psm.mx,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- sql_psm.mx  8 Oct 2007 09:37:59 -0000       1.47
+++ sql_psm.mx  31 Oct 2007 11:25:01 -0000      1.48
@@ -85,7 +85,7 @@
                return NULL;
 
        level = stack_find_frame(sql, name);
-       r = check_types(sql, tpe, r, type_equal); 
+       r = check_types(sql, tpe, r, type_cast); 
        if (!r)
                return NULL;
        return stmt_assign(name, r, level);

Index: sql_select.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_select.mx,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -d -r1.202 -r1.203
--- sql_select.mx       9 Sep 2007 18:42:52 -0000       1.202
+++ sql_select.mx       31 Oct 2007 11:25:03 -0000      1.203
@@ -968,6 +968,10 @@
                                return stmt_binop(ls, rs, f);
                        }
                }
+               /* reset error */
+               sql->errstr[0] = '\0';
+               sql->session->status = 0;
+
                if (ls)
                        stmt_destroy(ls);
                if (rs)


-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins

Reply via email to