MonetDB: Jul2017 - store_next_oid return ints not oid's. When ca...

[Niels Nes]

Changeset: 4069a97ae1d8 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4069a97ae1d8
Modified Files:
        sql/server/rel_sequence.c
        sql/server/sql_privileges.c
Branch: Jul2017
Log Message:

store_next_oid return ints not oid's. When cast to oid's we get
problems on big endian.


diffs (33 lines):

diff --git a/sql/server/rel_sequence.c b/sql/server/rel_sequence.c
--- a/sql/server/rel_sequence.c
+++ b/sql/server/rel_sequence.c
@@ -16,7 +16,7 @@
 char*
 sql_next_seq_name(mvc *m)
 {
-       oid id = store_next_oid();
+       int id = store_next_oid();
        oid len = 5 + ((id+7)>>3);
        char *msg = sa_alloc(m->sa, len);
 
diff --git a/sql/server/sql_privileges.c b/sql/server/sql_privileges.c
--- a/sql/server/sql_privileges.c
+++ b/sql/server/sql_privileges.c
@@ -365,7 +365,7 @@ sql_create_auth_id(mvc *m, unsigned int 
 str
 sql_create_role(mvc *m, str auth, int grantor)
 {
-       oid id;
+       int id;
        sql_schema *sys = find_sql_schema(m->session->tr, "sys");
        sql_table *auths = find_sql_table(sys, "auths");
        sql_column *auth_name = find_sql_column(auths, "name");
@@ -555,7 +555,7 @@ sql_revoke_role(mvc *m, str grantee, str
        role_id = *(int*)val; 
        _DELETE(val);
        if (!admin_privs(grantor) && !role_granting_privs(m, rid, role_id, 
grantor)) 
-               return sql_message("0P000!GRANT: insufficient privileges to 
grant ROLE '%s'", role);
+               return sql_message("0P000!REVOKE: insufficient privileges to 
revoke ROLE '%s'", role);
 
        if (!admin) { 
                rid = table_funcs.column_find_row(m->session->tr, 
roles_login_id, &grantee_id, roles_role_id, &role_id, NULL);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list