Update of /cvsroot/monetdb/sql/src/server
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30573/src/server

Modified Files:
        sql_rel2bin.mx 
Log Message:
clean up


U sql_rel2bin.mx
Index: sql_rel2bin.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_rel2bin.mx,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -d -r1.128 -r1.129
--- sql_rel2bin.mx      21 Dec 2008 19:38:22 -0000      1.128
+++ sql_rel2bin.mx      27 Dec 2008 21:24:03 -0000      1.129
@@ -672,22 +672,20 @@
        it = sql_bind_localtype("int");
        wrd = sql_bind_localtype("wrd");
        for (m = l->h; m; m = m->next) {
-               stmt *tmp, *s = stmt_dup(m->data);
+               stmt *s = stmt_dup(m->data);
 
                if (h) {
                        sql_subfunc *xor = 
sql_bind_func_result3(sql->session->schema, "rotate_xor_hash", wrd, it, 
tail_type(s), wrd);
 
-                       tmp = stmt_join(stmt_dup(o), s, cmp_equal);
                        h = stmt_Nop(stmt_list( list_append( list_append(
                                list_append(create_stmt_list(), h), 
                                stmt_dup(bits)), 
-                               tmp)), 
+                               stmt_join(stmt_dup(o), s, cmp_equal))), 
                                xor);
                } else {
                        sql_subfunc *hf = 
sql_bind_func_result(sql->session->schema, "hash", tail_type(s), NULL, wrd);
                        o = stmt_mark(stmt_reverse(stmt_dup(s)), 40); 
-                       tmp = stmt_mark(s, 40); 
-                       h = stmt_unop(tmp, hf);
+                       h = stmt_unop(stmt_mark(s, 40), hf);
                }
        }
        stmt_destroy(bits);


------------------------------------------------------------------------------
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins

Reply via email to