From 655a2f039fd1a9ace6c0b4563d00898f20095112 Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Feb 26 2022 04:26:22 +0000 Subject: Remove the file of the patch 'mariadb-scripts-setpermission.patch' The patch stopped being applied during the rebase to 10.5.13 (commit #314d2bf), because it was upstreamed, but I forgot to remove the patch file. --- diff --git a/mariadb-scripts-setpermission.patch b/mariadb-scripts-setpermission.patch deleted file mode 100644 index 58e07bd..0000000 --- a/mariadb-scripts-setpermission.patch +++ /dev/null @@ -1,30 +0,0 @@ -This patch fixes bug in mysql_setpermission perl script -by adding conditionally port information to connections parameters. - -More information about this bug: https://bugzilla.redhat.com/show_bug.cgi?id=1976224 - -This bug has been fixed in upstream. -Patch can be removed when new version with fix is released. - -https://github.com/MariaDB/server/pull/1896 - ---- mariadb/scripts/mysql_setpermission_a.sh 2068-11-11 14:01:07.762595716 +0100 -+++ mariadb/scripts/mysql_setpermission.sh 2070-11-11 14:33:05.224012458 +0100 -@@ -105,11 +105,15 @@ - - if ($opt_socket and -S $opt_socket) - { -- $dsn .= "${prefix}_socket=$opt_socket"; -+ $dsn .= "${prefix}_socket=$opt_socket"; - } - else - { -- $dsn .= "host=$sqlhost;port=$opt_port"; -+ $dsn .= "host=$sqlhost"; -+ if ($sqlhost ne "localhost") -+ { -+ $dsn .= ";port=$opt_port"; -+ } - } - - # make the connection to MariaDB