Commit Graph

1389 Commits

Author SHA1 Message Date
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
561891aac5 Fix for double free, possible fix for bug601.
In the end of execute_sescmd_in_backend the buffer was consumed
in case the protocol function failed. Or actually if it returned
something else but 1.

In the case of mysql_backend, the buffer is always freed when
authorizing and either consumed or placed on the dcb writequeue
when the data is written.

That is, it is never ok to consume the buffer in this function.
The end-result is likely to be an abort.
2015-09-21 13:45:15 +03:00
88716c35fb Various changes to block loopholes in different cases and tidy up. 2015-09-21 09:23:22 +01:00
de8e54da8b Fix for compile error
Fix for compile error
2015-09-21 09:00:39 +02:00
2c12ba3d16 Various fixes
Various fixes for initialisation and packet size allocation
2015-09-21 09:00:20 +02:00
f97df72a3e Fix for compile error
Fix for compile error
2015-09-21 08:52:39 +02:00
2ce6012506 Various fixes
Various fixes for initialisation and packet size allocation
2015-09-21 08:44:33 +02:00
511e0fe119 Merge Fix from develop
Merge Fix from develop
2015-09-18 16:10:41 +02:00
8d5ca11374 Fixed: spinlock_release is before free
Fixed: spinlock_release is before free
2015-09-18 16:05:22 +02:00
89748d9b21 Binlog identity log message update
Binlog identity log message update
2015-09-18 11:18:32 +02:00
840afc0815 Develop merge
Develop merge
2015-09-18 11:15:48 +02:00
2a2582067a Added fix blr_slave_register reply
Added fix blr_slave_register reply
2015-09-18 11:06:03 +02:00
67069d1685 Fixed Typo
Fixed Typo
2015-09-18 11:01:54 +02:00
74d69eb64d Added missing slave state BLRS_REGISTERED
Added missing slave state BLRS_REGISTERED
2015-09-18 10:50:12 +02:00
81e186fd92 server-id reported as server_id in binlog_identity log
server-id reported as server_id in binlog_identity log
2015-09-18 10:09:11 +02:00
c26dfbc779 Added blr_slave_send_ok in blr_slave_register
Added blr_slave_send_ok in blr_slave_register
2015-09-18 09:37:07 +02:00
cbfc6ea6b0 Fix OK packet for blr_slave_register() reply
Fix OK packet for blr_slave_register() reply
2015-09-18 09:23:02 +02:00