issue #23241: bring in public metasql