Merge branch 'release-9.0-beta.1' into patch-1

stevenayu · web-flow · commit 3980818280ef · 2025-03-25T22:30:05.000+08:00
diff --git a/contrib/tiflash-proxy b/contrib/tiflash-proxy
@@ -1 +1 @@
-Subproject commit b99342a4b000ff6d6e145d0f5f88aa9516078a6c
+Subproject commit 6a5c42d6714148880812d31ae81f80e07b53a067
diff --git a/tests/fullstack-test/expr/duration_pushdown.test b/tests/fullstack-test/expr/duration_pushdown.test
@@ -121,7 +121,7 @@ mysql> create table test.time_test(id int(11),v1 time(3) not null, v2 time(3));
 mysql> insert into test.time_test values(1,'20:20:20','20:20:20');
 mysql> alter table test.time_test set tiflash replica 1;
 func> wait_table test time_test
-mysql> use test; set tidb_enforce_mpp=1; set tidb_isolation_read_engines='tiflash'; select distinct v1 from(select v1 from time_test union all select v2 from time_test);
+mysql> use test; set tidb_enforce_mpp=1; set tidb_isolation_read_engines='tiflash'; select distinct v1 from(select v1 from time_test union all select v2 from time_test) a;
 +--------------+
 | v1           |
 +--------------+
