Update of /cvsroot/monetdb/sql/src/backends/monet4
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16448/src/backends/monet4
Modified Files:
sql_session.mx
Log Message:
expressions can now have relation and expression aliases
also added more checks for the correct cardinality, we leads to
earlier (clearer) errors
Index: sql_session.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet4/sql_session.mx,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -d -r1.239 -r1.240
--- sql_session.mx 28 Jan 2008 16:25:52 -0000 1.239
+++ sql_session.mx 29 Jan 2008 15:02:21 -0000 1.240
@@ -116,11 +116,9 @@
if (mvc_debug_on(c,16384)) {
int status = c->session->status;
sql_rel *r;
- printf("# semantic relational algebra\n");
r = rel_semantic(c, c->sym);
if (!r) {
if (c->errstr[0]) {
- printf("# %s\n", c->errstr);
return NULL;
} else {
c->session->status = status;
@@ -142,7 +140,6 @@
}
}
} else {
- /*printf("# semantic binary algebra\n");*/
s = output_semantic(c, NULL, c->sym);
}
@@ -479,6 +476,16 @@
in->pos = in->len; /* HACK: should use
parsed lenght */
continue;
}
+ if( strncmp(in->buf+in->pos,"algebra ", 8)==0 ){
+ v= (int) strtol(in->buf+in->pos+8,NULL,10);
+ if (v) {
+ m->debug |= 16384;
+ } else {
+ m->debug &= (~16384);
+ }
+ in->pos = in->len; /* HACK: should use
parsed lenght */
+ continue;
+ }
if (sscanf(in->buf + in->pos, "reply_size %d", &v) ==
1) {
m->reply_size = v;
in->pos = in->len; /* HACK: should use
parsed lenght */
@@ -955,13 +962,6 @@
sql_client_engine(mapi_client *fc )
{
backend *be = fc->fc;
- char *buf = THRget_errbuf(fc->thread);
-
- if (!buf) {
- buf = GDKmalloc(GDKMAXERRLEN);
- buf[0] = '\0';
- THRset_errbuf(fc->thread, buf);
- }
if (sqlinit)
mvc_sql(be->mvc, sqlinit);
sqlclient(be, be->mvc->scanner.rs, be->mvc->scanner.ws);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
