FIX: remove setting changes; remove typo

conf/core/server.conf

@@ -67,7 +67,7 @@ MYSQL_DATABASE_NAME=caosdb
 # User name for connecting to mysql
 MYSQL_USER_NAME=caosdb
 # Password for the user
-MYSQL_USER_PASSWORD=random1234
+MYSQL_USER_PASSWORD=caosdb
 # Schema of mysql procedures and tables which is required by this CaosDB instance
 MYSQL_SCHEMA_VERSION=v5.0
 
@@ -169,8 +169,8 @@ ADMIN_EMAIL=
 BUGTRACKER_URI=
 
 # If set to true MySQL stores transaction benchmarks for all SQL queries. Used for benchmarking and debugging.
-#TRANSACTION_BENCHMARK_ENABLED=FALSE
-TRANSACTION_BENCHMARK_ENABLED=TRUE
+TRANSACTION_BENCHMARK_ENABLED=FALSE
+#TRANSACTION_BENCHMARK_ENABLED=TRUE
 # Location of the configuration file for the CaosDB cache.
 CACHE_CONF_LOC=./conf/core/cache.ccf
 # Set this option to true to lobally disable caching. Used for debugging.

src/main/java/org/caosdb/server/query/Query.java

@@ -33,7 +33,6 @@ import java.sql.Statement;
 import java.sql.Types;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedList;
@@ -797,8 +796,7 @@ public class Query implements QueryInterface, ToElementable, TransactionInterfac
    * @param resultSet
    * @throws SQLException
    */
-  public void filterEntitiesWithoutRetrievePermission(final String resultSet)
-      throws SQLException {
+  public void filterEntitiesWithoutRetrievePermission(final String resultSet) throws SQLException {
     if (!filterEntitiesWithoutRetrievePermisions) {
       return;
     }
@@ -813,11 +811,14 @@ public class Query implements QueryInterface, ToElementable, TransactionInterfac
      * with (acl_id, acl) and a table with (entity_id, acl_id) to reduce the
      * amount of data being transfered.
      */
-    final Statement stmt = this.getConnection().createStatement()
+    final Statement stmt = this.getConnection().createStatement();
+
     final String query =
         ("SELECT entity_n_acl.id, entity_acl.acl from "
             + "(select entities.id, entities.acl from entities "
-          + "inner join `" + resultSet + " as rs on entities.id=rs.id`) "
+            + "inner join `"
+            + resultSet
+            + "` as rs on entities.id=rs.id) "
             + "as entity_n_acl "
             + "left join entity_acl on entity_n_acl.acl=entity_acl.id;");
     final ResultSet entities_with_acl = stmt.executeQuery(query);