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

Changed name for bad fd

Browse Source 
Changed name for bad fd
This commit is contained in:
MassimilianoPinto
2015-11-27 09:43:58 +01:00
parent ba135c5548
commit 592e4d06cb
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/include/blr.h
View File

@ -184,7 +184,7 @@
#define SLAVE_POS_READ_OK 0x00 #define SLAVE_POS_READ_OK 0x00
#define SLAVE_POS_READ_ERR 0xff #define SLAVE_POS_READ_ERR 0xff
#define SLAVE_POS_READ_UNSAFE 0xfe #define SLAVE_POS_READ_UNSAFE 0xfe
#define SLAVE_POS_FSTAT_ERR 0xfd #define SLAVE_POS_BAD_FD 0xfd
/** /**
* Some useful macros for examining the MySQL Response packets * Some useful macros for examining the MySQL Response packets

2
server/modules/routing/binlog/blr_file.c
View File

@ -422,7 +422,7 @@ struct stat statb;
filelen = statb.st_size; filelen = statb.st_size;
else { else {
if (file->fd == -1) { if (file->fd == -1) {
hdr->ok = SLAVE_POS_FSTAT_ERR; hdr->ok = SLAVE_POS_BAD_FD;
snprintf(errmsg, BINLOG_ERROR_MSG_LEN, "blr_read_binlog called with invalid file->fd, pos %lu", pos); snprintf(errmsg, BINLOG_ERROR_MSG_LEN, "blr_read_binlog called with invalid file->fd, pos %lu", pos);
spinlock_release(&file->lock); spinlock_release(&file->lock);
return NULL; return NULL;

2
server/modules/routing/binlog/blr_slave.c
View File

@ -2024,7 +2024,7 @@ char read_errmsg[BINLOG_ERROR_MSG_LEN+1];
if (record == NULL) { if (record == NULL) {
slave->stats.n_failed_read++; slave->stats.n_failed_read++;
if (hdr.ok == SLAVE_POS_FSTAT_ERR) { if (hdr.ok == SLAVE_POS_BAD_FD) {
MXS_ERROR("%s Slave %s:%i, server-id %d, binlog '%s', %s", MXS_ERROR("%s Slave %s:%i, server-id %d, binlog '%s', %s",
router->service->name, router->service->name,
slave->dcb->remote, slave->dcb->remote,