diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-12-09 12:38:02 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-12-09 12:38:02 +0100 |
| commit | bec1d903d944acd5c28c3f4f2d22b84ddae63ea2 (patch) | |
| tree | 8a903859333de1648f789a2985fd62e856ebfa05 /include/sql_common.h | |
| parent | 6ae5f0efea392e3fdb285afc1bafdae16888b96a (diff) | |
| download | mariadb-git-bec1d903d944acd5c28c3f4f2d22b84ddae63ea2.tar.gz | |
Do the partial merge of WL#5602 correctly:
Remove unused code (that should not have been merged)
Add protocol extension (that should have been merged)
Fix bugs (see pack.c)
Diffstat (limited to 'include/sql_common.h')
| -rw-r--r-- | include/sql_common.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/sql_common.h b/include/sql_common.h index e7bade7e73b..39b8ce18517 100644 --- a/include/sql_common.h +++ b/include/sql_common.h @@ -35,7 +35,6 @@ struct st_mysql_options_extention { char *default_auth; char *ssl_crl; /* PEM CRL file */ char *ssl_crlpath; /* PEM directory of CRL-s? */ - char *server_public_key_path; void (*report_progress)(const MYSQL *mysql, unsigned int stage, unsigned int max_stage, |