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

Merge branch 'develop' into 1.2.1-binlog_router_trx

Browse Source
This commit is contained in:
MassimilianoPinto
2015-08-07 14:48:43 +02:00
parent 479e4e3203 ba32596603
commit 0239fb0650
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Documentation/About/Limitations.md
View File

@ -8,11 +8,7 @@ This section describes the limitations that are common to all configuration of p
## Limitations with MySQL Protocol support ## Limitations with MySQL Protocol support
* Compression Compression is not included in MySQL server handshake
* SSL
Both capabilities are not included in MySQL server handshake
## Limitations with MySQL Master/Slave Replication monitoring ## Limitations with MySQL Master/Slave Replication monitoring
@ -22,7 +18,9 @@ Master selection is based only on MIN(wsrep_local_index), no other server parame
## Limitations in the connection router ## Limitations in the connection router
If Master changes (ie. new Master promotion) during current connection the router cannot check the change * If Master changes (ie. new Master promotion) during current connection the router cannot check the change
* LONGBLOB is not supported
## Limitations in the Read/Write Splitter ## Limitations in the Read/Write Splitter
@ -93,4 +91,3 @@ Most imaginable reasons are related to replication lag but it could be possible
## Authentication Related Limitations ## Authentication Related Limitations
MySQL old passwords are not supported MySQL old passwords are not supported

4
server/core/gateway.c
View File

@ -1649,7 +1649,7 @@ int main(int argc, char **argv)
if(errno != EEXIST){ if(errno != EEXIST){
fprintf(stderr, fprintf(stderr,
"Error: Cannot create data directory: %s\n",datadir); "Error: Cannot create data directory '%s': %d %s\n",datadir,errno,strerror(errno));
goto return_main; goto return_main;
} }
} }
@ -1660,7 +1660,7 @@ int main(int argc, char **argv)
if(errno != EEXIST){ if(errno != EEXIST){
fprintf(stderr, fprintf(stderr,
"Error: Cannot create data directory: %s\n",datadir); "Error: Cannot create data directory '%s': %d %s\n",datadir,errno,strerror(errno));
goto return_main; goto return_main;
} }
} }

8
server/modules/monitor/mmmon.c
View File

@ -127,6 +127,7 @@ startMonitor(void *arg,void* opt)
handle->id = MONITOR_DEFAULT_ID; handle->id = MONITOR_DEFAULT_ID;
handle->master = NULL; handle->master = NULL;
handle->script = NULL; handle->script = NULL;
handle->detectStaleMaster = false;
memset(handle->events,false,sizeof(handle->events)); memset(handle->events,false,sizeof(handle->events));
spinlock_init(&handle->lock); spinlock_init(&handle->lock);
} }
@ -198,7 +199,8 @@ startMonitor(void *arg,void* opt)
static void static void
stopMonitor(void *arg) stopMonitor(void *arg)
{ {
MM_MONITOR *handle = (MM_MONITOR *)arg; MONITOR* mon = arg;
MM_MONITOR *handle = (MM_MONITOR *)mon->handle;
handle->shutdown = 1; handle->shutdown = 1;
thread_wait((void *)handle->tid); thread_wait((void *)handle->tid);
@ -564,8 +566,8 @@ monitorMain(void *arg)
MONITOR* mon = (MONITOR*)arg; MONITOR* mon = (MONITOR*)arg;
MM_MONITOR *handle; MM_MONITOR *handle;
MONITOR_SERVERS *ptr; MONITOR_SERVERS *ptr;
int detect_stale_master; int detect_stale_master = false;
MONITOR_SERVERS *root_master; MONITOR_SERVERS *root_master = NULL;
size_t nrounds = 0; size_t nrounds = 0;
spinlock_acquire(&mon->lock); spinlock_acquire(&mon->lock);