Merge branch 'main' into pathological2

Author: LucaCappelletti94

src/dialect/mysql.rs

@@ -216,6 +216,11 @@ impl Dialect for MySqlDialect {
     fn supports_key_column_option(&self) -> bool {
         true
     }
+
+    /// See: <https://dev.mysql.com/doc/refman/9.7/en/group-by-modifiers.html>
+    fn supports_group_by_with_modifier(&self) -> bool {
+        true
+    }
 }
 
 /// `LOCK TABLES`

tests/sqlparser_mysql.rs

@@ -4900,3 +4900,8 @@ fn parse_adjacent_string_literal_concatenation() {
     let sql = r#"SELECT 'M' "y" 'S' "q" 'l'"#;
     mysql().one_statement_parses_to(sql, r"SELECT 'MySql'");
 }
+
+#[test]
+fn parse_group_by_with_rollup() {
+    mysql().verified_stmt("SELECT * FROM tbl GROUP BY col1, col2 WITH ROLLUP");
+}