e043d204b4
blr_send_custom_error with errno and state
...
blr_send_custom_error with errno and state
2015-09-30 15:59:48 +02:00
f9ee9ca028
Addition of send_slave_heartbeat option
...
Addition of send_slave_heartbeat option
2015-09-30 14:39:26 +02:00
4aa161d78e
Merge branch 'develop' into 1.2.1-binlog_router_trx
2015-09-30 14:20:39 +02:00
96f76a1f2e
Changed the way max_sescmd_history works and combined disable_sescmd_history and disable_slave_recovery.
...
Before these changes when max_sescmd_history was used the session
was closed when the limit was exceeded. With this change, when the
limit is exceeded the recovery of slaves and the session command history
are both disabled. This will allow the sessions to continue while still
keeping the old functionality of limited salve replacement.
The disable_sescmd_history and disable_slave_recovery parameters were combined
so that disabling the session command history will also disable slave recovery.
This way no harm can be done with disable_sescmd_history.
2015-09-29 12:03:22 +03:00
b6df52a68e
Addition of slave heartbeat check
...
Addition of slave heartbeat check
2015-09-25 15:58:36 +02:00
db93d868f8
Removed previous conflict line
...
Removed previous conflict line
2015-09-10 14:58:09 +02:00
c9fd82839b
Merge from develop
...
Merge from develop
2015-09-10 14:53:50 +02:00
7d00a3670d
Addition of maxbinlogcheck, a new utility in bin
...
Addition of maxbinlogcheck, a new utility in bin
2015-09-10 14:37:49 +02:00
c7a5734e0c
Added missing include to sharding_common.h
2015-09-09 13:02:18 +03:00
67f8520c38
Added missing include to sharding_common.h
2015-09-09 13:00:10 +03:00
f25b6389fc
Support for SHOW WARNINGS
...
Support for SHOW WARNINGS
2015-09-04 22:30:02 +02:00
5153c16eac
Added BLRM_MASTER_REGITRATION_QUERY_LEN constant
...
Added BLRM_MASTER_REGITRATION_QUERY_LEN constant
2015-08-25 11:27:15 +02:00
3fe0c074c5
Added strerror_r and new constants
...
Added strerror_r and new constants
2015-08-24 15:02:22 +02:00
599e2fdc6c
Small improvements for string buffers
...
Small improvements an constants added in string buffers
2015-08-24 11:38:24 +02:00
e103aa46a8
Addition of BLR_TYPE_STRING and BLR_TYPE_INT
...
Addition of BLR_TYPE_STRING and BLR_TYPE_INT for SQL variable names
replies
2015-08-24 10:11:26 +02:00
4242d28e13
Added support for new options
...
Added support for new options:
master_uuid, master_hostname, master_version
If set, those values will be sent to slaves instead of
saved master responses
2015-08-21 16:31:40 +02:00
57c2d196d4
Added validation and parsing for CHANGE MASTER TO
...
Added validation and parsing for CHANGE MASTER TO
2015-08-20 09:59:57 +02:00
895989446d
MXS-224: Added SQL commands to the log message at slave disconnect time
...
MXS-224: Added SQL commands to the log message at slave disconnect time
2015-08-19 12:04:15 +02:00
de902f316a
MXS-224: Added SQL commands to the log message at slave disconnect time
...
MXS-224: Added SQL commands to the log message at slave disconnect time
2015-08-19 11:58:42 +02:00
53c35b05ab
Added default heartbeat set via define and blr_last_event_description
...
Added default heartbeat set via define and blr_last_event_description()
2015-08-17 14:05:41 +02:00
e65e2b3a84
Merge branch 'develop' into 1.2.1-binlog_router_trx
2015-08-17 12:12:16 +02:00
c3e1e2b345
Merge branch 'develop' into schemarouter_refresh
...
Conflicts:
Documentation/Tutorials/Replication-Proxy-Binlog-Router-Tutorial.md
2015-08-08 11:25:54 +03:00
e5a2e5cd1f
Improvements added in stop/start slave and change master
...
Improvements added in stop/start slave and change master
2015-08-06 17:47:37 +02:00
f91a339674
Initial implementation of transaction safety
...
Initial implementation of transaction safety
2015-08-05 14:29:17 +02:00
61c47375d5
Merge branch 'develop' into 1.2.1-binlog_router
...
Conflicts:
server/core/server.c
server/include/server.h
server/modules/include/blr.h
server/modules/routing/binlog/blr.c
server/modules/routing/binlog/blr_file.c
server/modules/routing/binlog/blr_master.c
server/modules/routing/binlog/blr_slave.c
2015-08-04 07:59:44 -04:00
aa6294f1f2
Fixed binlogrouter not working with C99 flags.
2015-07-20 08:59:35 +03:00
78eab19c62
Fixed compiler warnings.
2015-07-14 17:13:09 +03:00
e146b2d632
Merge branch 'release-1.2' into schemarouter_refresh
2015-07-13 19:10:05 +03:00
0134fdc397
Merge branch 'release-1.2' into develop
...
Conflicts:
server/core/dbusers.c
2015-07-13 15:52:36 +03:00
9728ec6169
Addition of new mariadb10 events to diagnostics()
...
Addition of new mariadb10 events to diagnostics()
2015-07-13 12:54:04 +03:00
ba417ef633
Merge remote-tracking branch 'origin/develop' into MXS-122
...
Conflicts:
server/core/dcb.c
2015-07-08 14:54:22 +01:00
10d690273d
Resolve compiler warnings
2015-07-08 11:35:41 +01:00
993ec723b9
Added verbose client errors to schemarouter.
2015-07-02 13:28:23 +03:00
3989e0dc6b
Merge branch 'develop' into schemarouter_refresh
2015-07-02 12:20:14 +03:00
5165c6b981
master.ini contains now master configuration
...
master.ini contains now master configuration
It can be created or modified by CHANGE MASTER TO
Added new BLRM_UNCONFIGURED state
2015-06-30 16:10:02 +02:00
530011b9b8
Merge branch 'develop' into schemarouter_refresh
2015-06-27 06:33:58 +03:00
011c932c7d
Fix mistake in testing for null password; add contents with links to MaxAdmin reference guide.
2015-06-24 21:44:02 +01:00
e4bde4402b
Fix problem of certain passwords (e.g. joomla1) being treated incorrectly as null MXS-202.
2015-06-24 21:06:56 +01:00
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
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
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
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
c2d69850de
Merge branch 'develop' into schemarouter_refresh
2015-06-15 08:48:13 +03:00
b1c383b19e
Added database list refreshing to schemarouter.
2015-06-09 16:13:06 +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
1c36cfb285
Added more debug output.
2015-06-08 18:04:43 +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