99720ffa9f
Merge branch 'develop' into 1.2.1-binlog_router_trx
2015-10-28 10:15:52 +01:00
3c30827f16
Report blr_print_binlog_details only if pos > 4
...
Report blr_print_binlog_details only if pos > 4
2015-10-28 10:15:05 +01:00
d7d009f3b3
Merge from develop
...
Merge from develop
2015-10-28 09:38:31 +01:00
a718c995ae
Added blr_print_binlog_details
...
Added blr_print_binlog_details
2015-10-27 17:33:15 +01:00
bad61b0740
Change binlog router to indicate it does not use router sessions via the getCapabilities interface.
2015-10-27 14:17:06 +00:00
a066b34e8e
Fix for change master to new binlog file
...
Fix for change master to new binlog file
2015-10-26 10:35:33 +01:00
8208f3a728
strerror_r update
...
strerror_r update
2015-10-23 18:44:39 +02:00
4b923ce4bc
Merge branch '1.2.1-binlog_router_trx' of https://github.com/mariadb-corporation/MaxScale into 1.2.1-binlog_router_trx
2015-10-23 16:44:21 +03:00
bf6286e598
Fix for new file creation after change master to new log file
...
Fix for new file creation after change master to new log file
2015-10-23 15:35:48 +02:00
3be5238bd7
Fixed indentation.
2015-10-23 15:05:51 +03:00
63f4bc3aec
Changed from router->binlog_lock to router->lock for transaction safety code and cleaned up code.
2015-10-23 14:54:08 +03:00
1dc48f5ed8
Merge branch 'develop' into 1.2.1-binlog_router_trx
2015-10-23 13:18:11 +02:00
40ffe21dd8
Added a variable for current event being processed after a transaction is committed.
2015-10-23 12:33:51 +03:00
add1927781
Reformatted to make line-length < 110.
2015-10-21 09:46:52 +03:00
eeefd73623
Changed sprintf format to use %02hhx instead of %02x.
2015-10-20 16:20:54 +03:00
a8f866d372
Message log update
...
Message log update
2015-10-19 11:37:20 +02:00
75e8033052
Merge branch 'develop' into 1.2.1-binlog_router_trx
2015-10-19 09:36:04 +02:00
06f6b28048
Fix to MXS-412: https://mariadb.atlassian.net/browse/MXS-412
...
service->user is now set to NULL after the users are freed.
2015-10-19 09:01:58 +03:00
5112d4118f
Fix to MXS-409: https://mariadb.atlassian.net/browse/MXS-409
...
Prepared statements are sent to the master instead of all servers.
The planned functionality to store the types of the prepared statements was not implemented
and all executions of prepared statements are sent to the master. Because of this the preparations
should be all sent to the master server instead of sending them to all servers.
2015-10-19 09:01:58 +03:00
9b65e0b8b6
Fixed compiler warnings.
2015-10-14 10:58:32 +03:00
7e1034a740
All conflicts are printed when processing databases.
2015-10-05 10:20:58 +03:00
6227d9f834
Cleaned up schemarouter code.
2015-10-05 10:20:58 +03:00
a576606f2b
Updated schemarouter duplicate DB code based on code review.
2015-10-05 10:20:58 +03:00
af2bc91383
Cleaned up the clientReply function of the schemarouter.
2015-10-05 10:20:58 +03:00
bff6db96a1
Same database on more than one server now cause the schemarouter session to be closed.
2015-10-05 10:20:58 +03:00
62477c5760
Changed log message for trx_safe set to ON
...
Changed log message for trx_safe set to ON
2015-10-02 19:14:47 +02:00
78252fcb78
Message logs changed for slave request errors
...
Log messages changed for slave request errors
2015-10-02 18:30:19 +02:00
e38ea9d07d
Correct missing return value.
2015-10-02 16:19:59 +01:00
1e76de540f
Added blr_distribute_error_message when distributing transaction events
...
Added blr_distribute_error_message when distributing transaction events
2015-10-02 09:46:52 +02:00
d31e081e45
Changed log messages for blr_read_binlog, added slave send error feaure
...
Changed log messages for blr_read_binlog, added slave send error feaure.
When blr_read_binlog detects an error an error message with 1236 code
is sent to the slave and it will stop the replication to binlogrouter
2015-10-01 17:03:48 +02:00
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
680589ed46
Slave heartbeat period is reported in diagnostics
...
Slave heartbeat period is reported in diagnostics only if router option
is set
2015-09-30 15:21:18 +02:00
21509616e9
Fix routine argument type
...
Fix routine argument type
2015-09-30 14:47: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
4f316419c5
Merge branch 'develop' into MXS-329
2015-09-30 12:47:28 +03:00
48fd181245
Merge branch 'test_fix_1.3' into develop
2015-09-30 08:34:02 +03:00
638c2250c9
Fixed internal test suite.
2015-09-29 16:36:12 +03:00
d679bf1cd8
Fix to MXS-389: https://mariadb.atlassian.net/browse/MXS-389
...
Utility tools now use static log manager.
2015-09-29 14:56:05 +03: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
db0e2e881f
Double free prevented.
...
routeQuery calls route_single_stmt, which requires the GWBUF to be
contiguous. Earlier it was made contiguous (if needed) in
route_single_stmt. However, since the process of making a GWBUF
contiguous causes the original buffer to be freed, this would lead
to a double free later in routeQuery that frees the passed buffer.
This is prevented now by making the buffer contiguous before calling
route_single_stmt.
2015-09-29 10:57:45 +03:00
1fa5cfbeb7
Typo fixed
...
Typo fixed
2015-09-28 12:17:06 +02:00
d9a776d81a
Added @@global.server_id and @@global.server_uuid
...
Added @@global.server_id and @@global.server_uuid
2015-09-28 12:12:26 +02:00
b6df52a68e
Addition of slave heartbeat check
...
Addition of slave heartbeat check
2015-09-25 15:58:36 +02:00
2231d0870c
Place checks in callback routines because DCB will not always contain a reference to a router session, and the associated data will be invalid in this case.
2015-09-25 12:17:18 +01:00
2dfb9e3c11
Merge branch 'develop' into MXS-329
2015-09-24 17:59:36 +03:00
f7946a05fa
Fix in extract_message
...
Fix in extract_message
2015-09-23 14:05:02 +02:00
ef15825efb
Fixes suggested by Valgrind tool
...
Fixes suggested by Valgrind tool
2015-09-23 11:46:00 +02:00
72f08de889
Removed duplicated code
...
Removed duplicated code
2015-09-22 16:50:11 +02:00
b6e37d6b6f
Merge branch 'develop' into 1.2.1-binlog_router_trx
2015-09-22 08:40:03 +02:00
