Changeset: 3c7675b36829 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3c7675b36829
Modified Files:
gdk/gdk_calc_compare.h
sql/server/rel_schema.c
Branch: Jan2014
Log Message:
fixes for bug 3579 and bug 3575
diffs (37 lines):
diff --git a/gdk/gdk_calc_compare.h b/gdk/gdk_calc_compare.h
--- a/gdk/gdk_calc_compare.h
+++ b/gdk/gdk_calc_compare.h
@@ -36,7 +36,8 @@ op_typeswitchloop(const void *lft, int t
assert(incr1 == 1);
assert(tp2 == TYPE_oid || incr2 == 1); /* if void, incr2==1 */
- v = * (const oid *) lft;
+ if (lft)
+ v = * (const oid *) lft;
CANDLOOP(dst, k, TPE_nil, 0, start);
if (v == oid_nil || tp2 == TYPE_void) {
TPE res = v == oid_nil || * (const oid *) rgt ==
oid_nil ?
diff --git a/sql/server/rel_schema.c b/sql/server/rel_schema.c
--- a/sql/server/rel_schema.c
+++ b/sql/server/rel_schema.c
@@ -1007,6 +1007,9 @@ rel_create_schema(mvc *sql, dlist *auth_
sql_error(sql, 02, "42000!CREATE SCHEMA: insufficient
privileges for user '%s'", stack_get_string(sql, "current_user"));
return NULL;
}
+ if (!name)
+ name = auth;
+ assert(name);
if (mvc_bind_schema(sql, name)) {
sql_error(sql, 02, "3F000!CREATE SCHEMA: name '%s' already in
use", name);
return NULL;
@@ -1016,9 +1019,7 @@ rel_create_schema(mvc *sql, dlist *auth_
sql_schema *ss = SA_ZNEW(sql->sa, sql_schema);
sql_rel *ret;
- ret = rel_schema(sql->sa, DDL_CREATE_SCHEMA,
- dlist_get_schema_name(auth_name),
- schema_auth(auth_name), 0);
+ ret = rel_schema(sql->sa, DDL_CREATE_SCHEMA, name, auth, 0);
ss->base.name = name;
ss->auth_id = auth_id;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
