Commit Graph

5072 Commits

Author SHA1 Message Date
7a8c307515 MXS-171: https://mariadb.atlassian.net/browse/MXS-171
Added option which allows the master server to be used for reads.
2015-06-24 19:23:43 +03:00
cd7f7aba57 CHAGE MASTER TO new binlog requires MASTER_LOG_POS to be set
CHAGE MASTER TO new binlog requires MASTER_LOG_POS to be set
2015-06-23 17:42:42 +02:00
543873a44f Add default for missing MASTER_LOG_POS
Add default for missing MASTER_LOG_POS

4 if binlog is a new one
current pos if binlog = current one
2015-06-23 17:19:54 +02:00
09fdb0a2c2 Hopefully final tidy up. 2015-06-23 14:58:53 +01:00
7a0a010a86 CHANGE MASTER error messages improvement
CHANGE MASTER error messages improvement
New Start Slave implementation
Error Handling when master_state is BLRM_BINLOGDUMP: in case of error
master replication stops and new state is BLRM_SLAVE_STOPPED
2015-06-23 15:34:56 +02:00
022179ca12 start slave may create a new binlog file
start slave may create a new binlog file
2015-06-23 10:05:39 +02:00
71664f162b Merge branch 'develop' into dev-mdb10 2015-06-22 19:27:34 +03:00
15e6d6f9fc fix for missing crc check in blr_slave_fake_rotate()
fix for missing crc check in blr_slave_fake_rotate()
2015-06-22 18:24:39 +02:00
2816d87013 fix for missing crc check in blr_slave_fake_rotate()
fix for missing crc check in blr_slave_fake_rotate()

fix for missing @@version_comment in order to allow mysql client get in
2015-06-22 18:21:43 +02:00
2d9c9425c5 Merge branch 'binlog_router_mariadb10' into dev-mdb10
Conflicts:
	server/core/config.c
2015-06-22 19:16:38 +03:00
b880350cf3 Complete merge of latest develop branch 2015-06-22 10:39:13 +01:00
8c900e73de removed extra blr_file_add_magic
removed extra blr_file_add_magic
2015-06-22 10:46:00 +02:00
5bc07c5100 Added error handling in BINLOG_DUMP phase
Added error handling in BINLOG_DUMP phase: router goes into
BLRM_SLAVE_STOPPED state

Removed blr_file_add_magic called twice
2015-06-22 10:35:02 +02:00
c3aa5beeb4 Added missing initialization from MM monitor. 2015-06-21 19:32:19 +03:00
4c38e2224b Merge remote-tracking branch 'origin/develop' into MXS-122
Conflicts:
	server/core/CMakeLists.txt
	server/core/dcb.c
	server/include/dcb.h
	server/include/server.h
	server/modules/protocol/mysql_backend.c
2015-06-19 23:12:54 +01:00
f6369a1661 Changed from server unique name to ip:port in monitor script initiaion. 2015-06-18 18:03:55 +03:00
64bb68c12c inst->master_chksum = true; is put back
inst->master_chksum = true; is put back
2015-06-17 12:23:31 +02:00
f0aed1f666 Fixed possible null pointer dereferences in mysql_backend. 2015-06-17 10:05:56 +03:00
4952dc48bb Added constraints to CHANGE MASTER TO options
Added constraints to CHANGE MASTER TO options  MASTER_LOG_FILE and
MASTER_LOG_POS
2015-06-15 15:03:27 +02:00
c2d69850de Merge branch 'develop' into schemarouter_refresh 2015-06-15 08:48:13 +03:00
84d5af1e00 Throw away poll events that occur for persistent pool DCBs with no related session; fix typos. 2015-06-14 18:19:30 +01:00
f602121459 Added configurable SSL certificate verification depth and updated the documentation in the code. 2015-06-12 21:21:06 +03:00
5936916e04 Merge branch 'develop' into MXS-129 2015-06-12 13:53:41 +03:00
f6f5de92eb Merge branch 'develop' into schemarouter_refresh 2015-06-12 09:51:35 +03:00
fe2062b5b0 Fixed a regression in mysql_mon.c which caused a memory leak 2015-06-11 19:50:51 +03:00
2b2e81feb2 Fix to MXS-181: https://mariadb.atlassian.net/browse/MXS-181
Added TCP_NODELAY to socket options.
2015-06-11 19:05:05 +03:00
eb8ec650ae Merge branch 'develop' into schemarouter_refresh 2015-06-11 18:47:37 +03:00
3d3b397a67 Merge branch 'develop' of https://github.com/srirampatil/MaxScale into srirampatil-develop
Conflicts:
	server/modules/filter/qlafilter.c
2015-06-11 18:41:56 +03:00
698bafb591 Merge branch 'develop' into schemarouter_refresh 2015-06-11 16:54:06 +03:00
03470bcd70 Merge branch 'develop' into MXS-129 2015-06-11 10:29:57 +03:00
c15469013e Fixed non-SSL connections to SSL enabled services failing. 2015-06-10 15:05:39 +03:00
3fb1213dee Added more error logging when monitor scripts fail. 2015-06-10 06:09:42 +03:00
de2910f75b Fixed SSL_accept failing if the GWBUF with the initial MySQL auth packet contains some of the SSL authentication data. 2015-06-09 22:27:15 +03:00
196d41cb88 More debug output. 2015-06-09 20:02:45 +03:00
d94ac9c637 Added new general error message
Added new general error message
Added
Slave_IO_Running: No
Slave_SQL_Running: No

when slave is stopped
2015-06-09 16:46:41 +02:00
b1c383b19e Added database list refreshing to schemarouter. 2015-06-09 16:13:06 +03:00
152f9bbc4a Merge remote-tracking branch 'origin/develop' into MXS-122 2015-06-09 13:51:55 +01:00
393e25e953 Fix bug in dcb; rearrange mysql_backend gw_backend_close to cope with receiving DCB that is no longer linked to a session. 2015-06-09 12:03:58 +01:00
d0e92a15f8 Move decrement of server connections into zombie processing; introduce dcb_close_finish to be called either in dcb_close or when persistent dcb is discarded. 2015-06-09 11:41:43 +01:00
1cbc7d6e7f Added error string to router->m_errmsg
Added error string to router->m_errmsg
2015-06-09 12:39:50 +02:00
f46c47651a Compile error, missing ';'
Compile error, missing ';'
2015-06-09 10:33:23 +02:00
06c5da7b17 Minor fix to SSL authentication. 2015-06-09 02:56:55 +03:00
2db4f4d771 Added error_msg to blr_slave_send_slave_status()
Added error_msg to blr_slave_send_slave_status()
2015-06-08 19:16:50 +02:00
d9234bec5f Updated logging messages
Updated logging messages
2015-06-08 17:30:26 +02:00
1c36cfb285 Added more debug output. 2015-06-08 18:04:43 +03:00
809cdb5b1e Added blr_cache_read_master_data and dcb checks
Added blr_cache_read_master_data()
Added dcb checks before calling db_close
Forced initialisation values of some parameters
2015-06-08 16:56:52 +02:00
61ea0861ff Fixed some connections hanging with SSL. 2015-06-08 14:35:31 +03:00
945e2f8132 added checks in blr_stop_slave()
errorReply sets mysql_errno into router struct
blr_slave_send_slave_status displays mysql errno
added checks in blr_stop_slave()
2015-06-05 17:37:05 +02:00
e83799648a Fixed queries getting stuck when the SSL records were of the maximum allowed size. 2015-06-05 11:00:51 +03:00
a032c94d25 Added comments to SSL tests. 2015-06-04 16:49:39 +03:00