Changeset: 46d070166af8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=46d070166af8
Modified Files:
        sql/backends/monet5/sql_user.c
Branch: Dec2011
Log Message:

sql_user: don't dump full MAL exception details


diffs (44 lines):

diff --git a/sql/backends/monet5/sql_user.c b/sql/backends/monet5/sql_user.c
--- a/sql/backends/monet5/sql_user.c
+++ b/sql/backends/monet5/sql_user.c
@@ -278,14 +278,14 @@ monet5_alter_user(ptr _mvc, str user, st
                }
                if (user == NULL) {
                        if ((err = AUTHchangePassword(&c, &opwd, &pwd)) != 
MAL_SUCCEED) {
-                               (void)sql_error(m, 02, "ALTER USER: %s", err);
+                               (void)sql_error(m, 02, "ALTER USER: %s", 
getExceptionMessage(err));
                                GDKfree(err);
                                return(FALSE);
                        }
                } else {
                        str username = NULL;
                        if ((err = AUTHresolveUser(&username, &c->user)) != 
MAL_SUCCEED) {
-                               (void)sql_error(m, 02, "ALTER USER: %s", err);
+                               (void)sql_error(m, 02, "ALTER USER: %s", 
getExceptionMessage(err));
                                GDKfree(err);
                                return(FALSE);
                        }
@@ -298,7 +298,7 @@ monet5_alter_user(ptr _mvc, str user, st
                                return(FALSE);
                        }
                        if ((err = AUTHsetPassword(&c, &user, &pwd)) != 
MAL_SUCCEED) {
-                               (void)sql_error(m, 02, "ALTER USER: %s", err);
+                               (void)sql_error(m, 02, "ALTER USER: %s", 
getExceptionMessage(err));
                                GDKfree(err);
                                return(FALSE);
                        }
@@ -337,7 +337,7 @@ monet5_rename_user(ptr _mvc, str olduser
        sql_column *auths_name = find_sql_column(auths, "name");
 
        if ((err = AUTHchangeUsername(&c, &olduser, &newuser)) != MAL_SUCCEED) {
-               (void)sql_error(m, 02, "ALTER USER: %s", err);
+               (void)sql_error(m, 02, "ALTER USER: %s", 
getExceptionMessage(err));
                GDKfree(err);
                return(FALSE);
        }
@@ -481,5 +481,3 @@ monet5_user_get_def_schema(mvc *m, oid u
        mvc_rollback(m, 0, NULL);
        return schema;
 }
-
-
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to