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

Merge 10.11 into 11.0

Browse Source
This commit is contained in:
Marko Mäkelä
2023-07-04 08:20:20 +03:00
parent a9e13866e2 3430767e00
commit a906046f1f
30 changed files with 226 additions and 416 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
client/mysql.cc
View File

@@ -2068,8 +2068,15 @@ get_one_option(const struct my_option *opt, const char *argument,
case 'S':
if (filename[0] == '\0')
{
/* Socket given on command line, switch protocol to use SOCKETSt */
opt_protocol= MYSQL_PROTOCOL_SOCKET;
/*
Socket given on command line, switch protocol to use SOCKETSt
Except on Windows if 'protocol= pipe' has been provided in
the config file or command line.
*/
if (opt_protocol != MYSQL_PROTOCOL_PIPE)
{
opt_protocol= MYSQL_PROTOCOL_SOCKET;
}
}
break;
case 'I':