The percona_server_variables_release conflict is trivial and needs a simple re-record. It does not affect the core of the patch.
The percona_ server_ variables_ release conflict is trivial and needs a simple re-record. It does not affect the core of the patch.