Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop
This commit is contained in:
		@ -159,7 +159,7 @@ MYSQL_MONITOR *handle;
 | 
				
			|||||||
		handle->master = NULL;
 | 
							handle->master = NULL;
 | 
				
			||||||
		handle->connect_timeout=DEFAULT_CONNECT_TIMEOUT;
 | 
							handle->connect_timeout=DEFAULT_CONNECT_TIMEOUT;
 | 
				
			||||||
		handle->read_timeout=DEFAULT_READ_TIMEOUT;
 | 
							handle->read_timeout=DEFAULT_READ_TIMEOUT;
 | 
				
			||||||
		handle->write_timeout=DEFAULT_READ_TIMEOUT;
 | 
							handle->write_timeout=DEFAULT_WRITE_TIMEOUT;
 | 
				
			||||||
		spinlock_init(&handle->lock);
 | 
							spinlock_init(&handle->lock);
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	handle->tid = (THREAD)thread_start(monitorMain, handle);
 | 
						handle->tid = (THREAD)thread_start(monitorMain, handle);
 | 
				
			||||||
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user