Develop Merge

Develop Merge
This commit is contained in:
MassimilianoPinto
2017-06-30 10:48:13 +02:00
14 changed files with 61 additions and 20 deletions

View File

@ -490,17 +490,20 @@ blr_file_add_magic(int fd)
* @return Non-zero if the fie creation succeeded
*/
static int
blr_file_create(ROUTER_INSTANCE *router, char *file)
blr_file_create(ROUTER_INSTANCE *router, char *orig_file)
{
if (strlen(file) > BINLOG_FNAMELEN)
if (strlen(orig_file) > BINLOG_FNAMELEN)
{
MXS_ERROR("The binlog filename %s is longer than "
"the maximum allowed length %d.",
file,
orig_file,
BINLOG_FNAMELEN);
return 0;
}
char file[strlen(orig_file) + 1];
strcpy(file, orig_file);
int created = 0;
char err_msg[MXS_STRERROR_BUFLEN];