Index: user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.636
diff -u -F^f -r1.636 user.module
--- user.module	10 Jul 2006 19:27:52 -0000	1.636
+++ user.module	15 Jul 2006 15:21:28 -0000
@@ -1835,18 +1835,8 @@ function user_admin_role() {
   else if ($op == t('Delete role')) {
     db_query('DELETE FROM {role} WHERE rid = %d', $id);
     db_query('DELETE FROM {permission} WHERE rid = %d', $id);
-
     // Update the users who have this role set:
-    $result = db_query('SELECT DISTINCT(ur1.uid) FROM {users_roles} ur1 LEFT JOIN {users_roles} ur2 ON ur2.uid = ur1.uid WHERE ur1.rid = %d AND ur2.rid != ur1.rid', $id);
-    $uid = array();
-
-    while ($u = db_fetch_object($result)) {
-      $uid[] = $u->uid;
-    }
-
-    if ($uid) {
-      db_query('DELETE FROM {users_roles} WHERE rid = %d AND uid IN (%s)', $id, implode(', ', $uid));
-    }
+    db_query('DELETE FROM {users_roles} WHERE rid = %d', $id);
 
     drupal_set_message(t('The role has been deleted.'));
     drupal_goto('admin/access/roles');