diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2006-08-25 11:55:43 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2006-08-25 11:55:43 -0400 |
| commit | 3f53d3d57d302a86cc3e0306ec2a7677460fc13f (patch) | |
| tree | 9380c0082be39f0a22e1cc94957f16d75b66c7f6 /include/mysql.h | |
| parent | 37c33a0ff605e89a5336af0a9601e8b4f4eeb0a5 (diff) | |
| parent | 0c1ccbf014e9d58752a710067b0245b968ace45f (diff) | |
| download | mariadb-git-3f53d3d57d302a86cc3e0306ec2a7677460fc13f.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/release/mysql-5.0-release_mergable
into zippy.cornsilk.net:/home/cmiller/work/mysql/release/mysql-5.0-maint
include/mysql.h:
Auto merged
include/mysql_com.h:
Auto merged
sql-common/client.c:
Auto merged
Diffstat (limited to 'include/mysql.h')
| -rw-r--r-- | include/mysql.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/mysql.h b/include/mysql.h index 72e5c457d5a..ae4a8222c5b 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -165,7 +165,6 @@ struct st_mysql_options { char *ssl_ca; /* PEM CA file */ char *ssl_capath; /* PEM directory of CA-s? */ char *ssl_cipher; /* cipher to use */ - my_bool ssl_verify_server_cert; /* if to verify server cert */ char *shared_memory_base_name; unsigned long max_allowed_packet; my_bool use_ssl; /* if to use SSL or not */ |