Merge patch branch changes to main.

extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/usergroup/UserGroupMapper.xml

@@ -291,7 +291,6 @@
     <delete id="delete">
         DELETE FROM guacamole_entity
         WHERE
-            type = 'USER_GROUP'
             <choose>
                 <when test="caseSensitivity.caseSensitiveGroupNames()">
                     name = #{identifier,jdbcType=VARCHAR}
@@ -300,6 +299,7 @@
                     LOWER(name) = LOWER(#{identifier,jdbcType=VARCHAR})
                 </otherwise>
             </choose>
+            AND type = 'USER_GROUP'
     </delete>
 
     <!-- Insert single group -->