Hi Shengjing! Thanks for the quick fix!
I have done the equivalent change in https://salsa.debian.org/mariadb-team/mariadb-server/-/commit/35a08b54ee6a2d6457883f56aea769c025f01550 and will upload in a couple of days unless any other issues arise during review of https://salsa.debian.org/mariadb-team/mariadb-server/-/merge_requests/97. Everything seems to work and no regressions were found. - Otto