diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ed31ddf..bc7ea09f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## Adminer dev
 - Do not edit NULL values by Modify (bug #967)
 - MySQL: Display number of found rows in group queries (regression from 5.1.1)
+- non-MySQL: Parse '--' as comment in SQL command (bug SF-842)
 
 ## Adminer 5.1.1 (released 2025-04-02)
 - Export: Fix tar (regression from 5.0.3)
diff --git a/adminer/sql.inc.php b/adminer/sql.inc.php
index 2f9b68a4..790aff0c 100644
--- a/adminer/sql.inc.php
+++ b/adminer/sql.inc.php
@@ -64,7 +64,7 @@ if (!$error && $_POST) {
 		}
 		$commands = 0;
 		$errors = array();
-		$parse = '[\'"' . (JUSH == "sql" ? '`#' : (JUSH == "sqlite" ? '`[' : (JUSH == "mssql" ? '[' : ''))) . ']|/\*|-- |$' . (JUSH == "pgsql" ? '|\$[^$]*\$' : '');
+		$parse = '[\'"' . (JUSH == "sql" ? '`#' : (JUSH == "sqlite" ? '`[' : (JUSH == "mssql" ? '[' : ''))) . ']|/\*|--' . (JUSH == 'sql' ? ' ' : '') . '|$' . (JUSH == "pgsql" ? '|\$[^$]*\$' : '');
 		$total_start = microtime(true);
 		$adminer_export = get_settings("adminer_import"); // this doesn't offer SQL export so we match the import/export style at select
 		$dump_format = adminer()->dumpFormat();