Changeset: bb2242d24650 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bb2242d24650
Modified Files:
sql/backends/monet5/sql.mx
Branch: Aug2011
Log Message:
Merged from Apr2011
diffs (39 lines):
diff --git a/sql/ChangeLog.Apr2011 b/sql/ChangeLog.Apr2011
--- a/sql/ChangeLog.Apr2011
+++ b/sql/ChangeLog.Apr2011
@@ -1,6 +1,10 @@
# ChangeLog file for sql
# This file is updated with Maddlog
+* Tue Jul 19 2011 Fabian Groffen <fab...@cwi.nl>
+- Fixed regression where the superuser password could no longer be
+ changed, bug #2844
+
* Wed Jun 29 2011 Sjoerd Mullender <sjo...@acm.org>
- Fixed incorrect insert counts.
- Fixed bug 2823: MAL exeption on SQL query with subquery in the where
diff --git a/sql/backends/monet5/sql.mx b/sql/backends/monet5/sql.mx
--- a/sql/backends/monet5/sql.mx
+++ b/sql/backends/monet5/sql.mx
@@ -2495,7 +2495,7 @@
m->scanner.log = NULL;
}
- if (filename != str_nil)
+ if (strcmp(filename, str_nil))
m->scanner.log = open_wastream(filename);
*res = 0;
return MAL_SUCCEED;
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
@@ -516,6 +516,9 @@
char *schema, char *oldpasswd)
{
sqlid schema_id = 0;
+ /* we may be called from MAL (nil) */
+ if (user != NULL && strcmp(user, str_nil) == 0)
+ user = NULL;
/* USER == NULL -> current_user */
if (user != NULL && backend_find_user(sql, user) < 0)
return sql_message("ALTER USER: no such user '%s'", user);
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
