diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-04-26 22:24:25 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-04-26 22:24:25 +0200 |
| commit | 88724885d545357c76dbda02a69a488a45296071 (patch) | |
| tree | 67ff2b286c7d42090d89349a6b6c10d80480feb5 /client/mysql.cc | |
| parent | d61f1823d67771c1d4e48b8adb4819d748e4d747 (diff) | |
| parent | c1d64ccc1b227e862f5cbaa991ce5525c59ab2ef (diff) | |
| download | mariadb-git-88724885d545357c76dbda02a69a488a45296071.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/bug17208/my50-bug17208
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
client/mysql.cc:
Auto merged
include/mysql.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql-common/client.c:
SCCS merged
Diffstat (limited to 'client/mysql.cc')
| -rw-r--r-- | client/mysql.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 5b53570bf34..4e81e2ae686 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -3125,6 +3125,8 @@ sql_real_connect(char *host,char *database,char *user,char *password, if (opt_use_ssl) mysql_ssl_set(&mysql, opt_ssl_key, opt_ssl_cert, opt_ssl_ca, opt_ssl_capath, opt_ssl_cipher); + mysql_options(&mysql,MYSQL_OPT_SSL_VERIFY_SERVER_CERT, + (char*)&opt_ssl_verify_server_cert); #endif if (opt_protocol) mysql_options(&mysql,MYSQL_OPT_PROTOCOL,(char*)&opt_protocol); |