mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-23 08:45:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '10.1' into 10.2

Browse source
This commit is contained in:
Sergei Golubchik 2017-10-24 14:53:18 +02:00
commit e0a1c745ec
186 changed files with 3307 additions and 1578 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sql-common/client.c
View file

@ -1150,7 +1150,7 @@ void mysql_read_default_options(struct st_mysql_options *options,
break;
case OPT_pipe:
options->protocol = MYSQL_PROTOCOL_PIPE;
break;
break;
case OPT_connect_timeout:
case OPT_timeout:
if (opt_arg)