Merge branch 'f-filesystem-cleanup' into f-filesystem-core

procedures/query/initEntity.sql

@@ -80,9 +80,10 @@ initEntityLabel: BEGIN
             IF(versioned,
                 '` (id, _iversion) SELECT eids.internal_id, _get_head_iversion(eids.internal_id) ',
                 '` (id) SELECT eids.internal_id '),
-            'FROM entity_ids AS eids WHERE eids.id=',eid,';');
+            'FROM entity_ids AS eids WHERE eids.id=?;');
+        SET @query_param = eid;
         PREPARE initEntityStmt FROM @initEntityStmtStr;
-        EXECUTE initEntityStmt;
+        EXECUTE initEntityStmt USING @query_param;
         DEALLOCATE PREPARE initEntityStmt;
     END IF;