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 /sql/sql_binlog.cc | |
| parent | 5ea5a7f7e79d78920fa76527fadfbec0c87f24c8 (diff) | |
| download | mariadb-git-0aa6817e861bf9f63c819c60077921d53b90727b.tar.gz | |
name clash with gnutls on on base64_encode
Diffstat (limited to 'sql/sql_binlog.cc')
| -rw-r--r-- | sql/sql_binlog.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_binlog.cc b/sql/sql_binlog.cc index f0465cdf5bf..1967b74e737 100644 --- a/sql/sql_binlog.cc +++ b/sql/sql_binlog.cc @@ -60,7 +60,7 @@ void mysql_client_binlog_statement(THD* thd) my_error(ER_SYNTAX_ERROR, MYF(0)); DBUG_VOID_RETURN; } - size_t decoded_len= base64_needed_decoded_length(coded_len); + size_t decoded_len= my_base64_needed_decoded_length(coded_len); /* option_bits will be changed when applying the event. But we don't expect @@ -124,7 +124,7 @@ void mysql_client_binlog_statement(THD* thd) strptr < thd->lex->comment.str + thd->lex->comment.length ; ) { char const *endptr= 0; - int bytes_decoded= base64_decode(strptr, coded_len, buf, &endptr, + int bytes_decoded= my_base64_decode(strptr, coded_len, buf, &endptr, MY_BASE64_DECODE_ALLOW_MULTIPLE_CHUNKS); #ifndef HAVE_valgrind |