`slack-vitess-r15.0.5`: backport vitessio/vitess#14428 from v16#166

Merged

timvaillancourt merged 3 commits intoslack-vitess-r15.0.5from pr-14426-slack-vitess-r15.0.5

Nov 13, 2023

+124-45

Commits on Nov 9, 2023