rpms/mariadb
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix mysql_setpermission bug (#1976224)

Browse Source 
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
This commit is contained in:
Marek Kulik 2021-08-26 12:57:36 +02:00
parent 8461c0e791
commit 3b8ee8379a
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
mariadb-scripts-setpermission.patch Normal file
View File

@ -0,0 +1,30 @@
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

8
mariadb.spec
View File

@ -154,7 +154,7 @@
Name: mariadb Name: mariadb
Version: 10.5.12 Version: 10.5.12
Release: 1%{?with_debug:.debug}%{?dist} Release: 2%{?with_debug:.debug}%{?dist}
Epoch: 3 Epoch: 3
Summary: A very fast and robust SQL database server Summary: A very fast and robust SQL database server
@ -217,6 +217,8 @@ Patch10: %{pkgnamepatch}-ssl-cipher-tests.patch
Patch11: %{pkgnamepatch}-pcdir.patch Patch11: %{pkgnamepatch}-pcdir.patch
# Patch15: Add option to edit groonga's and groonga-normalizer-mysql install path # Patch15: Add option to edit groonga's and groonga-normalizer-mysql install path
Patch15: %{pkgnamepatch}-groonga.patch Patch15: %{pkgnamepatch}-groonga.patch
# Patch16: Fix port bug in mysql_setpermission perl script
Patch16: %{pkgnamepatch}-scripts-setpermission.patch
BuildRequires: make BuildRequires: make
BuildRequires: cmake gcc-c++ BuildRequires: cmake gcc-c++
@ -745,6 +747,7 @@ rm -r storage/rocksdb/
%patch10 -p1 %patch10 -p1
%patch11 -p1 %patch11 -p1
%patch15 -p1 %patch15 -p1
%patch16 -p1
# generate a list of tests that fail, but are not disabled by upstream # generate a list of tests that fail, but are not disabled by upstream
cat %{SOURCE50} | tee -a mysql-test/unstable-tests cat %{SOURCE50} | tee -a mysql-test/unstable-tests
@ -1635,6 +1638,9 @@ fi
%endif %endif
%changelog %changelog
* Thu Aug 26 2021 Marek Kulik <mkulik@redhat.com> - 3:10.5.12-2
- Add patch for mysql_setpermissions: BZ#1976224
* Sat Aug 07 2021 Michal Schorm <mschorm@redhat.com> - 3:10.5.12-1 * Sat Aug 07 2021 Michal Schorm <mschorm@redhat.com> - 3:10.5.12-1
- Rebase to 10.5.12 - Rebase to 10.5.12