Update of /cvsroot/monetdb/sql/src/server
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14272
Modified Files:
Tag: SQL_2-22
sql_select.mx
Log Message:
backport
Index: sql_select.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_select.mx,v
retrieving revision 1.219.2.6
retrieving revision 1.219.2.7
diff -u -d -r1.219.2.6 -r1.219.2.7
--- sql_select.mx 6 Mar 2008 21:35:03 -0000 1.219.2.6
+++ sql_select.mx 14 Mar 2008 16:12:37 -0000 1.219.2.7
@@ -66,7 +66,7 @@
extern stmt *sql_compare(mvc *sql, scope *scp, stmt *ls, stmt *rs, char
*compare_op, int f, exp_kind ek);
extern stmt *complex_find_subset(stmt *subset, stmt *t);
extern stmt *sql_and(mvc *sql, scope *scp, stmt *ls, stmt *rs, int f);
-extern stmt *sql_unop_(mvc *sql, scope *scp, sql_schema *s, char *fname, stmt
*rs);
+extern stmt *sql_unop_(mvc *sql, sql_schema *s, char *fname, stmt *rs);
extern stmt *sql_binop_(mvc *sql, scope *scp, sql_schema *s, char *fname, stmt
*ls, stmt *rs);
extern stmt *sql_Nop_(mvc *sql, char *fname, stmt *a1, stmt *a2, stmt *a3,
stmt *a4);
extern stmt *find_pivot(stmt *subset, stmt *t);
@@ -1112,12 +1112,11 @@
}
stmt *
-sql_unop_(mvc *sql, scope *scp, sql_schema *s, char *fname, stmt *rs)
+sql_unop_(mvc *sql, sql_schema *s, char *fname, stmt *rs)
{
sql_subtype *rt = NULL;
sql_subfunc *f = NULL;
- (void)scp;
if (!s)
s = sql->session->schema;
rt = tail_type(rs);
@@ -1163,7 +1162,7 @@
return NULL;
if (sname)
s = mvc_bind_schema(sql, sname);
- return sql_unop_(sql, scp, s, fname, rs);
+ return sql_unop_(sql, s, fname, rs);
}
static stmt *
@@ -2132,7 +2131,7 @@
;
ls = stmt_dup(m->data);
rs = stmt_dup(p->data);
- ls = sql_Nop_(sql, "ifthenelse",
sql_unop_(sql, scp, NULL, "isnull", ls), rs, stmt_dup(ls), NULL);
+ ls = sql_Nop_(sql, "ifthenelse",
sql_unop_(sql, NULL, "isnull", ls), rs, stmt_dup(ls), NULL);
ls = stmt_alias(ls, NULL,
_strdup(lc->cname));
list_append(l2, ls);
}
-------------------------------------------------------------------------
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
