diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-02-25 18:19:55 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-02-25 18:19:55 +0100 |
| commit | 00d1db7a38b17d4512a6ba5147926608aca5624d (patch) | |
| tree | c2b28145304e9eacf79fcabaeb962a20d79fec93 /plugin/feedback | |
| parent | 0485328d030f4b742dac7b667e8ed099beb9e9f2 (diff) | |
| parent | 0251232f8c3bca33b4dd15d6668105f3de9d024d (diff) | |
| download | mariadb-git-00d1db7a38b17d4512a6ba5147926608aca5624d.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'plugin/feedback')
| -rw-r--r-- | plugin/feedback/feedback.cc | 1 | ||||
| -rw-r--r-- | plugin/feedback/url_base.cc | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/plugin/feedback/feedback.cc b/plugin/feedback/feedback.cc index 28a907a9d93..c7861d99004 100644 --- a/plugin/feedback/feedback.cc +++ b/plugin/feedback/feedback.cc @@ -376,7 +376,6 @@ static MYSQL_SYSVAR_STR(http_proxy, http_proxy, PLUGIN_VAR_READONLY | PLUGIN_VAR_RQCMDARG, "Proxy server host:port.", NULL, NULL,0); - #ifndef DBUG_OFF static MYSQL_SYSVAR_ULONG(debug_startup_interval, debug_startup_interval, PLUGIN_VAR_RQCMDARG, "for debugging only", diff --git a/plugin/feedback/url_base.cc b/plugin/feedback/url_base.cc index ad99249c268..6afbcd7c8f4 100644 --- a/plugin/feedback/url_base.cc +++ b/plugin/feedback/url_base.cc @@ -48,7 +48,6 @@ Url* Url::create(const char *url, size_t url_length) return self; } - int Url::parse_proxy_server(const char *proxy_server, size_t proxy_length, LEX_STRING *host, LEX_STRING *port) { |