Commit Graph

4349 Commits

Author SHA1 Message Date
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
4d7629038d Fix to MXS-302: https://mariadb.atlassian.net/browse/MXS-302
Added support for additional command line parameters via sysconfig files.
2015-09-30 13:13:49 +03:00
4f316419c5 Merge branch 'develop' into MXS-329 2015-09-30 12:47:28 +03:00
dc4ded50dd Simplified the configuration file template. 2015-09-30 12:39:24 +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
d582c5880c Impose locking on dcb_call_foreach DCB callback mechanism. Add counters and maxima for DCBs and zombies to aid diagnosis. 2015-09-29 11:58:31 +01: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
447c3aa6c1 More code cleaning. 2015-09-29 12:03:21 +03:00
abab715a21 Simplified the code in parse_time. 2015-09-29 12:03:21 +03:00
f021d42820 Cleaned up the timerange string processing in dbfwfilter. 2015-09-29 12:03:21 +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
6f3ec723b1 Cleaned up Limitations 2015-09-29 10:23:04 +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
fcb13760fb Warnings treated as errors.
With all current warnings removed, warnings can now be treated as errors.
2015-09-28 10:27:43 +03:00
de1e1f4e28 In test-programs the ss...assert functions assert always.
Now handled by defining the relevant defines. Should be fixed
by replacing the use of ss_info_assert with test macros that
always assert.

Task for fixing this properly:
https://mariadb.atlassian.net/browse/MXS-382
2015-09-28 10:08:50 +03:00
69af0df6b5 Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-09-28 08:48:27 +02:00
b6df52a68e Addition of slave heartbeat check
Addition of slave heartbeat check
2015-09-25 15:58:36 +02:00
df65ea0386 Fix to MXS-303: https://mariadb.atlassian.net/browse/MXS-303
Fixed package names.
2015-09-25 16:15:07 +03:00
490d9b3782 Fixed installation problems. 2015-09-25 16:15:07 +03: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
9efad8727a All warnings removed.
Minimal changes to remove warnings when compiling.
2015-09-25 14:07:19 +03:00
1e694a6c7d Debug messages logged to debug. 2015-09-25 13:49:30 +03:00
5864171207 Renamed 1.1.1 to 1.2.0 upgrading document to Upgrading-To-MaxScale-1.2.md 2015-09-25 13:19:53 +03:00
2dfb9e3c11 Merge branch 'develop' into MXS-329 2015-09-24 17:59:36 +03:00
2f0ef4ad31 Configuration files from older installations no longer overwrite existing files. 2015-09-24 14:39:21 +03:00
89667294b3 Fix exceptional cases in DCB dcb_call_callback and in MySQL backend gw_error_backend_event - close DCB and return. 2015-09-24 07:39:47 +01:00
653bb57e7f Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-09-23 18:44:13 +02:00
6a318836fb Removed obsolete code.
The read and write buffers are now emptied in dcb_final_free, so
no need to do it explicitly here.
2015-09-23 15:16:19 +03:00
3b19acd1de Write queue emptied in dcb_final_free.
NOTE: Invalid indentation for reduced conflicts with MXS-329.
2015-09-23 15:16:19 +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
618a641b96 Reformatted user authentication queries as multi-line strings instead of one long string. 2015-09-23 08:00:58 +03:00
72f08de889 Removed duplicated code
Removed duplicated code
2015-09-22 16:50:11 +02:00
95a4daecc9 Add GWBUF_POINTER_IN_BUFFER macro; add extra free calls to remove memory leaks. 2015-09-22 11:54:47 +01:00
b6e37d6b6f Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-09-22 08:40:03 +02:00
065e252767 Removed redundant text from documentation. 2015-09-22 07:36:26 +03:00
15f042f083 On reflection, freeing keys and values in hashtable processing is not a good idea because we don't know what they are, and can put up with some small memory losses. 2015-09-21 15:49:57 +01:00
338b870cd1 Fix to MXS-373: https://mariadb.atlassian.net/browse/MXS-373
The log manager is initialized only once and skygw_log_sync_all now checks if the log manager has been successfully started before interacting with the log manager
2015-09-21 17:27:49 +03:00
7aa36b77ea Guarantee router session is present for call to clientReply; properly free callbacks; attempt to set all necessary values for dbusers; do more to ensure buffers freed. 2015-09-21 14:25:12 +01:00
11c8ef5b92 Cleaned up code based on the review of the code. 2015-09-21 14:02:01 +03:00
988a8d7008 Fixed error messages not being printed and cleaned up the function. 2015-09-21 14:02:01 +03: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