database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

name clash with gnutls on on base64_encode

Browse Source
This commit is contained in:
Sergei Golubchik
2016-09-07 19:16:43 +02:00
parent 5ea5a7f7e7
commit 0aa6817e86
7 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_binlog.cc
View File

@ -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