database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2021-08-26 10:20:17 +03:00
parent ded27d2896 87ff4ba7c8
commit cc4e20e56f
15 changed files with 95 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/mysql_setpermission.sh
View File

@@ -105,11 +105,15 @@ else {
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