Merge branch 'main' into float

Author: mergify[bot]

.github/actions/test_sqllogic_cluster_linux/action.yml

@@ -28,6 +28,7 @@ runs:
       run: |
         docker run --rm --tty --net=host \
           --user $(id -u):$(id -g) \
+          --env BUILD_PROFILE \
           --volume "${PWD}:/workspace" \
           --workdir "/workspace" \
           datafuselabs/build-tool:sqllogic \

.github/actions/test_sqllogic_standalone_linux/action.yml

@@ -28,6 +28,7 @@ runs:
       run: |
         docker run --rm --tty --net=host \
           --user $(id -u):$(id -g) \
+          --env BUILD_PROFILE \
           --volume "${PWD}:/workspace" \
           --workdir "/workspace" \
           datafuselabs/build-tool:sqllogic \

.github/actions/test_sqllogic_standalone_macos/action.yml

@@ -32,9 +32,3 @@ runs:
       shell: bash
       run: |
         bash ./scripts/ci/ci-run-sqllogic-tests.sh ${{ inputs.dirs }}
-
-    # - name: Upload failure
-    #   if: failure()
-    #   uses: ./.github/actions/artifact_failure
-    #   with:
-    #     name: test-sqllogic-standalone-macos

src/query/service/src/servers/mysql/mysql_federated.rs

@@ -236,6 +236,9 @@ impl MySQLFederated {
                 None,
             ),
             ("(?i)^(/\\* ApplicationName=(.*)SHOW VARIABLES(.*))", None),
+            // pt-toolkit
+            ("(?i)^(/\\*!40101 SET(.*) \\*/)$", None),
+            ("(?i)^(SET character_set_connection(.*))", None),
         ];
 
         FederatedHelper::block_match_rule(query, rules)

tests/logictest/suites/base/10_drivers/10_0003_federated_query

@@ -1,49 +1,61 @@
 statement ok
-/*!40101*/select number from numbers_mt(2) ORDER BY number;
+/*!40101*/select number from numbers_mt(2) ORDER BY number
 
 -- statement ok
--- /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+-- /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */
 
 statement ok
-/*!40101*/select number from numbers_mt(1) ORDER BY number;
+/*!40101*/select number from numbers_mt(1) ORDER BY number
 
 onlyif mysql
 statement ok
-COMMIT;
+/*!40101 SET @@SQL_MODE := @OLD_SQL_MODE, @@SQL_QUOTE_SHOW_CREATE := @OLD_QUOTE */
 
 onlyif mysql
 statement ok
-ROLLBACK;
+/*!40101 SET character_set_connection = utf8mb4 */
 
 onlyif mysql
 statement ok
-START;
+SET @@SQL_QUOTE_SHOW_CREATE = 1/*!40101, @@SQL_MODE='NO_AUTO_VALUE_ON_ZERO,ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION'*/
 
 onlyif mysql
 statement ok
-SET SQL_LOG_BIN=0;
+COMMIT
 
 onlyif mysql
 statement ok
-SHOW MASTER STATUS;
+ROLLBACK
 
 onlyif mysql
 statement ok
-SHOW ALL SLAVES STATUS;
+START
 
 onlyif mysql
 statement ok
-SET SQL_SELECT_LIMIT=1000;
+SET SQL_LOG_BIN=0
 
 onlyif mysql
 statement ok
-SHOW CHARSET;
+SHOW MASTER STATUS
 
 onlyif mysql
 statement ok
-SHOW COLLATION;
+SHOW ALL SLAVES STATUS
 
 onlyif mysql
 statement ok
-SET net_write_timeout=600;
+SET SQL_SELECT_LIMIT=1000
+
+onlyif mysql
+statement ok
+SHOW CHARSET
+
+onlyif mysql
+statement ok
+SHOW COLLATION
+
+onlyif mysql
+statement ok
+SET net_write_timeout=600