diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-08-25 10:25:48 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-08-25 10:25:48 +0200 |
| commit | 27412877dbcf601676f4515a99b2abee1f19623b (patch) | |
| tree | 2cb1a2e1a58ba10f2a96fcdec43f5ed77c326fd0 /sql-common/client.c | |
| parent | f2033df6ac0f64664d9aad2d56fdd74f4bf9d666 (diff) | |
| parent | a544225d0a772bd4b67c96f5861ecc0ef7e69bba (diff) | |
| download | mariadb-git-27412877dbcf601676f4515a99b2abee1f19623b.tar.gz | |
Merge branch '10.2' into bb-10.2-ext
Diffstat (limited to 'sql-common/client.c')
| -rw-r--r-- | sql-common/client.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 5af8c737889..2792c575aef 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -1150,6 +1150,7 @@ void mysql_read_default_options(struct st_mysql_options *options, break; case OPT_pipe: options->protocol = MYSQL_PROTOCOL_PIPE; + break; case OPT_connect_timeout: case OPT_timeout: if (opt_arg) |