diff options
| author | Ramil Kalimullin <ramil.kalimullin@oracle.com> | 2016-02-19 23:31:10 +0400 |
|---|---|---|
| committer | Ramil Kalimullin <ramil.kalimullin@oracle.com> | 2016-02-19 23:31:10 +0400 |
| commit | b3e9211e48a3fb586e88b0270a175d2348935424 (patch) | |
| tree | 6289051e87d89f272a9392d749ce580a83eb2743 /client/mysqlslap.c | |
| parent | d9c541cb1be5b239787833d9d499067d44ea44d3 (diff) | |
| download | mariadb-git-b3e9211e48a3fb586e88b0270a175d2348935424.tar.gz | |
WL#9072: Backport WL#8785 to 5.5
Diffstat (limited to 'client/mysqlslap.c')
| -rw-r--r-- | client/mysqlslap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/client/mysqlslap.c b/client/mysqlslap.c index 8c50898fb01..eb2b577948c 100644 --- a/client/mysqlslap.c +++ b/client/mysqlslap.c @@ -1,5 +1,5 @@ /* - Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -355,9 +355,9 @@ int main(int argc, char **argv) (char*) &opt_enable_cleartext_plugin); if (!opt_only_print) { - if (!(mysql_real_connect(&mysql, host, user, opt_password, - NULL, opt_mysql_port, - opt_mysql_unix_port, connect_flags))) + if (!(mysql_connect_ssl_check(&mysql, host, user, opt_password, + NULL, opt_mysql_port, opt_mysql_unix_port, + connect_flags, opt_ssl_required))) { fprintf(stderr,"%s: Error when connecting to server: %s\n", my_progname,mysql_error(&mysql)); |