Changeset: 6976c0ed0eed for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6976c0ed0eed
Modified Files:
sql/server/sql_privileges.c
Branch: Dec2011
Log Message:
sql_create_user: avoid dep on M5 (getExceptionMessage)
besides that it's undefined, its undesirable here to have a dep on M5,
so just manually remove the parts from the string we don't want to see
diffs (22 lines):
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
@@ -492,7 +492,17 @@ sql_create_user(mvc *sql, char *user, ch
if ((err = backend_create_user(sql, user, passwd, enc, fullname,
schema_id, sql->user_id)) != NULL)
{
- char *r = sql_message("M0M27!CREATE USER: %s",
getExceptionMessage(err));
+ /* strip off MAL exception decorations */
+ char *r;
+ char *e = err;
+ if ((e = strchr(e, ':')) == NULL) {
+ e = err;
+ } else if ((e = strchr(++e, ':')) == NULL) {
+ e = err;
+ } else {
+ e++;
+ }
+ r = sql_message("M0M27!CREATE USER: %s", e);
GDKfree(err);
return r;
}
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
