diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-09-07 19:16:43 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-09-12 17:51:52 +0200 |
| commit | 0aa6817e861bf9f63c819c60077921d53b90727b (patch) | |
| tree | aa9992c1f6c43eabf2dac91f68182548edcd88fb /plugin/feedback | |
| parent | 5ea5a7f7e79d78920fa76527fadfbec0c87f24c8 (diff) | |
| download | mariadb-git-0aa6817e861bf9f63c819c60077921d53b90727b.tar.gz | |
name clash with gnutls on on base64_encode
Diffstat (limited to 'plugin/feedback')
| -rw-r--r-- | plugin/feedback/utils.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugin/feedback/utils.cc b/plugin/feedback/utils.cc index b83b69be0ce..327db69feda 100644 --- a/plugin/feedback/utils.cc +++ b/plugin/feedback/utils.cc @@ -422,8 +422,8 @@ int calculate_server_uid(char *dest) compute_sha1_hash((uint8*) shabuf, (char*) rawbuf, sizeof(rawbuf)); - assert(base64_needed_encoded_length(sizeof(shabuf)) <= SERVER_UID_SIZE); - base64_encode(shabuf, sizeof(shabuf), dest); + assert(my_base64_needed_encoded_length(sizeof(shabuf)) <= SERVER_UID_SIZE); + my_base64_encode(shabuf, sizeof(shabuf), dest); return 0; } |