MonetDB: Jun2016 - fixed broken checkin..

[Niels Nes]

Changeset: 4c4d485cca91 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4c4d485cca91
Modified Files:
        sql/backends/monet5/sql_upgrades.c
        sql/common/sql_list.c
Branch: Jun2016
Log Message:

fixed broken checkin..

ie compilation and handle null in list_cmp


diffs (41 lines):

diff --git a/sql/backends/monet5/sql_upgrades.c 
b/sql/backends/monet5/sql_upgrades.c
--- a/sql/backends/monet5/sql_upgrades.c
+++ b/sql/backends/monet5/sql_upgrades.c
@@ -1479,6 +1479,7 @@ void
 SQLupgrades(Client c, mvc *m)
 {
        sql_subtype tp;
+       sql_subfunc *f;
        char *err;
        sql_schema *s = mvc_bind_schema(m, "sys");
 
@@ -1553,12 +1554,12 @@ SQLupgrades(Client c, mvc *m)
                }
        }
 
-       f = sql_find_func(m->sa, s, "env", NULL, F_UNION);
+       f = sql_bind_func_(m->sa, s, "env", NULL, F_UNION);
        if (f && sql_privilege(m, ROLE_PUBLIC, f->func->base.id, PRIV_EXECUTE, 
0) != PRIV_EXECUTE) {
                sql_table *privs = find_sql_table(s, "privileges");
                int pub = ROLE_PUBLIC, p = PRIV_EXECUTE, zero = 0;
 
-               table_insert(m->session->tr, privs, &f->func->base.id, &pub, 
&p, &zero, &zero);
+               table_funcs.table_insert(m->session->tr, privs, 
&f->func->base.id, &pub, &p, &zero, &zero);
        }
 
        /* If the point type exists, but the geometry type does not
diff --git a/sql/common/sql_list.c b/sql/common/sql_list.c
--- a/sql/common/sql_list.c
+++ b/sql/common/sql_list.c
@@ -314,7 +314,10 @@ list_cmp(list *l1, list *l2, fcmp cmp)
 
        if (l1 == l2)
                return 0;
-
+       if (!l1 && l2 && list_empty(l2))
+               return 0;
+       if (!l2 && l1 && list_empty(l1))
+               return 0;
        if (!l1 || !l2 || (list_length(l1) != list_length(l2)))
                return -1;
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list