hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename conflicting objects

Browse Source 
The START_ENCRYPTION_EVENT is the name of an object that is exposed by the
Connector-C.
This commit is contained in:
Markus Mäkelä
2018-06-07 16:02:42 +03:00
parent 5268d032c5
commit d094e93209
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/modules/routing/binlogrouter/blr.cc
View File

@ -1111,12 +1111,12 @@ createInstance(SERVICE *service, char **options)
}
/**
* Don't start replication if binlog has START_ENCRYPTION_EVENT
* Don't start replication if binlog has MXS_START_ENCRYPTION_EVENT
* but binlog encryption is off
*/
if (!inst->encryption.enabled && inst->encryption_ctx)
{
MXS_ERROR("Found START_ENCRYPTION_EVENT but "
MXS_ERROR("Found MXS_START_ENCRYPTION_EVENT but "
"binlog encryption option is currently Off. Replication can't start right now. "
"Please restart MaxScale with option set to On");
@ -1126,7 +1126,7 @@ createInstance(SERVICE *service, char **options)
inst->m_errno = BINLOG_FATAL_ERROR_READING;
inst->m_errmsg = MXS_STRDUP_A("HY000 Binlog encryption is Off"
" but current binlog file has"
" the START_ENCRYPTION_EVENT");
" the MXS_START_ENCRYPTION_EVENT");
return (MXS_ROUTER *)inst;
}