diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-08-26 10:20:17 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-08-26 10:20:17 +0300 |
| commit | cc4e20e56f1e558a23ef15be5819fde0f2dfd284 (patch) | |
| tree | a244dd8a3bea772c997a02f8c48fef1426a39181 /scripts | |
| parent | ded27d28968e6e47e901b9472001550ec3dbfdd1 (diff) | |
| parent | 87ff4ba7c874ccb8a5b1105571569a94ca959d53 (diff) | |
| download | mariadb-git-cc4e20e56f1e558a23ef15be5819fde0f2dfd284.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysql_setpermission.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/scripts/mysql_setpermission.sh b/scripts/mysql_setpermission.sh index 29311b9c101..6f0ad72c1d9 100644 --- a/scripts/mysql_setpermission.sh +++ b/scripts/mysql_setpermission.sh @@ -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 |